You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2014/06/30 16:57:31 UTC
[01/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Repository: olingo-odata4
Updated Branches:
refs/heads/master 4c4f82ee5 -> 2ab4b2fdb
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotation.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotation.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotation.java
index 33f393f..f4e9d90 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotation.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotation.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
[05/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/ErrorTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/ErrorTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/ErrorTestITCase.java
index 3781734..2d22d23 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/ErrorTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/ErrorTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -146,9 +146,9 @@ public class ErrorTestITCase extends AbstractTestITCase {
private void instreamError(final ODataFormat format) {
final URIBuilder builder = client.newURIBuilder(testStaticServiceRootURL).
- appendOperationCallSegment("InStreamErrorGetCustomer");
+ appendOperationCallSegment("InStreamErrorGetCustomer");
final ODataInvokeRequest<ODataEntitySet> req =
- client.getInvokeRequestFactory().getFunctionInvokeRequest(builder.build(), ODataEntitySet.class);
+ client.getInvokeRequestFactory().getFunctionInvokeRequest(builder.build(), ODataEntitySet.class);
req.setFormat(format);
final ODataInvokeResponse<ODataEntitySet> res = req.execute();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/FilterFactoryTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/FilterFactoryTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/FilterFactoryTestITCase.java
index 3f00d2c..beb5b41 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/FilterFactoryTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/FilterFactoryTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -21,11 +21,11 @@ package org.apache.olingo.fit.v3;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
import org.apache.olingo.client.api.uri.URIFilter;
import org.apache.olingo.client.api.uri.v3.FilterArgFactory;
import org.apache.olingo.client.api.uri.v3.FilterFactory;
import org.apache.olingo.client.api.uri.v3.URIBuilder;
+import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
import org.junit.Test;
public class FilterFactoryTestITCase extends AbstractTestITCase {
@@ -40,10 +40,10 @@ public class FilterFactoryTestITCase extends AbstractTestITCase {
private void match(final String entitySet, final URIFilter filter, final int expected) {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment(entitySet).filter(filter);
+ appendEntitySetSegment(entitySet).filter(filter);
final CommonODataEntitySet feed = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build()).
- execute().getBody();
+ execute().getBody();
assertNotNull(feed);
assertEquals(expected, feed.getEntities().size());
}
@@ -56,7 +56,7 @@ public class FilterFactoryTestITCase extends AbstractTestITCase {
@Test
public void and() {
final URIFilter filter =
- getFilterFactory().and(
+ getFilterFactory().and(
getFilterFactory().lt("VIN", 16),
getFilterFactory().gt("VIN", 12));
@@ -66,10 +66,10 @@ public class FilterFactoryTestITCase extends AbstractTestITCase {
@Test
public void not() {
final URIFilter filter =
- getFilterFactory().not(
+ getFilterFactory().not(
getFilterFactory().or(
- getFilterFactory().ge("VIN", 16),
- getFilterFactory().le("VIN", 12)));
+ getFilterFactory().ge("VIN", 16),
+ getFilterFactory().le("VIN", 12)));
match("Car", filter, 3);
}
@@ -77,26 +77,26 @@ public class FilterFactoryTestITCase extends AbstractTestITCase {
@Test
public void operator() {
URIFilter filter =
- getFilterFactory().eq(
+ getFilterFactory().eq(
getFilterArgFactory().add(getFilterArgFactory().property("VIN"), getFilterArgFactory().
- literal(1)),
+ literal(1)),
getFilterArgFactory().literal(16));
match("Car", filter, 1);
filter =
- getFilterFactory().eq(
+ getFilterFactory().eq(
getFilterArgFactory().add(getFilterArgFactory().literal(1), getFilterArgFactory().
- property("VIN")),
+ property("VIN")),
getFilterArgFactory().literal(16));
match("Car", filter, 1);
filter =
- getFilterFactory().eq(
+ getFilterFactory().eq(
getFilterArgFactory().literal(16),
getFilterArgFactory().add(getFilterArgFactory().literal(1), getFilterArgFactory().
- property("VIN")));
+ property("VIN")));
match("Car", filter, 1);
}
@@ -104,9 +104,9 @@ public class FilterFactoryTestITCase extends AbstractTestITCase {
@Test
public void function() {
final URIFilter filter =
- getFilterFactory().match(
+ getFilterFactory().match(
getFilterArgFactory().startswith(
- getFilterArgFactory().property("Description"), getFilterArgFactory().literal("cen")));
+ getFilterArgFactory().property("Description"), getFilterArgFactory().literal("cen")));
match("Car", filter, 1);
}
@@ -114,10 +114,10 @@ public class FilterFactoryTestITCase extends AbstractTestITCase {
@Test
public void composed() {
final URIFilter filter =
- getFilterFactory().gt(
+ getFilterFactory().gt(
getFilterArgFactory().length(getFilterArgFactory().property("Description")),
getFilterArgFactory().add(getFilterArgFactory().property("VIN"), getFilterArgFactory().literal(
- 10)));
+ 10)));
match("Car", filter, 5);
}
@@ -125,19 +125,19 @@ public class FilterFactoryTestITCase extends AbstractTestITCase {
@Test
public void propertyPath() {
URIFilter filter =
- getFilterFactory().eq(
+ getFilterFactory().eq(
getFilterArgFactory().indexof(
- getFilterArgFactory().property("PrimaryContactInfo/HomePhone/PhoneNumber"),
- getFilterArgFactory().literal("ODataJClient")),
+ getFilterArgFactory().property("PrimaryContactInfo/HomePhone/PhoneNumber"),
+ getFilterArgFactory().literal("ODataJClient")),
getFilterArgFactory().literal(1));
match("Customer", filter, 0);
filter =
- getFilterFactory().ne(
+ getFilterFactory().ne(
getFilterArgFactory().indexof(
- getFilterArgFactory().property("PrimaryContactInfo/HomePhone/PhoneNumber"),
- getFilterArgFactory().literal("lccvussrv")),
+ getFilterArgFactory().property("PrimaryContactInfo/HomePhone/PhoneNumber"),
+ getFilterArgFactory().literal("lccvussrv")),
getFilterArgFactory().literal(-1));
match("Customer", filter, 2);
@@ -146,9 +146,9 @@ public class FilterFactoryTestITCase extends AbstractTestITCase {
@Test
public void datetime() {
final URIFilter filter =
- getFilterFactory().eq(
+ getFilterFactory().eq(
getFilterArgFactory().month(
- getFilterArgFactory().property("PurchaseDate")),
+ getFilterArgFactory().property("PurchaseDate")),
getFilterArgFactory().literal(12));
match("ComputerDetail", filter, 1);
@@ -157,10 +157,10 @@ public class FilterFactoryTestITCase extends AbstractTestITCase {
@Test
public void isof() {
final URIFilter filter =
- getFilterFactory().match(
+ getFilterFactory().match(
getFilterArgFactory().isof(
- getFilterArgFactory().literal(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee")));
+ getFilterArgFactory().literal(
+ "Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee")));
match("Person", filter, 4);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/FilterTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/FilterTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/FilterTestITCase.java
index d14f9e4..eaa3a47 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/FilterTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/FilterTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -29,9 +29,9 @@ public class FilterTestITCase extends AbstractTestITCase {
private void filterQueryTest(final String entity, final String filter, final int expected) {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment(entity).filter(filter);
+ appendEntitySetSegment(entity).filter(filter);
final ODataEntitySet entitySet = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build()).
- execute().getBody();
+ execute().getBody();
assertNotNull(entitySet);
assertEquals(expected, entitySet.getEntities().size());
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/InvokeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/InvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/InvokeTestITCase.java
index d2edbbe..2a1ad02 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/InvokeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/InvokeTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -55,10 +55,10 @@ public class InvokeTestITCase extends AbstractTestITCase {
private void getWithNoParams(final ODataFormat format) {
// 1. get primitive value property
URIBuilder builder = getClient().newURIBuilder(testStaticServiceRootURL).
- appendOperationCallSegment("GetPrimitiveString");
+ appendOperationCallSegment("GetPrimitiveString");
ODataInvokeRequest<ODataProperty> req = getClient().getInvokeRequestFactory().
- getFunctionInvokeRequest(builder.build(), ODataProperty.class);
+ getFunctionInvokeRequest(builder.build(), ODataProperty.class);
req.setFormat(format);
ODataInvokeResponse<ODataProperty> res = req.execute();
assertNotNull(res);
@@ -69,7 +69,7 @@ public class InvokeTestITCase extends AbstractTestITCase {
// 2. get collection of complex type property
builder = getClient().newURIBuilder(testStaticServiceRootURL).
- appendOperationCallSegment("EntityProjectionReturnsCollectionOfComplexTypes");
+ appendOperationCallSegment("EntityProjectionReturnsCollectionOfComplexTypes");
req = getClient().getInvokeRequestFactory().getFunctionInvokeRequest(builder.build(), ODataProperty.class);
req.setFormat(format);
@@ -95,12 +95,12 @@ public class InvokeTestITCase extends AbstractTestITCase {
private void getWithParams(final ODataFormat format) throws EdmPrimitiveTypeException {
// 1. primitive result
URIBuilder builder = getClient().newURIBuilder(testStaticServiceRootURL).
- appendOperationCallSegment("GetArgumentPlusOne");
+ appendOperationCallSegment("GetArgumentPlusOne");
ODataValue param = getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(154);
final ODataInvokeRequest<ODataProperty> primitiveReq = getClient().getInvokeRequestFactory().
- getFunctionInvokeRequest(builder.build(), ODataProperty.class,
- Collections.<String, ODataValue>singletonMap("arg1", param));
+ getFunctionInvokeRequest(builder.build(), ODataProperty.class,
+ Collections.<String, ODataValue> singletonMap("arg1", param));
primitiveReq.setFormat(format);
final ODataInvokeResponse<ODataProperty> primitiveRes = primitiveReq.execute();
@@ -115,8 +115,8 @@ public class InvokeTestITCase extends AbstractTestITCase {
param = getClient().getObjectFactory().newPrimitiveValueBuilder().buildString(StringUtils.EMPTY);
final ODataInvokeRequest<ODataEntitySet> feedReq = getClient().getInvokeRequestFactory().
- getFunctionInvokeRequest(builder.build(), ODataEntitySet.class,
- Collections.<String, ODataValue>singletonMap("Name", param));
+ getFunctionInvokeRequest(builder.build(), ODataEntitySet.class,
+ Collections.<String, ODataValue> singletonMap("Name", param));
feedReq.setFormat(format);
final ODataInvokeResponse<ODataEntitySet> feedRes = feedReq.execute();
@@ -144,35 +144,35 @@ public class InvokeTestITCase extends AbstractTestITCase {
private ODataEntity createEmployee(final ODataFormat format) {
final ODataEntity employee = getClient().getObjectFactory().newEntity(new FullQualifiedName(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee"));
+ "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee"));
employee.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("PersonId",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(1244)));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(1244)));
employee.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("Name",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("Test employee")));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("Test employee")));
employee.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty(
- "ManagersPersonId", getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(3777)));
+ "ManagersPersonId", getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(3777)));
employee.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty(
- "Salary", getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(1000)));
+ "Salary", getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(1000)));
employee.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty(
- "Title", getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("CEO")));
+ "Title", getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("CEO")));
final URIBuilder uriBuilder = getClient().newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Person");
final ODataEntityCreateRequest<ODataEntity> createReq =
- getClient().getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), employee);
+ getClient().getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), employee);
createReq.setFormat(format);
final ODataEntityCreateResponse<ODataEntity> createRes = createReq.execute();
assertEquals(201, createRes.getStatusCode());
final ODataEntityRequest<ODataEntity> req =
- getClient().getRetrieveRequestFactory().getEntityRequest(uriBuilder.appendKeySegment(1244).build());
+ getClient().getRetrieveRequestFactory().getEntityRequest(uriBuilder.appendKeySegment(1244).build());
return req.execute().getBody();
}
private void deleteEmployee(final ODataFormat format, final Integer id) {
final URIBuilder uriBuilder = getClient().newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Person").appendKeySegment(id);
+ appendEntitySetSegment("Person").appendKeySegment(id);
final ODataDeleteRequest deleteReq = getClient().getCUDRequestFactory().getDeleteRequest(uriBuilder.build());
deleteReq.setFormat(format);
@@ -192,7 +192,7 @@ public class InvokeTestITCase extends AbstractTestITCase {
final ODataOperation operation = created.getOperations().get(0);
final ODataInvokeRequest<ODataNoContent> req = getClient().getInvokeRequestFactory().
- getActionInvokeRequest(operation.getTarget(), ODataNoContent.class);
+ getActionInvokeRequest(operation.getTarget(), ODataNoContent.class);
req.setFormat(ODataFormat.JSON_FULL_METADATA);
final ODataInvokeResponse<ODataNoContent> res = req.execute();
assertNotNull(res);
@@ -200,9 +200,9 @@ public class InvokeTestITCase extends AbstractTestITCase {
// 2. check that invoked action has effectively run
final URIBuilder uriBuilder = getClient().newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Person").appendKeySegment(createdId);
+ appendEntitySetSegment("Person").appendKeySegment(createdId);
final ODataEntityRequest<ODataEntity> retrieveRes =
- getClient().getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
+ getClient().getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
retrieveRes.setFormat(ODataFormat.JSON_FULL_METADATA);
final ODataEntity read = retrieveRes.execute().getBody();
assertEquals("0", read.getProperty("Salary").getPrimitiveValue().toString());
@@ -216,25 +216,25 @@ public class InvokeTestITCase extends AbstractTestITCase {
public void boundPostWithParams() throws EdmPrimitiveTypeException {
// 1. read employees and store their current salary
final URIBuilder builder = getClient().newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Person").
- appendEntitySetSegment("Microsoft.Test.OData.Services.AstoriaDefaultService.Employee");
+ appendEntitySetSegment("Person").
+ appendEntitySetSegment("Microsoft.Test.OData.Services.AstoriaDefaultService.Employee");
final URI employeesURI = builder.build();
ODataEntitySet employees = getClient().getRetrieveRequestFactory().
- getEntitySetRequest(employeesURI).execute().getBody();
+ getEntitySetRequest(employeesURI).execute().getBody();
assertFalse(employees.getEntities().isEmpty());
final Map<Integer, Integer> preSalaries = new HashMap<Integer, Integer>(employees.getCount());
for (ODataEntity employee : employees.getEntities()) {
preSalaries.put(employee.getProperty("PersonId").getPrimitiveValue().toCastValue(Integer.class),
- employee.getProperty("Salary").getPrimitiveValue().toCastValue(Integer.class));
+ employee.getProperty("Salary").getPrimitiveValue().toCastValue(Integer.class));
}
assertFalse(preSalaries.isEmpty());
// 2. invoke action bound, with additional parameter
final ODataValue param = getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(1);
final ODataInvokeRequest<ODataNoContent> req = getClient().getInvokeRequestFactory().
- getActionInvokeRequest(
- builder.appendOperationCallSegment("IncreaseSalaries").build(), ODataNoContent.class,
- Collections.<String, ODataValue>singletonMap("n", param));
+ getActionInvokeRequest(
+ builder.appendOperationCallSegment("IncreaseSalaries").build(), ODataNoContent.class,
+ Collections.<String, ODataValue> singletonMap("n", param));
final ODataInvokeResponse<ODataNoContent> res = req.execute();
assertNotNull(res);
assertEquals(204, res.getStatusCode());
@@ -243,9 +243,8 @@ public class InvokeTestITCase extends AbstractTestITCase {
employees = getClient().getRetrieveRequestFactory().getEntitySetRequest(employeesURI).execute().getBody();
assertFalse(employees.getEntities().isEmpty());
for (ODataEntity employee : employees.getEntities()) {
- assertTrue(
- preSalaries.get(employee.getProperty("PersonId").getPrimitiveValue().toCastValue(Integer.class))
- < employee.getProperty("Salary").getPrimitiveValue().toCastValue(Integer.class));
+ assertTrue(preSalaries.get(employee.getProperty("PersonId").getPrimitiveValue().toCastValue(Integer.class))
+ < employee.getProperty("Salary").getPrimitiveValue().toCastValue(Integer.class));
}
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/KeyAsSegmentTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/KeyAsSegmentTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/KeyAsSegmentTestITCase.java
index 569ea4f..18ebcd9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/KeyAsSegmentTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/KeyAsSegmentTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -40,7 +40,7 @@ public class KeyAsSegmentTestITCase extends AbstractTestITCase {
private void read(final ODataFormat format) {
final URIBuilder uriBuilder = client.newURIBuilder(testKeyAsSegmentServiceRootURL).
- appendEntitySetSegment("Customer").appendKeySegment(-10);
+ appendEntitySetSegment("Customer").appendKeySegment(-10);
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setFormat(format);
@@ -91,7 +91,7 @@ public class KeyAsSegmentTestITCase extends AbstractTestITCase {
public void replaceODataEntityAsAtom() {
final ODataFormat format = ODataFormat.ATOM;
final ODataEntity changes = read(format, client.newURIBuilder(testKeyAsSegmentServiceRootURL).
- appendEntitySetSegment("Car").appendKeySegment(14).build());
+ appendEntitySetSegment("Car").appendKeySegment(14).build());
updateEntityDescription(format, changes, UpdateType.REPLACE);
}
@@ -99,7 +99,7 @@ public class KeyAsSegmentTestITCase extends AbstractTestITCase {
public void replaceODataEntityAsJSON() {
final ODataFormat format = ODataFormat.JSON_FULL_METADATA;
final ODataEntity changes = read(format, client.newURIBuilder(testKeyAsSegmentServiceRootURL).
- appendEntitySetSegment("Car").appendKeySegment(14).build());
+ appendEntitySetSegment("Car").appendKeySegment(14).build());
updateEntityDescription(format, changes, UpdateType.REPLACE);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/LinkTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/LinkTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/LinkTestITCase.java
index 54b0774..fd42cda 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/LinkTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/LinkTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,23 +20,24 @@ package org.apache.olingo.fit.v3;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.net.URI;
import java.util.Collections;
import java.util.List;
+
import org.apache.olingo.client.api.communication.request.cud.v3.ODataLinkCreateRequest;
import org.apache.olingo.client.api.communication.request.cud.v3.ODataLinkUpdateRequest;
import org.apache.olingo.client.api.communication.request.cud.v3.UpdateType;
import org.apache.olingo.client.api.communication.request.retrieve.v3.ODataLinkCollectionRequest;
import org.apache.olingo.client.api.communication.response.ODataLinkOperationResponse;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
-import org.apache.olingo.commons.api.domain.ODataLink;
import org.apache.olingo.client.api.domain.v3.ODataLinkCollection;
-import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.client.api.uri.v3.URIBuilder;
+import org.apache.olingo.commons.api.domain.ODataLink;
+import org.apache.olingo.commons.api.format.ODataFormat;
import org.junit.Test;
/**
@@ -50,10 +51,10 @@ public class LinkTestITCase extends AbstractTestITCase {
private ODataLinkCollection doRetrieveLinkURIs(final ODataFormat format, final String linkname) throws IOException {
final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("Customer").appendKeySegment(-10);
+ appendEntitySetSegment("Customer").appendKeySegment(-10);
final ODataLinkCollectionRequest req =
- client.getRetrieveRequestFactory().getLinkCollectionRequest(uriBuilder.build(), linkname);
+ client.getRetrieveRequestFactory().getLinkCollectionRequest(uriBuilder.build(), linkname);
req.setFormat(format);
final ODataRetrieveResponse<ODataLinkCollection> res = req.execute();
@@ -93,13 +94,13 @@ public class LinkTestITCase extends AbstractTestITCase {
// 2. create new link
final ODataLink newLink = client.getObjectFactory().
- newAssociationLink(URI.create(getServiceRoot() + "/Login('3')"));
+ newAssociationLink(URI.create(getServiceRoot() + "/Login('3')"));
final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("Customer").appendKeySegment(-10).appendLinksSegment("Logins");
+ appendEntitySetSegment("Customer").appendKeySegment(-10).appendLinksSegment("Logins");
final ODataLinkCreateRequest req =
- client.getCUDRequestFactory().getLinkCreateRequest(uriBuilder.build(), newLink);
+ client.getCUDRequestFactory().getLinkCreateRequest(uriBuilder.build(), newLink);
req.setFormat(format);
final ODataLinkOperationResponse res = req.execute();
@@ -113,7 +114,7 @@ public class LinkTestITCase extends AbstractTestITCase {
assertEquals(Collections.singletonList(newLink.getLink()), after);
assertEquals(204, client.getCUDRequestFactory().getDeleteRequest(
- client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer").
+ client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer").
appendKeySegment(-10).appendLinksSegment("Logins('3')").build()).execute().getStatusCode());
}
@@ -133,13 +134,13 @@ public class LinkTestITCase extends AbstractTestITCase {
// 2. update the link
ODataLink newLink = client.getObjectFactory().
- newAssociationLink(URI.create(getServiceRoot() + "/CustomerInfo(12)"));
+ newAssociationLink(URI.create(getServiceRoot() + "/CustomerInfo(12)"));
final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot());
uriBuilder.appendEntitySetSegment("Customer").appendKeySegment(-10).appendLinksSegment("Info");
ODataLinkUpdateRequest req =
- client.getCUDRequestFactory().getLinkUpdateRequest(uriBuilder.build(), updateType, newLink);
+ client.getCUDRequestFactory().getLinkUpdateRequest(uriBuilder.build(), updateType, newLink);
req.setFormat(format);
ODataLinkOperationResponse res = req.execute();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java
index 26f1b29..8628130 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -48,7 +48,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
@Test
public void read() throws Exception {
final URIBuilder builder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Car").appendKeySegment(12);
+ appendEntitySetSegment("Car").appendKeySegment(12);
final ODataMediaRequest retrieveReq = client.getRetrieveRequestFactory().getMediaEntityRequest(builder.build());
retrieveReq.setAccept("*/*");
@@ -63,7 +63,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
@Test(expected = ODataClientErrorException.class)
public void readWithXmlError() throws Exception {
final URIBuilder builder =
- client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car").appendKeySegment(12);
+ client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car").appendKeySegment(12);
final ODataMediaRequest retrieveReq = client.getRetrieveRequestFactory().getMediaEntityRequest(builder.build());
retrieveReq.setFormat(ODataFormat.APPLICATION_XML);
@@ -74,7 +74,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
@Test(expected = ODataClientErrorException.class)
public void readWithJsonError() throws Exception {
final URIBuilder builder =
- client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car").appendKeySegment(12);
+ client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car").appendKeySegment(12);
final ODataMediaRequest retrieveReq = client.getRetrieveRequestFactory().getMediaEntityRequest(builder.build());
retrieveReq.setFormat(ODataFormat.APPLICATION_JSON);
@@ -84,13 +84,13 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
private void updateMediaEntity(final ODataFormat format, final int id) throws Exception {
final URIBuilder builder =
- client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car").appendKeySegment(id);
+ client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car").appendKeySegment(id);
final String TO_BE_UPDATED = "new buffered stream sample";
final InputStream input = IOUtils.toInputStream(TO_BE_UPDATED);
final ODataMediaEntityUpdateRequest<ODataEntity> updateReq =
- client.getCUDRequestFactory().getMediaEntityUpdateRequest(builder.build(), input);
+ client.getCUDRequestFactory().getMediaEntityUpdateRequest(builder.build(), input);
updateReq.setFormat(format);
final MediaEntityUpdateStreamManager<ODataEntity> streamManager = updateReq.payloadManager();
@@ -118,7 +118,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
final URIBuilder builder = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car");
final ODataMediaEntityCreateRequest<ODataEntity> createReq =
- client.getCUDRequestFactory().getMediaEntityCreateRequest(builder.build(), input);
+ client.getCUDRequestFactory().getMediaEntityCreateRequest(builder.build(), input);
createReq.setFormat(format);
final MediaEntityCreateStreamManager<ODataEntity> streamManager = createReq.payloadManager();
@@ -164,13 +164,13 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
@Test
public void updateNamedStream() throws Exception {
URIBuilder builder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Car").appendKeySegment(16).appendNavigationSegment("Photo");
+ appendEntitySetSegment("Car").appendKeySegment(16).appendNavigationSegment("Photo");
final String TO_BE_UPDATED = "buffered stream sample";
final InputStream input = new ByteArrayInputStream(TO_BE_UPDATED.getBytes());
final ODataStreamUpdateRequest updateReq =
- client.getCUDRequestFactory().getStreamUpdateRequest(builder.build(), input);
+ client.getCUDRequestFactory().getStreamUpdateRequest(builder.build(), input);
final StreamUpdateStreamManager streamManager = updateReq.payloadManager();
final ODataStreamUpdateResponse updateRes = streamManager.getResponse();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/MetadataTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/MetadataTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/MetadataTestITCase.java
index 3ead8d6..7ee68a8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/MetadataTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/MetadataTestITCase.java
@@ -1,25 +1,26 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.fit.v3;
-import org.apache.olingo.commons.api.edm.Edm;
import static org.junit.Assert.assertNotNull;
+
+import org.apache.olingo.commons.api.edm.Edm;
import org.junit.Test;
public class MetadataTestITCase extends AbstractTestITCase {
@@ -27,7 +28,7 @@ public class MetadataTestITCase extends AbstractTestITCase {
@Test
public void retrieve() {
final Edm metadata = getClient().getRetrieveRequestFactory().
- getMetadataRequest(testStaticServiceRootURL).execute().getBody();
+ getMetadataRequest(testStaticServiceRootURL).execute().getBody();
assertNotNull(metadata);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java
index 98e5b94..f9fa045 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -44,7 +44,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
@Test
public void checkOpenTypeEntityTypesExist() {
final Edm metadata = getClient().getRetrieveRequestFactory().
- getMetadataRequest(testOpenTypeServiceRootURL).execute().getBody();
+ getMetadataRequest(testOpenTypeServiceRootURL).execute().getBody();
final EdmSchema schema = metadata.getSchemas().get(0);
@@ -55,7 +55,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
private ODataEntity readRow(final ODataFormat format, final String uuid) {
final URIBuilder builder = getClient().newURIBuilder(testOpenTypeServiceRootURL).
- appendEntitySetSegment("Row").appendKeySegment(UUID.fromString(uuid));
+ appendEntitySetSegment("Row").appendKeySegment(UUID.fromString(uuid));
return read(format, builder.build());
}
@@ -82,92 +82,92 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
final Integer id = 1426;
ODataEntity rowIndex = getClient().getObjectFactory().newEntity(
- new FullQualifiedName("Microsoft.Test.OData.Services.OpenTypesServiceV3.RowIndex"));
+ new FullQualifiedName("Microsoft.Test.OData.Services.OpenTypesServiceV3.RowIndex"));
getClient().getBinder().add(rowIndex,
- getClient().getObjectFactory().newPrimitiveProperty("Id",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
+ getClient().getObjectFactory().newPrimitiveProperty("Id",
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
getClient().getBinder().add(rowIndex,
- getClient().getObjectFactory().newPrimitiveProperty("aString",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("string")));
+ getClient().getObjectFactory().newPrimitiveProperty("aString",
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("string")));
getClient().getBinder().add(rowIndex,
- getClient().getObjectFactory().newPrimitiveProperty("aBoolean",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildBoolean(true)));
+ getClient().getObjectFactory().newPrimitiveProperty("aBoolean",
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildBoolean(true)));
getClient().getBinder().add(rowIndex,
- getClient().getObjectFactory().newPrimitiveProperty("aDouble",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildDouble(1.5D)));
+ getClient().getObjectFactory().newPrimitiveProperty("aDouble",
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildDouble(1.5D)));
getClient().getBinder().add(rowIndex,
- getClient().getObjectFactory().newPrimitiveProperty("aByte",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
- setType(EdmPrimitiveTypeKind.SByte).setValue(Byte.MAX_VALUE).
- build()));
+ getClient().getObjectFactory().newPrimitiveProperty("aByte",
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
+ setType(EdmPrimitiveTypeKind.SByte).setValue(Byte.MAX_VALUE).
+ build()));
getClient().getBinder().add(rowIndex,
- getClient().getObjectFactory().newPrimitiveProperty("aDate",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
- setType(EdmPrimitiveTypeKind.DateTime).setValue(Calendar.getInstance()).
- build()));
+ getClient().getObjectFactory().newPrimitiveProperty("aDate",
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
+ setType(EdmPrimitiveTypeKind.DateTime).setValue(Calendar.getInstance()).
+ build()));
final ODataComplexValue<ODataProperty> contactDetails = getClient().getObjectFactory().newComplexValue(
- "Microsoft.Test.OData.Services.OpenTypesServiceV3.ContactDetails");
+ "Microsoft.Test.OData.Services.OpenTypesServiceV3.ContactDetails");
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("FirstContacted",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildBinary("text".getBytes())));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildBinary("text".getBytes())));
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("LastContacted",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(null).build()));
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("Contacted",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
setType(EdmPrimitiveTypeKind.DateTime).setValue(null).build()));
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("GUID",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildGuid(UUID.randomUUID())));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildGuid(UUID.randomUUID())));
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("PreferedContactTime",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
setType(EdmPrimitiveTypeKind.Time).setValue(null).build()));
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("Byte",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
setType(EdmPrimitiveTypeKind.Byte).setValue(24).build()));
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("SignedByte",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
setType(EdmPrimitiveTypeKind.SByte).setValue(Byte.MAX_VALUE).build()));
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("Double",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildDouble(Double.MAX_VALUE)));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildDouble(Double.MAX_VALUE)));
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("Single",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildSingle(Float.MAX_VALUE)));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildSingle(Float.MAX_VALUE)));
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("Short",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
setType(EdmPrimitiveTypeKind.Int16).setValue(Short.MAX_VALUE).build()));
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("Int",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(Integer.MAX_VALUE)));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(Integer.MAX_VALUE)));
getClient().getBinder().add(rowIndex,
- getClient().getObjectFactory().newComplexProperty("aContact", contactDetails));
+ getClient().getObjectFactory().newComplexProperty("aContact", contactDetails));
final ODataEntityCreateRequest<ODataEntity> createReq = getClient().getCUDRequestFactory().
- getEntityCreateRequest(getClient().newURIBuilder(testOpenTypeServiceRootURL).
- appendEntitySetSegment("RowIndex").build(), rowIndex);
+ getEntityCreateRequest(getClient().newURIBuilder(testOpenTypeServiceRootURL).
+ appendEntitySetSegment("RowIndex").build(), rowIndex);
createReq.setFormat(format);
final ODataEntityCreateResponse<ODataEntity> createRes = createReq.execute();
assertEquals(201, createRes.getStatusCode());
final URIBuilder builder = getClient().newURIBuilder(testOpenTypeServiceRootURL).
- appendEntitySetSegment("RowIndex").appendKeySegment(id);
+ appendEntitySetSegment("RowIndex").appendKeySegment(id);
rowIndex = read(format, builder.build());
assertNotNull(rowIndex);
assertEquals(EdmPrimitiveTypeKind.Int32,
- rowIndex.getProperty("Id").getPrimitiveValue().getTypeKind());
+ rowIndex.getProperty("Id").getPrimitiveValue().getTypeKind());
assertEquals(EdmPrimitiveTypeKind.String,
- rowIndex.getProperty("aString").getPrimitiveValue().getTypeKind());
+ rowIndex.getProperty("aString").getPrimitiveValue().getTypeKind());
assertEquals(EdmPrimitiveTypeKind.Boolean,
- rowIndex.getProperty("aBoolean").getPrimitiveValue().getTypeKind());
+ rowIndex.getProperty("aBoolean").getPrimitiveValue().getTypeKind());
assertTrue(rowIndex.getProperty("aDouble").hasPrimitiveValue());
assertTrue(rowIndex.getProperty("aByte").hasPrimitiveValue());
assertEquals(EdmPrimitiveTypeKind.SByte, rowIndex.getProperty("aByte").getPrimitiveValue().getTypeKind());
assertTrue(rowIndex.getProperty("aDate").hasPrimitiveValue());
assertEquals(EdmPrimitiveTypeKind.DateTime, rowIndex.getProperty("aDate").getPrimitiveValue().getTypeKind());
assertTrue(rowIndex.getProperty("aContact").hasComplexValue());
- assertEquals("Microsoft.Test.OData.Services.OpenTypesServiceV3.ContactDetails",
- rowIndex.getProperty("aContact").getValue().getTypeName());
+ assertEquals("Microsoft.Test.OData.Services.OpenTypesServiceV3.ContactDetails",
+ rowIndex.getProperty("aContact").getValue().getTypeName());
assertTrue(rowIndex.getProperty("aContact").getComplexValue().get("SignedByte").hasPrimitiveValue());
final ODataDeleteResponse deleteRes = getClient().getCUDRequestFactory().
- getDeleteRequest(rowIndex.getEditLink()).execute();
+ getDeleteRequest(rowIndex.getEditLink()).execute();
assertEquals(204, deleteRes.getStatusCode());
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/PrimitiveKeysTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/PrimitiveKeysTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/PrimitiveKeysTestITCase.java
index 2b2ec75..831b9e0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/PrimitiveKeysTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/PrimitiveKeysTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -34,7 +34,7 @@ public class PrimitiveKeysTestITCase extends AbstractTestITCase {
private void readEntity(final String entityType, final Object key, final ODataFormat format) {
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(
- client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment(entityType).
+ client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment(entityType).
appendKeySegment(key).
build());
req.setFormat(format);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/PropertyRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/PropertyRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/PropertyRetrieveTestITCase.java
index 2a0bf65..36761a7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/PropertyRetrieveTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/PropertyRetrieveTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -42,11 +42,12 @@ import org.junit.Test;
public class PropertyRetrieveTestITCase extends AbstractTestITCase {
- private void retrievePropertyTest(final ODataFormat format, String entitySegment, String structuralSegment) {
+ private void
+ retrievePropertyTest(final ODataFormat format, final String entitySegment, final String structuralSegment) {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment(entitySegment).appendPropertySegment(structuralSegment);
+ appendEntitySetSegment(entitySegment).appendPropertySegment(structuralSegment);
final ODataPropertyRequest<ODataProperty> req = client.getRetrieveRequestFactory().
- getPropertyRequest(uriBuilder.build());
+ getPropertyRequest(uriBuilder.build());
req.setFormat(format);
try {
final ODataProperty property = req.execute().getBody();
@@ -70,127 +71,137 @@ public class PropertyRetrieveTestITCase extends AbstractTestITCase {
}
}
}
- //test with json header
+
+ // test with json header
@Test
public void jsonRetrieveProperty() {
- //Primitive types
+ // Primitive types
retrievePropertyTest(ODataFormat.JSON, "Customer(-10)", "Name");
retrievePropertyTest(ODataFormat.JSON, "Customer(-10)", "CustomerId");
retrievePropertyTest(ODataFormat.JSON, "Message(FromUsername='1',MessageId=-10)", "Sent");
retrievePropertyTest(ODataFormat.JSON, "Message(FromUsername='1',MessageId=-10)", "IsRead");
- //Collection of Complex types
+ // Collection of Complex types
retrievePropertyTest(ODataFormat.JSON, "Customer(-10)", "BackupContactInfo");
- //Collection of primitives
+ // Collection of primitives
retrievePropertyTest(ODataFormat.JSON, "Customer(-10)/PrimaryContactInfo", "EmailBag");
- //complex types
+ // complex types
retrievePropertyTest(ODataFormat.JSON, "Order(-9)", "Concurrency");
}
- //test with json full metadata
+
+ // test with json full metadata
@Test
public void jsonFullMetadataRetrieveProperty() {
- //primitive types
+ // primitive types
retrievePropertyTest(ODataFormat.JSON_FULL_METADATA, "Customer(-10)", "Name");
retrievePropertyTest(ODataFormat.JSON_FULL_METADATA, "Customer(-10)", "CustomerId");
retrievePropertyTest(ODataFormat.JSON_FULL_METADATA, "Message(FromUsername='1',MessageId=-10)", "Sent");
retrievePropertyTest(ODataFormat.JSON_FULL_METADATA, "Message(FromUsername='1',MessageId=-10)", "IsRead");
- //Collection of Complex types
+ // Collection of Complex types
retrievePropertyTest(ODataFormat.JSON_FULL_METADATA, "Customer(-10)", "BackupContactInfo");
- //Collection of primitives
+ // Collection of primitives
retrievePropertyTest(ODataFormat.JSON_FULL_METADATA, "Customer(-10)/PrimaryContactInfo", "EmailBag");
- //Complex types
+ // Complex types
retrievePropertyTest(ODataFormat.JSON_FULL_METADATA, "Order(-9)", "Concurrency");
}
+
// json with no metadata
@Test
public void jsonNoMetadataRetrieveProperty() {
- //primitive types
+ // primitive types
retrievePropertyTest(ODataFormat.JSON_NO_METADATA, "Customer(-10)", "Name");
retrievePropertyTest(ODataFormat.JSON_NO_METADATA, "Customer(-10)", "CustomerId");
retrievePropertyTest(ODataFormat.JSON_NO_METADATA, "Message(FromUsername='1',MessageId=-10)", "Sent");
retrievePropertyTest(ODataFormat.JSON_NO_METADATA, "Message(FromUsername='1',MessageId=-10)", "IsRead");
- //Collection of Complex types
+ // Collection of Complex types
retrievePropertyTest(ODataFormat.JSON_NO_METADATA, "Customer(-10)", "BackupContactInfo");
- //Collection of Primitives
+ // Collection of Primitives
retrievePropertyTest(ODataFormat.JSON_NO_METADATA, "Customer(-10)/PrimaryContactInfo", "EmailBag");
- //Complex types
+ // Complex types
retrievePropertyTest(ODataFormat.JSON_NO_METADATA, "Order(-9)", "Concurrency");
}
+
// json with minimla metadata
@Test
public void jsonmininalRetrieveProperty() {
- //primitive types
+ // primitive types
retrievePropertyTest(ODataFormat.JSON_NO_METADATA, "Customer(-10)", "Name");
retrievePropertyTest(ODataFormat.JSON_NO_METADATA, "Customer(-10)", "CustomerId");
retrievePropertyTest(ODataFormat.JSON_NO_METADATA, "Message(FromUsername='1',MessageId=-10)", "Sent");
retrievePropertyTest(ODataFormat.JSON_NO_METADATA, "Message(FromUsername='1',MessageId=-10)", "IsRead");
- //Collection of complex types
+ // Collection of complex types
retrievePropertyTest(ODataFormat.JSON_NO_METADATA, "Customer(-10)", "BackupContactInfo");
- //Collection of primitives
+ // Collection of primitives
retrievePropertyTest(ODataFormat.JSON_NO_METADATA, "Customer(-10)/PrimaryContactInfo", "EmailBag");
- //Complex types
+ // Complex types
retrievePropertyTest(ODataFormat.JSON_NO_METADATA, "Order(-9)", "Concurrency");
}
+
// with xml header
@Test
public void xmlRetrieveProperty() {
- //primitive types
+ // primitive types
retrievePropertyTest(ODataFormat.XML, "Customer(-10)", "Name");
retrievePropertyTest(ODataFormat.XML, "Customer(-10)", "CustomerId");
retrievePropertyTest(ODataFormat.XML, "Message(FromUsername='1',MessageId=-10)", "Sent");
retrievePropertyTest(ODataFormat.XML, "Message(FromUsername='1',MessageId=-10)", "IsRead");
- //Collection of Complex types
+ // Collection of Complex types
retrievePropertyTest(ODataFormat.XML, "Customer(-10)", "BackupContactInfo");
- //Collection of primitives
+ // Collection of primitives
retrievePropertyTest(ODataFormat.XML, "Customer(-10)/PrimaryContactInfo", "EmailBag");
- //Complex types
+ // Complex types
retrievePropertyTest(ODataFormat.XML, "Order(-9)", "Concurrency");
}
+
// with atom header
@Test
public void atomRetrieveProperty() {
- //primitive types
+ // primitive types
retrievePropertyTest(ODataFormat.XML, "Customer(-10)", "Name");
retrievePropertyTest(ODataFormat.XML, "Customer(-10)", "CustomerId");
retrievePropertyTest(ODataFormat.XML, "Message(FromUsername='1',MessageId=-10)", "Sent");
retrievePropertyTest(ODataFormat.XML, "Message(FromUsername='1',MessageId=-10)", "IsRead");
- //Collection of Complex types
+ // Collection of Complex types
retrievePropertyTest(ODataFormat.XML, "Customer(-10)", "BackupContactInfo");
- //Collection of primitives
+ // Collection of primitives
retrievePropertyTest(ODataFormat.XML, "Customer(-10)/PrimaryContactInfo", "EmailBag");
- //complex types
+ // complex types
retrievePropertyTest(ODataFormat.XML, "Order(-9)", "Concurrency");
}
+
// with invalid structural segment
@Test
public void invalidSegmentRetrieveProperty() {
- //primitive types
+ // primitive types
retrievePropertyTest(ODataFormat.XML, "Customers(-10)", "Name");
}
+
// with null pub format
@Test
public void nullSegmentRetrieveProperty() {
- //primitive types
+ // primitive types
retrievePropertyTest(null, "Customers(-10)", "Name");
}
+
// with null accept header format
@Test
public void nullAcceptRetrieveProperty() {
- //primitive types
+ // primitive types
retrievePropertyTest(ODataFormat.XML, "Customers(-10)", "Name");
}
+
// with json pub format and atom accept format
@Test
@@ -199,21 +210,23 @@ public class PropertyRetrieveTestITCase extends AbstractTestITCase {
retrievePropertyTest(ODataFormat.JSON_FULL_METADATA, "Customers(-10)", "Name");
}
- //bad request 400 error. Message takes two keys
+
+ // bad request 400 error. Message takes two keys
@Test
public void badRequestTest() {
- //primitive types
+ // primitive types
retrievePropertyTest(ODataFormat.JSON_FULL_METADATA, "Message(FromUsername='1')", "Sent");
}
- //navigation link of stream
+
+ // navigation link of stream
@Test
public void navigationMediaLink() {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendNavigationSegment("Product").appendKeySegment(-7).appendLinksSegment("Photos");
+ appendNavigationSegment("Product").appendKeySegment(-7).appendLinksSegment("Photos");
final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
- getEntitySetRequest(uriBuilder.build());
+ getEntitySetRequest(uriBuilder.build());
req.setAccept("application/json");
final ODataRetrieveResponse<ODataEntitySet> res = req.execute();
assertEquals(200, res.getStatusCode());
@@ -223,21 +236,22 @@ public class PropertyRetrieveTestITCase extends AbstractTestITCase {
assertNotNull(entity);
assertEquals(entity.size(), 2);
assertEquals(testStaticServiceRootURL + "/ProductPhoto(PhotoId=-3,ProductId=-3)",
- entity.get(0).getProperties().get(0).getValue().toString());
+ entity.get(0).getProperties().get(0).getValue().toString());
assertEquals(testStaticServiceRootURL + "/ProductPhoto(PhotoId=-2,ProductId=-2)",
- entity.get(1).getProperties().get(0).getValue().toString());
+ entity.get(1).getProperties().get(0).getValue().toString());
for (int i = 0; i < entity.size(); i++) {
assertNotNull(entity.get(0).getProperties().get(0).getValue());
}
}
- //navigation link of stream, Bad Request(404 error). 'Photo' is not a valid navigation link
+
+ // navigation link of stream, Bad Request(404 error). 'Photo' is not a valid navigation link
@Test
public void navigationMediaLinkInvalidQuery() {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendNavigationSegment("Product").appendKeySegment(-7).appendLinksSegment("Photo");
+ appendNavigationSegment("Product").appendKeySegment(-7).appendLinksSegment("Photo");
final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
- getEntitySetRequest(uriBuilder.build());
+ getEntitySetRequest(uriBuilder.build());
req.setAccept("application/json");
try {
final ODataRetrieveResponse<ODataEntitySet> res = req.execute();
@@ -248,9 +262,9 @@ public class PropertyRetrieveTestITCase extends AbstractTestITCase {
assertNotNull(entity);
assertEquals(entity.size(), 2);
assertEquals(testStaticServiceRootURL + "/ProductPhoto(PhotoId=-3,ProductId=-3)", entity.get(0).
- getProperties().get(0).getValue().toString());
+ getProperties().get(0).getValue().toString());
assertEquals(testStaticServiceRootURL + "/ProductPhoto(PhotoId=-2,ProductId=-2)", entity.get(1).
- getProperties().get(0).getValue().toString());
+ getProperties().get(0).getValue().toString());
} catch (ODataClientErrorException e) {
assertEquals(404, e.getStatusLine().getStatusCode());
}
@@ -259,9 +273,9 @@ public class PropertyRetrieveTestITCase extends AbstractTestITCase {
@Test
public void navigationMediaLinkInvalidFormat() {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendNavigationSegment("Product").appendKeySegment(-7).appendLinksSegment("Photos");
+ appendNavigationSegment("Product").appendKeySegment(-7).appendLinksSegment("Photos");
final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
- getEntitySetRequest(uriBuilder.build());
+ getEntitySetRequest(uriBuilder.build());
req.setAccept("application/atom+xml");
try {
final ODataRetrieveResponse<ODataEntitySet> res = req.execute();
@@ -272,9 +286,9 @@ public class PropertyRetrieveTestITCase extends AbstractTestITCase {
assertNotNull(entity);
assertEquals(entity.size(), 2);
assertEquals(testStaticServiceRootURL + "/ProductPhoto(PhotoId=-3,ProductId=-3)", entity.get(0).
- getProperties().get(0).getValue().toString());
+ getProperties().get(0).getValue().toString());
assertEquals(testStaticServiceRootURL + "/ProductPhoto(PhotoId=-2,ProductId=-2)", entity.get(1).
- getProperties().get(0).getValue().toString());
+ getProperties().get(0).getValue().toString());
} catch (ODataClientErrorException e) {
assertEquals(415, e.getStatusLine().getStatusCode());
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/PropertyTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/PropertyTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/PropertyTestITCase.java
index 7a29f0f..ef98577 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/PropertyTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/PropertyTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -144,29 +144,29 @@ public class PropertyTestITCase extends AbstractTestITCase {
@Test
public void nullNullableProperty() {
final ODataDeleteResponse res = client.getCUDRequestFactory().getDeleteRequest(client.newURIBuilder(
- getServiceRoot()).
- appendEntitySetSegment("Order").appendKeySegment(-8).
- appendPropertySegment("CustomerId").appendValueSegment().build()).
- execute();
+ getServiceRoot()).
+ appendEntitySetSegment("Order").appendKeySegment(-8).
+ appendPropertySegment("CustomerId").appendValueSegment().build()).
+ execute();
assertEquals(204, res.getStatusCode());
}
@Test(expected = ODataClientErrorException.class)
public void nullNonNullableProperty() {
client.getCUDRequestFactory().getDeleteRequest(client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("Driver").appendKeySegment("1").
- appendPropertySegment("BirthDate").appendValueSegment().build()).
- execute();
+ appendEntitySetSegment("Driver").appendKeySegment("1").
+ appendPropertySegment("BirthDate").appendValueSegment().build()).
+ execute();
}
private void updatePropertyValue(final ODataFormat format, final UpdateType type)
throws IOException, EdmPrimitiveTypeException {
final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("Customer").appendKeySegment(-9).
- appendPropertySegment("PrimaryContactInfo").
- appendPropertySegment("HomePhone").
- appendPropertySegment("PhoneNumber");
+ appendEntitySetSegment("Customer").appendKeySegment(-9).
+ appendPropertySegment("PrimaryContactInfo").
+ appendPropertySegment("HomePhone").
+ appendPropertySegment("PhoneNumber");
ODataValueRequest retrieveReq = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
retrieveReq.setFormat(format);
@@ -185,7 +185,7 @@ public class PropertyTestITCase extends AbstractTestITCase {
final ODataPrimitiveValue newVal = client.getObjectFactory().newPrimitiveValueBuilder().setValue(newMsg).build();
final ODataValueUpdateRequest updateReq =
- client.getCUDRequestFactory().getValueUpdateRequest(uriBuilder.build(), type, newVal);
+ client.getCUDRequestFactory().getValueUpdateRequest(uriBuilder.build(), type, newVal);
updateReq.setFormat(format);
final ODataValueUpdateResponse updateRes = updateReq.execute();
@@ -205,22 +205,22 @@ public class PropertyTestITCase extends AbstractTestITCase {
private void updateComplexProperty(final ODataFormat format, final UpdateType type) throws IOException {
final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("Customer").appendKeySegment(-9).appendPropertySegment("PrimaryContactInfo");
+ appendEntitySetSegment("Customer").appendKeySegment(-9).appendPropertySegment("PrimaryContactInfo");
ODataPropertyRequest<ODataProperty> retrieveReq = client.getRetrieveRequestFactory().
- getPropertyRequest(uriBuilder.build());
+ getPropertyRequest(uriBuilder.build());
retrieveReq.setFormat(format);
ODataRetrieveResponse<ODataProperty> retrieveRes = retrieveReq.execute();
assertEquals(200, retrieveRes.getStatusCode());
ODataProperty primaryContactInfo = client.getObjectFactory().
- newComplexProperty("PrimaryContactInfo", retrieveRes.getBody().getComplexValue());
+ newComplexProperty("PrimaryContactInfo", retrieveRes.getBody().getComplexValue());
final String newItem = "new item " + System.currentTimeMillis();
final ODataCollectionValue<ODataValue> originalValue =
- primaryContactInfo.getComplexValue().get("EmailBag").getCollectionValue();
+ primaryContactInfo.getComplexValue().get("EmailBag").getCollectionValue();
final int origSize = originalValue.size();
@@ -228,7 +228,7 @@ public class PropertyTestITCase extends AbstractTestITCase {
assertEquals(origSize + 1, originalValue.size());
final ODataPropertyUpdateRequest updateReq = client.getCUDRequestFactory().
- getPropertyComplexValueUpdateRequest(uriBuilder.build(), type, primaryContactInfo);
+ getPropertyComplexValueUpdateRequest(uriBuilder.build(), type, primaryContactInfo);
if (client.getConfiguration().isUseXHTTPMethod()) {
assertEquals(HttpMethod.POST, updateReq.getMethod());
} else {
@@ -253,17 +253,17 @@ public class PropertyTestITCase extends AbstractTestITCase {
private void updateCollectionProperty(final ODataFormat format) throws IOException {
final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot());
uriBuilder.appendEntitySetSegment("Customer").appendKeySegment(-10).
- appendPropertySegment("PrimaryContactInfo").appendPropertySegment("AlternativeNames");
+ appendPropertySegment("PrimaryContactInfo").appendPropertySegment("AlternativeNames");
ODataPropertyRequest<ODataProperty> retrieveReq = client.getRetrieveRequestFactory().
- getPropertyRequest(uriBuilder.build());
+ getPropertyRequest(uriBuilder.build());
retrieveReq.setFormat(format);
ODataRetrieveResponse<ODataProperty> retrieveRes = retrieveReq.execute();
assertEquals(200, retrieveRes.getStatusCode());
ODataProperty alternativeNames = client.getObjectFactory().newCollectionProperty("AlternativeNames",
- retrieveRes.getBody().getCollectionValue());
+ retrieveRes.getBody().getCollectionValue());
final String newItem = "new item " + System.currentTimeMillis();
@@ -275,7 +275,7 @@ public class PropertyTestITCase extends AbstractTestITCase {
assertEquals(origSize + 1, originalValue.size());
final ODataPropertyUpdateRequest updateReq =
- client.getCUDRequestFactory().getPropertyCollectionValueUpdateRequest(uriBuilder.build(),
+ client.getCUDRequestFactory().getPropertyCollectionValueUpdateRequest(uriBuilder.build(),
alternativeNames);
if (client.getConfiguration().isUseXHTTPMethod()) {
assertEquals(HttpMethod.POST, updateReq.getMethod());
@@ -301,11 +301,11 @@ public class PropertyTestITCase extends AbstractTestITCase {
private void updatePrimitiveProperty(final ODataFormat format) throws IOException, EdmPrimitiveTypeException {
final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot());
uriBuilder.appendEntitySetSegment("Customer").appendKeySegment(-9).
- appendPropertySegment("PrimaryContactInfo").
- appendPropertySegment("HomePhone").appendPropertySegment("PhoneNumber");
+ appendPropertySegment("PrimaryContactInfo").
+ appendPropertySegment("HomePhone").appendPropertySegment("PhoneNumber");
ODataPropertyRequest<ODataProperty> retrieveReq = client.getRetrieveRequestFactory().
- getPropertyRequest(uriBuilder.build());
+ getPropertyRequest(uriBuilder.build());
retrieveReq.setFormat(format);
ODataRetrieveResponse<ODataProperty> retrieveRes = retrieveReq.execute();
@@ -319,10 +319,10 @@ public class PropertyTestITCase extends AbstractTestITCase {
assertNotEquals(newMsg, oldMsg);
phoneNumber = client.getObjectFactory().newPrimitiveProperty("PhoneNumber",
- client.getObjectFactory().newPrimitiveValueBuilder().setValue(newMsg).build());
+ client.getObjectFactory().newPrimitiveValueBuilder().setValue(newMsg).build());
final ODataPropertyUpdateRequest updateReq =
- client.getCUDRequestFactory().getPropertyPrimitiveValueUpdateRequest(uriBuilder.build(), phoneNumber);
+ client.getCUDRequestFactory().getPropertyPrimitiveValueUpdateRequest(uriBuilder.build(), phoneNumber);
if (client.getConfiguration().isUseXHTTPMethod()) {
assertEquals(HttpMethod.POST, updateReq.getMethod());
} else {
@@ -345,7 +345,7 @@ public class PropertyTestITCase extends AbstractTestITCase {
private void rawRequest(final ODataFormat format) {
final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("Customer").appendKeySegment(-10).appendPropertySegment("BackupContactInfo");
+ appendEntitySetSegment("Customer").appendKeySegment(-10).appendPropertySegment("BackupContactInfo");
final ODataRawRequest req = client.getRetrieveRequestFactory().getRawRequest(uriBuilder.build());
req.setFormat(format.getContentType(client.getServiceVersion()).toContentTypeString());
[43/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
index d95405d..d01f887 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
@@ -1,537 +1,488 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "AllSpatialTypes",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface AllSpatialTypes
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getId();
-
- void setId(java.lang.Integer _id);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Geog",
- type = "Edm.Geography",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.Geospatial getGeog();
-
- void setGeog(org.apache.olingo.commons.api.edm.geo.Geospatial _geog);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogPoint",
- type = "Edm.GeographyPoint",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.Point getGeogPoint();
-
- void setGeogPoint(org.apache.olingo.commons.api.edm.geo.Point _geogPoint);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogLine",
- type = "Edm.GeographyLineString",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.LineString getGeogLine();
-
- void setGeogLine(org.apache.olingo.commons.api.edm.geo.LineString _geogLine);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogPolygon",
- type = "Edm.GeographyPolygon",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.Polygon getGeogPolygon();
-
- void setGeogPolygon(org.apache.olingo.commons.api.edm.geo.Polygon _geogPolygon);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogCollection",
- type = "Edm.GeographyCollection",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.GeospatialCollection getGeogCollection();
-
- void setGeogCollection(org.apache.olingo.commons.api.edm.geo.GeospatialCollection _geogCollection);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogMultiPoint",
- type = "Edm.GeographyMultiPoint",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.MultiPoint getGeogMultiPoint();
-
- void setGeogMultiPoint(org.apache.olingo.commons.api.edm.geo.MultiPoint _geogMultiPoint);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogMultiLine",
- type = "Edm.GeographyMultiLineString",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.MultiLineString getGeogMultiLine();
-
- void setGeogMultiLine(org.apache.olingo.commons.api.edm.geo.MultiLineString _geogMultiLine);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogMultiPolygon",
- type = "Edm.GeographyMultiPolygon",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.MultiPolygon getGeogMultiPolygon();
-
- void setGeogMultiPolygon(org.apache.olingo.commons.api.edm.geo.MultiPolygon _geogMultiPolygon);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Geom",
- type = "Edm.Geometry",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.Geospatial getGeom();
-
- void setGeom(org.apache.olingo.commons.api.edm.geo.Geospatial _geom);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomPoint",
- type = "Edm.GeometryPoint",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.Point getGeomPoint();
-
- void setGeomPoint(org.apache.olingo.commons.api.edm.geo.Point _geomPoint);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomLine",
- type = "Edm.GeometryLineString",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.LineString getGeomLine();
-
- void setGeomLine(org.apache.olingo.commons.api.edm.geo.LineString _geomLine);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomPolygon",
- type = "Edm.GeometryPolygon",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.Polygon getGeomPolygon();
-
- void setGeomPolygon(org.apache.olingo.commons.api.edm.geo.Polygon _geomPolygon);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomCollection",
- type = "Edm.GeometryCollection",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.GeospatialCollection getGeomCollection();
-
- void setGeomCollection(org.apache.olingo.commons.api.edm.geo.GeospatialCollection _geomCollection);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomMultiPoint",
- type = "Edm.GeometryMultiPoint",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.MultiPoint getGeomMultiPoint();
-
- void setGeomMultiPoint(org.apache.olingo.commons.api.edm.geo.MultiPoint _geomMultiPoint);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomMultiLine",
- type = "Edm.GeometryMultiLineString",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.MultiLineString getGeomMultiLine();
-
- void setGeomMultiLine(org.apache.olingo.commons.api.edm.geo.MultiLineString _geomMultiLine);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomMultiPolygon",
- type = "Edm.GeometryMultiPolygon",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.MultiPolygon getGeomMultiPolygon();
-
- void setGeomMultiPolygon(org.apache.olingo.commons.api.edm.geo.MultiPolygon _geomMultiPolygon);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Int32")
- Annotatable getIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Geog",
- type = "Edm.Geography")
- Annotatable getGeogAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogPoint",
- type = "Edm.GeographyPoint")
- Annotatable getGeogPointAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogLine",
- type = "Edm.GeographyLineString")
- Annotatable getGeogLineAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogPolygon",
- type = "Edm.GeographyPolygon")
- Annotatable getGeogPolygonAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogCollection",
- type = "Edm.GeographyCollection")
- Annotatable getGeogCollectionAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogMultiPoint",
- type = "Edm.GeographyMultiPoint")
- Annotatable getGeogMultiPointAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogMultiLine",
- type = "Edm.GeographyMultiLineString")
- Annotatable getGeogMultiLineAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogMultiPolygon",
- type = "Edm.GeographyMultiPolygon")
- Annotatable getGeogMultiPolygonAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Geom",
- type = "Edm.Geometry")
- Annotatable getGeomAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomPoint",
- type = "Edm.GeometryPoint")
- Annotatable getGeomPointAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomLine",
- type = "Edm.GeometryLineString")
- Annotatable getGeomLineAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomPolygon",
- type = "Edm.GeometryPolygon")
- Annotatable getGeomPolygonAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomCollection",
- type = "Edm.GeometryCollection")
- Annotatable getGeomCollectionAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomMultiPoint",
- type = "Edm.GeometryMultiPoint")
- Annotatable getGeomMultiPointAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomMultiLine",
- type = "Edm.GeometryMultiLineString")
- Annotatable getGeomMultiLineAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomMultiPolygon",
- type = "Edm.GeometryMultiPolygon")
- Annotatable getGeomMultiPolygonAnnotations();
-
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface AllSpatialTypes
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getId();
+
+ void setId(java.lang.Integer _id);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Geog",
+ type = "Edm.Geography",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.Geospatial getGeog();
+
+ void setGeog(org.apache.olingo.commons.api.edm.geo.Geospatial _geog);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogPoint",
+ type = "Edm.GeographyPoint",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.Point getGeogPoint();
+
+ void setGeogPoint(org.apache.olingo.commons.api.edm.geo.Point _geogPoint);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogLine",
+ type = "Edm.GeographyLineString",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.LineString getGeogLine();
+
+ void setGeogLine(org.apache.olingo.commons.api.edm.geo.LineString _geogLine);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogPolygon",
+ type = "Edm.GeographyPolygon",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.Polygon getGeogPolygon();
+
+ void setGeogPolygon(org.apache.olingo.commons.api.edm.geo.Polygon _geogPolygon);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogCollection",
+ type = "Edm.GeographyCollection",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.GeospatialCollection getGeogCollection();
+
+ void setGeogCollection(org.apache.olingo.commons.api.edm.geo.GeospatialCollection _geogCollection);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogMultiPoint",
+ type = "Edm.GeographyMultiPoint",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.MultiPoint getGeogMultiPoint();
+
+ void setGeogMultiPoint(org.apache.olingo.commons.api.edm.geo.MultiPoint _geogMultiPoint);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogMultiLine",
+ type = "Edm.GeographyMultiLineString",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.MultiLineString getGeogMultiLine();
+
+ void setGeogMultiLine(org.apache.olingo.commons.api.edm.geo.MultiLineString _geogMultiLine);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogMultiPolygon",
+ type = "Edm.GeographyMultiPolygon",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.MultiPolygon getGeogMultiPolygon();
+
+ void setGeogMultiPolygon(org.apache.olingo.commons.api.edm.geo.MultiPolygon _geogMultiPolygon);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Geom",
+ type = "Edm.Geometry",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.Geospatial getGeom();
+
+ void setGeom(org.apache.olingo.commons.api.edm.geo.Geospatial _geom);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomPoint",
+ type = "Edm.GeometryPoint",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.Point getGeomPoint();
+
+ void setGeomPoint(org.apache.olingo.commons.api.edm.geo.Point _geomPoint);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomLine",
+ type = "Edm.GeometryLineString",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.LineString getGeomLine();
+
+ void setGeomLine(org.apache.olingo.commons.api.edm.geo.LineString _geomLine);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomPolygon",
+ type = "Edm.GeometryPolygon",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.Polygon getGeomPolygon();
+
+ void setGeomPolygon(org.apache.olingo.commons.api.edm.geo.Polygon _geomPolygon);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomCollection",
+ type = "Edm.GeometryCollection",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.GeospatialCollection getGeomCollection();
+
+ void setGeomCollection(org.apache.olingo.commons.api.edm.geo.GeospatialCollection _geomCollection);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomMultiPoint",
+ type = "Edm.GeometryMultiPoint",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.MultiPoint getGeomMultiPoint();
+
+ void setGeomMultiPoint(org.apache.olingo.commons.api.edm.geo.MultiPoint _geomMultiPoint);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomMultiLine",
+ type = "Edm.GeometryMultiLineString",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.MultiLineString getGeomMultiLine();
+
+ void setGeomMultiLine(org.apache.olingo.commons.api.edm.geo.MultiLineString _geomMultiLine);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomMultiPolygon",
+ type = "Edm.GeometryMultiPolygon",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.MultiPolygon getGeomMultiPolygon();
+
+ void setGeomMultiPolygon(org.apache.olingo.commons.api.edm.geo.MultiPolygon _geomMultiPolygon);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Geog",
+ type = "Edm.Geography")
+ Annotatable getGeogAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogPoint",
+ type = "Edm.GeographyPoint")
+ Annotatable getGeogPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogLine",
+ type = "Edm.GeographyLineString")
+ Annotatable getGeogLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogPolygon",
+ type = "Edm.GeographyPolygon")
+ Annotatable getGeogPolygonAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogCollection",
+ type = "Edm.GeographyCollection")
+ Annotatable getGeogCollectionAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogMultiPoint",
+ type = "Edm.GeographyMultiPoint")
+ Annotatable getGeogMultiPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogMultiLine",
+ type = "Edm.GeographyMultiLineString")
+ Annotatable getGeogMultiLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogMultiPolygon",
+ type = "Edm.GeographyMultiPolygon")
+ Annotatable getGeogMultiPolygonAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Geom",
+ type = "Edm.Geometry")
+ Annotatable getGeomAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomPoint",
+ type = "Edm.GeometryPoint")
+ Annotatable getGeomPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomLine",
+ type = "Edm.GeometryLineString")
+ Annotatable getGeomLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomPolygon",
+ type = "Edm.GeometryPolygon")
+ Annotatable getGeomPolygonAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomCollection",
+ type = "Edm.GeometryCollection")
+ Annotatable getGeomCollectionAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomMultiPoint",
+ type = "Edm.GeometryMultiPoint")
+ Annotatable getGeomMultiPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomMultiLine",
+ type = "Edm.GeometryMultiLineString")
+ Annotatable getGeomMultiLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomMultiPolygon",
+ type = "Edm.GeometryMultiPolygon")
+ Annotatable getGeomMultiPolygonAnnotations();
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
index 0d31650..40bedca 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface AllSpatialTypesCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes> {
+public interface AllSpatialTypesCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
index c0bfa34..64b069b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
@@ -1,86 +1,55 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "AuditInfo")
-public interface AuditInfo
+public interface AuditInfo
extends java.io.Serializable {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ModifiedDate", type = "Edm.DateTime", nullable = false)
+ java.util.Calendar getModifiedDate();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ModifiedDate", type = "Edm.DateTime", nullable = false)
- java.util.Calendar getModifiedDate();
-
- void setModifiedDate(java.util.Calendar _modifiedDate);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ModifiedBy", type = "Edm.String", nullable = true)
- java.lang.String getModifiedBy();
-
- void setModifiedBy(java.lang.String _modifiedBy);
+ void setModifiedDate(java.util.Calendar _modifiedDate);
-
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ModifiedBy", type = "Edm.String", nullable = true)
+ java.lang.String getModifiedBy();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo", nullable = true)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getConcurrency();
+ void setModifiedBy(java.lang.String _modifiedBy);
- void setConcurrency(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo", nullable = true)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo
+ getConcurrency();
-
+ void
+ setConcurrency(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency);
- ComplexFactory factory();
+ ComplexFactory factory();
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newConcurrency();
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo
+ newConcurrency();
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
index a275af5..05549f9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
@@ -1,248 +1,251 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
@KeyRef(OrderLineKey.class)
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "BackOrderLine",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine")
-public interface BackOrderLine
- extends Annotatable,org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine {
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderLineStream",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.io.InputStream getOrderLineStream();
-
- void setOrderLineStream(java.io.InputStream _orderLineStream);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getOrderId();
-
- void setOrderId(java.lang.Integer _orderId);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductId();
-
- void setProductId(java.lang.Integer _productId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getQuantity();
-
- void setQuantity(java.lang.Integer _quantity);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getConcurrencyToken();
-
- void setConcurrencyToken(java.lang.String _concurrencyToken);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Order",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Order",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order getOrder();
-
- void setOrder(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Product",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product getProduct();
-
- void setProduct(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
-
-
- @Override
- Operations operations();
-
- interface Operations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine.Operations{
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine.ComplexFactory{
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderLineStream",
- type = "Edm.Stream")
- Annotatable getOrderLineStreamAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
- type = "Edm.Int32")
- Annotatable getOrderIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
- type = "Edm.Int32")
- Annotatable getProductIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Quantity",
- type = "Edm.Int32")
- Annotatable getQuantityAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
- type = "Edm.String")
- Annotatable getConcurrencyTokenAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Order",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
- Annotatable getOrderAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
- Annotatable getProductAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine")
+public interface BackOrderLine
+ extends
+ Annotatable,
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderLineStream",
+ type = "Edm.Stream",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.io.InputStream getOrderLineStream();
+
+ @Override
+ void setOrderLineStream(java.io.InputStream _orderLineStream);
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getOrderId();
+
+ @Override
+ void setOrderId(java.lang.Integer _orderId);
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductId();
+
+ @Override
+ void setProductId(java.lang.Integer _productId);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getQuantity();
+
+ @Override
+ void setQuantity(java.lang.Integer _quantity);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getConcurrencyToken();
+
+ @Override
+ void setConcurrencyToken(java.lang.String _concurrencyToken);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Order",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Order",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order
+ getOrder();
+
+ @Override
+ void
+ setOrder(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Product",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product
+ getProduct();
+
+ @Override
+ void
+ setProduct(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+
+ @Override
+ Operations operations();
+
+ interface Operations
+ extends
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine.Operations {
+
+ }
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory
+ extends
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine.ComplexFactory {}
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations
+ extends
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderLineStream",
+ type = "Edm.Stream")
+ Annotatable getOrderLineStreamAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
+ type = "Edm.Int32")
+ Annotatable getOrderIdAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Quantity",
+ type = "Edm.Int32")
+ Annotatable getQuantityAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
+ type = "Edm.String")
+ Annotatable getConcurrencyTokenAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Order",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
+ Annotatable getOrderAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getProductAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
index 3a9263c..d5ac74c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
@@ -1,248 +1,251 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
@KeyRef(OrderLineKey.class)
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "BackOrderLine2",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.BackOrderLine")
-public interface BackOrderLine2
- extends Annotatable,org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine {
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderLineStream",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.io.InputStream getOrderLineStream();
-
- void setOrderLineStream(java.io.InputStream _orderLineStream);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getOrderId();
-
- void setOrderId(java.lang.Integer _orderId);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductId();
-
- void setProductId(java.lang.Integer _productId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getQuantity();
-
- void setQuantity(java.lang.Integer _quantity);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getConcurrencyToken();
-
- void setConcurrencyToken(java.lang.String _concurrencyToken);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Order",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Order",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order getOrder();
-
- void setOrder(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Product",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product getProduct();
-
- void setProduct(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
-
-
- @Override
- Operations operations();
-
- interface Operations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine.Operations{
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine.ComplexFactory{
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderLineStream",
- type = "Edm.Stream")
- Annotatable getOrderLineStreamAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
- type = "Edm.Int32")
- Annotatable getOrderIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
- type = "Edm.Int32")
- Annotatable getProductIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Quantity",
- type = "Edm.Int32")
- Annotatable getQuantityAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
- type = "Edm.String")
- Annotatable getConcurrencyTokenAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Order",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
- Annotatable getOrderAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
- Annotatable getProductAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.BackOrderLine")
+public interface BackOrderLine2
+ extends
+ Annotatable,
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderLineStream",
+ type = "Edm.Stream",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.io.InputStream getOrderLineStream();
+
+ @Override
+ void setOrderLineStream(java.io.InputStream _orderLineStream);
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getOrderId();
+
+ @Override
+ void setOrderId(java.lang.Integer _orderId);
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductId();
+
+ @Override
+ void setProductId(java.lang.Integer _productId);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getQuantity();
+
+ @Override
+ void setQuantity(java.lang.Integer _quantity);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getConcurrencyToken();
+
+ @Override
+ void setConcurrencyToken(java.lang.String _concurrencyToken);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Order",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Order",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order
+ getOrder();
+
+ @Override
+ void
+ setOrder(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Product",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product
+ getProduct();
+
+ @Override
+ void
+ setProduct(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+
+ @Override
+ Operations operations();
+
+ interface Operations
+ extends
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine.Operations {
+
+ }
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory
+ extends
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine.ComplexFactory {}
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations
+ extends
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderLineStream",
+ type = "Edm.Stream")
+ Annotatable getOrderLineStreamAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
+ type = "Edm.Int32")
+ Annotatable getOrderIdAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Quantity",
+ type = "Edm.Int32")
+ Annotatable getQuantityAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
+ type = "Edm.String")
+ Annotatable getConcurrencyTokenAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Order",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
+ Annotatable getOrderAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getProductAnnotations();
+ }
}
[23/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java
index 4c01877..9515338 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java
@@ -1,630 +1,591 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "MappedEntityType",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface MappedEntityType
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getId();
-
- void setId(java.lang.Integer _id);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Href",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getHref();
-
- void setHref(java.lang.String _href);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Title",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getTitle();
-
- void setTitle(java.lang.String _title);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HrefLang",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getHrefLang();
-
- void setHrefLang(java.lang.String _hrefLang);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Type",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getType();
-
- void setType(java.lang.String _type);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Length",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getLength();
-
- void setLength(java.lang.Integer _length);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfPrimitiveToLinks",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.lang.String> getBagOfPrimitiveToLinks();
-
- void setBagOfPrimitiveToLinks(java.util.Collection<java.lang.String> _bagOfPrimitiveToLinks);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Logo",
- type = "Edm.Binary",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- byte[] getLogo();
-
- void setLogo(byte[] _logo);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfDecimals",
- type = "Edm.Decimal",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.math.BigDecimal> getBagOfDecimals();
-
- void setBagOfDecimals(java.util.Collection<java.math.BigDecimal> _bagOfDecimals);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfDoubles",
- type = "Edm.Double",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.lang.Double> getBagOfDoubles();
-
- void setBagOfDoubles(java.util.Collection<java.lang.Double> _bagOfDoubles);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfSingles",
- type = "Edm.Single",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.lang.Float> getBagOfSingles();
-
- void setBagOfSingles(java.util.Collection<java.lang.Float> _bagOfSingles);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfBytes",
- type = "Edm.Byte",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.lang.Short> getBagOfBytes();
-
- void setBagOfBytes(java.util.Collection<java.lang.Short> _bagOfBytes);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfInt16s",
- type = "Edm.Int16",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.lang.Short> getBagOfInt16s();
-
- void setBagOfInt16s(java.util.Collection<java.lang.Short> _bagOfInt16s);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfInt32s",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.lang.Integer> getBagOfInt32s();
-
- void setBagOfInt32s(java.util.Collection<java.lang.Integer> _bagOfInt32s);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfInt64s",
- type = "Edm.Int64",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.lang.Long> getBagOfInt64s();
-
- void setBagOfInt64s(java.util.Collection<java.lang.Long> _bagOfInt64s);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfGuids",
- type = "Edm.Guid",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.util.UUID> getBagOfGuids();
-
- void setBagOfGuids(java.util.Collection<java.util.UUID> _bagOfGuids);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfDateTime",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.util.Calendar> getBagOfDateTime();
-
- void setBagOfDateTime(java.util.Collection<java.util.Calendar> _bagOfDateTime);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfComplexToCategories",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory> getBagOfComplexToCategories();
-
- void setBagOfComplexToCategories(java.util.Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory> _bagOfComplexToCategories);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexPhone",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getComplexPhone();
-
- void setComplexPhone(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _complexPhone);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexContactDetails",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails getComplexContactDetails();
-
- void setComplexContactDetails(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _complexContactDetails);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfComplexToCategories",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory newBagOfComplexToCategories();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexPhone",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newComplexPhone();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexContactDetails",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newComplexContactDetails();
-
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Int32")
- Annotatable getIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Href",
- type = "Edm.String")
- Annotatable getHrefAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Title",
- type = "Edm.String")
- Annotatable getTitleAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HrefLang",
- type = "Edm.String")
- Annotatable getHrefLangAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Type",
- type = "Edm.String")
- Annotatable getTypeAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Length",
- type = "Edm.Int32")
- Annotatable getLengthAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfPrimitiveToLinks",
- type = "Edm.String")
- Annotatable getBagOfPrimitiveToLinksAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Logo",
- type = "Edm.Binary")
- Annotatable getLogoAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfDecimals",
- type = "Edm.Decimal")
- Annotatable getBagOfDecimalsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfDoubles",
- type = "Edm.Double")
- Annotatable getBagOfDoublesAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfSingles",
- type = "Edm.Single")
- Annotatable getBagOfSinglesAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfBytes",
- type = "Edm.Byte")
- Annotatable getBagOfBytesAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfInt16s",
- type = "Edm.Int16")
- Annotatable getBagOfInt16sAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfInt32s",
- type = "Edm.Int32")
- Annotatable getBagOfInt32sAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfInt64s",
- type = "Edm.Int64")
- Annotatable getBagOfInt64sAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfGuids",
- type = "Edm.Guid")
- Annotatable getBagOfGuidsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfDateTime",
- type = "Edm.DateTime")
- Annotatable getBagOfDateTimeAnnotations();
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface MappedEntityType
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getId();
+
+ void setId(java.lang.Integer _id);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Href",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getHref();
+
+ void setHref(java.lang.String _href);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Title",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getTitle();
+
+ void setTitle(java.lang.String _title);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HrefLang",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getHrefLang();
+
+ void setHrefLang(java.lang.String _hrefLang);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Type",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getType();
+
+ void setType(java.lang.String _type);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Length",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getLength();
+
+ void setLength(java.lang.Integer _length);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfPrimitiveToLinks",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.lang.String> getBagOfPrimitiveToLinks();
+
+ void setBagOfPrimitiveToLinks(java.util.Collection<java.lang.String> _bagOfPrimitiveToLinks);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Logo",
+ type = "Edm.Binary",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ byte[] getLogo();
+
+ void setLogo(byte[] _logo);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfDecimals",
+ type = "Edm.Decimal",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.math.BigDecimal> getBagOfDecimals();
+
+ void setBagOfDecimals(java.util.Collection<java.math.BigDecimal> _bagOfDecimals);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfDoubles",
+ type = "Edm.Double",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.lang.Double> getBagOfDoubles();
+
+ void setBagOfDoubles(java.util.Collection<java.lang.Double> _bagOfDoubles);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfSingles",
+ type = "Edm.Single",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.lang.Float> getBagOfSingles();
+
+ void setBagOfSingles(java.util.Collection<java.lang.Float> _bagOfSingles);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfBytes",
+ type = "Edm.Byte",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.lang.Short> getBagOfBytes();
+
+ void setBagOfBytes(java.util.Collection<java.lang.Short> _bagOfBytes);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfInt16s",
+ type = "Edm.Int16",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.lang.Short> getBagOfInt16s();
+
+ void setBagOfInt16s(java.util.Collection<java.lang.Short> _bagOfInt16s);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfInt32s",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.lang.Integer> getBagOfInt32s();
+
+ void setBagOfInt32s(java.util.Collection<java.lang.Integer> _bagOfInt32s);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfInt64s",
+ type = "Edm.Int64",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.lang.Long> getBagOfInt64s();
+
+ void setBagOfInt64s(java.util.Collection<java.lang.Long> _bagOfInt64s);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfGuids",
+ type = "Edm.Guid",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.util.UUID> getBagOfGuids();
+
+ void setBagOfGuids(java.util.Collection<java.util.UUID> _bagOfGuids);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfDateTime",
+ type = "Edm.DateTime",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.util.Calendar> getBagOfDateTime();
+
+ void setBagOfDateTime(java.util.Collection<java.util.Calendar> _bagOfDateTime);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfComplexToCategories",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory>
+ getBagOfComplexToCategories();
+
+ void
+ setBagOfComplexToCategories(
+ java.util.Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory> _bagOfComplexToCategories);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexPhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone
+ getComplexPhone();
+
+ void
+ setComplexPhone(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _complexPhone);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexContactDetails",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails
+ getComplexContactDetails();
+
+ void
+ setComplexContactDetails(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _complexContactDetails);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfComplexToCategories",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory
+ newBagOfComplexToCategories();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexPhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone
+ newComplexPhone();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexContactDetails",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails
+ newComplexContactDetails();
+
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Href",
+ type = "Edm.String")
+ Annotatable getHrefAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Title",
+ type = "Edm.String")
+ Annotatable getTitleAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HrefLang",
+ type = "Edm.String")
+ Annotatable getHrefLangAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Type",
+ type = "Edm.String")
+ Annotatable getTypeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Length",
+ type = "Edm.Int32")
+ Annotatable getLengthAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfPrimitiveToLinks",
+ type = "Edm.String")
+ Annotatable getBagOfPrimitiveToLinksAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Logo",
+ type = "Edm.Binary")
+ Annotatable getLogoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfDecimals",
+ type = "Edm.Decimal")
+ Annotatable getBagOfDecimalsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfDoubles",
+ type = "Edm.Double")
+ Annotatable getBagOfDoublesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfSingles",
+ type = "Edm.Single")
+ Annotatable getBagOfSinglesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfBytes",
+ type = "Edm.Byte")
+ Annotatable getBagOfBytesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfInt16s",
+ type = "Edm.Int16")
+ Annotatable getBagOfInt16sAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfInt32s",
+ type = "Edm.Int32")
+ Annotatable getBagOfInt32sAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfInt64s",
+ type = "Edm.Int64")
+ Annotatable getBagOfInt64sAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfGuids",
+ type = "Edm.Guid")
+ Annotatable getBagOfGuidsAnnotations();
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfComplexToCategories",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory")
- Annotatable getBagOfComplexToCategoriesAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfDateTime",
+ type = "Edm.DateTime")
+ Annotatable getBagOfDateTimeAnnotations();
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComplexPhone",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
- Annotatable getComplexPhoneAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfComplexToCategories",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory")
+ Annotatable getBagOfComplexToCategoriesAnnotations();
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComplexContactDetails",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
- Annotatable getComplexContactDetailsAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComplexPhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
+ Annotatable getComplexPhoneAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComplexContactDetails",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
+ Annotatable getComplexContactDetailsAnnotations();
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java
index ecc3a3e..124f46b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface MappedEntityTypeCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType> {
+public interface MappedEntityTypeCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java
index 4d64d2b..088d8c4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java
@@ -1,309 +1,281 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
@KeyRef(MessageKey.class)
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Message",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Message
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MessageId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getMessageId();
-
- void setMessageId(java.lang.Integer _messageId);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FromUsername",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getFromUsername();
-
- void setFromUsername(java.lang.String _fromUsername);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ToUsername",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getToUsername();
-
- void setToUsername(java.lang.String _toUsername);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Sent",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getSent();
-
- void setSent(java.util.Calendar _sent);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Subject",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getSubject();
-
- void setSubject(java.lang.String _subject);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Body",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getBody();
-
- void setBody(java.lang.String _body);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "IsRead",
- type = "Edm.Boolean",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Boolean getIsRead();
-
- void setIsRead(java.lang.Boolean _isRead);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Sender",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login getSender();
-
- void setSender(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _sender);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Recipient",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login getRecipient();
-
- void setRecipient(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _recipient);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Attachments",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.MessageAttachment",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "MessageAttachment",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection getAttachments();
-
- void setAttachments(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection _attachments);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "MessageId",
- type = "Edm.Int32")
- Annotatable getMessageIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FromUsername",
- type = "Edm.String")
- Annotatable getFromUsernameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ToUsername",
- type = "Edm.String")
- Annotatable getToUsernameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Sent",
- type = "Edm.DateTimeOffset")
- Annotatable getSentAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Subject",
- type = "Edm.String")
- Annotatable getSubjectAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Body",
- type = "Edm.String")
- Annotatable getBodyAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "IsRead",
- type = "Edm.Boolean")
- Annotatable getIsReadAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Sender",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
- Annotatable getSenderAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Recipient",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
- Annotatable getRecipientAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Attachments",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.MessageAttachment")
- Annotatable getAttachmentsAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Message
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MessageId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getMessageId();
+
+ void setMessageId(java.lang.Integer _messageId);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FromUsername",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getFromUsername();
+
+ void setFromUsername(java.lang.String _fromUsername);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ToUsername",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getToUsername();
+
+ void setToUsername(java.lang.String _toUsername);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Sent",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getSent();
+
+ void setSent(java.util.Calendar _sent);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Subject",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getSubject();
+
+ void setSubject(java.lang.String _subject);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Body",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getBody();
+
+ void setBody(java.lang.String _body);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "IsRead",
+ type = "Edm.Boolean",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Boolean getIsRead();
+
+ void setIsRead(java.lang.Boolean _isRead);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Sender",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Login",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login
+ getSender();
+
+ void
+ setSender(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _sender);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Recipient",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Login",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login
+ getRecipient();
+
+ void
+ setRecipient(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _recipient);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Attachments",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.MessageAttachment",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "MessageAttachment",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection
+ getAttachments();
+
+ void
+ setAttachments(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection _attachments);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "MessageId",
+ type = "Edm.Int32")
+ Annotatable getMessageIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FromUsername",
+ type = "Edm.String")
+ Annotatable getFromUsernameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ToUsername",
+ type = "Edm.String")
+ Annotatable getToUsernameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Sent",
+ type = "Edm.DateTimeOffset")
+ Annotatable getSentAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Subject",
+ type = "Edm.String")
+ Annotatable getSubjectAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Body",
+ type = "Edm.String")
+ Annotatable getBodyAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "IsRead",
+ type = "Edm.Boolean")
+ Annotatable getIsReadAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Sender",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getSenderAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Recipient",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getRecipientAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Attachments",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.MessageAttachment")
+ Annotatable getAttachmentsAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java
index 32b4a58..2a2fa22 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java
@@ -1,132 +1,98 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "MessageAttachment",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface MessageAttachment
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AttachmentId",
- type = "Edm.Guid",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.UUID getAttachmentId();
-
- void setAttachmentId(java.util.UUID _attachmentId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Attachment",
- type = "Edm.Binary",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- byte[] getAttachment();
-
- void setAttachment(byte[] _attachment);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "AttachmentId",
- type = "Edm.Guid")
- Annotatable getAttachmentIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Attachment",
- type = "Edm.Binary")
- Annotatable getAttachmentAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface MessageAttachment
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AttachmentId",
+ type = "Edm.Guid",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.UUID getAttachmentId();
+
+ void setAttachmentId(java.util.UUID _attachmentId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Attachment",
+ type = "Edm.Binary",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ byte[] getAttachment();
+
+ void setAttachment(byte[] _attachment);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "AttachmentId",
+ type = "Edm.Guid")
+ Annotatable getAttachmentIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Attachment",
+ type = "Edm.Binary")
+ Annotatable getAttachmentAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java
index 0f1c69c..ab31fdb 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface MessageAttachmentCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment> {
+public interface MessageAttachmentCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment> {
Object getAnnotation(Class<? extends AbstractTerm> term);
[04/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/PropertyValueTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/PropertyValueTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/PropertyValueTestITCase.java
index 82296f2..d64c89f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/PropertyValueTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/PropertyValueTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -38,7 +38,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveIntPropertyValueTest() {
CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Product").appendKeySegment(-10).appendPropertySegment("ProductId");
+ appendEntitySetSegment("Product").appendKeySegment(-10).appendPropertySegment("ProductId");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
req.setFormat(ODataFormat.TEXT_PLAIN);
final ODataValue value = req.execute().getBody();
@@ -49,7 +49,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveBooleanPropertyValueTest() {
CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Product").appendKeySegment(-10).appendPropertySegment("ProductId");
+ appendEntitySetSegment("Product").appendKeySegment(-10).appendPropertySegment("ProductId");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
req.setFormat(ODataFormat.TEXT_PLAIN);
final ODataValue value = req.execute().getBody();
@@ -60,7 +60,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveStringPropertyValueTest() {
CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Product").appendKeySegment(-6).appendPropertySegment("Description");
+ appendEntitySetSegment("Product").appendKeySegment(-6).appendPropertySegment("Description");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
req.setFormat(ODataFormat.TEXT_PLAIN);
final ODataValue value = req.execute().getBody();
@@ -71,8 +71,8 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveDatePropertyValueTest() {
CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Product").appendKeySegment(-7).appendPropertySegment(
- "NestedComplexConcurrency/ModifiedDate");
+ appendEntitySetSegment("Product").appendKeySegment(-7).appendPropertySegment(
+ "NestedComplexConcurrency/ModifiedDate");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
req.setFormat(ODataFormat.TEXT_PLAIN);
final ODataValue value = req.execute().getBody();
@@ -83,7 +83,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveDecimalPropertyValueTest() {
CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Product").appendKeySegment(-6).appendPropertySegment("Dimensions/Height");
+ appendEntitySetSegment("Product").appendKeySegment(-6).appendPropertySegment("Dimensions/Height");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
req.setFormat(ODataFormat.TEXT_PLAIN);
final ODataValue value = req.execute().getBody();
@@ -94,7 +94,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveBinaryPropertyValueTest() throws IOException {
CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendNavigationSegment("ProductPhoto(PhotoId=-3,ProductId=-3)").appendPropertySegment("Photo");
+ appendNavigationSegment("ProductPhoto(PhotoId=-3,ProductId=-3)").appendPropertySegment("Photo");
ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setAccept("application/json");
ODataRetrieveResponse<ODataEntity> res = req.execute();
@@ -102,14 +102,14 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
ODataEntity entity = res.getBody();
assertNotNull(entity);
assertEquals("fi653p3+MklA/LdoBlhWgnMTUUEo8tEgtbMXnF0a3CUNL9BZxXpSRiD9ebTnmNR0zWPjJ"
- + "VIDx4tdmCnq55XrJh+RW9aI/b34wAogK3kcORw=",
- entity.getProperties().get(0).getValue().toString());
+ + "VIDx4tdmCnq55XrJh+RW9aI/b34wAogK3kcORw=",
+ entity.getProperties().get(0).getValue().toString());
}
@Test(expected = ODataClientErrorException.class)
public void retrieveBinaryPropertyValueTestWithAtom() throws IOException {
CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendNavigationSegment("ProductPhoto(PhotoId=-3,ProductId=-3)").appendPropertySegment("Photo");
+ appendNavigationSegment("ProductPhoto(PhotoId=-3,ProductId=-3)").appendPropertySegment("Photo");
ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setAccept("application/atom+xml");
ODataRetrieveResponse<ODataEntity> res = req.execute();
@@ -120,7 +120,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test(expected = IllegalArgumentException.class)
public void retrieveBinaryPropertyValueTestWithXML() throws IOException {
CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendNavigationSegment("ProductPhoto(PhotoId=-3,ProductId=-3)").appendPropertySegment("Photo");
+ appendNavigationSegment("ProductPhoto(PhotoId=-3,ProductId=-3)").appendPropertySegment("Photo");
ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setAccept("application/xml");
ODataRetrieveResponse<ODataEntity> res = req.execute();
@@ -131,8 +131,8 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveCollectionPropertyValueTest() {
CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Product").appendKeySegment(-7).appendPropertySegment(
- "ComplexConcurrency/QueriedDateTime");
+ appendEntitySetSegment("Product").appendKeySegment(-7).appendPropertySegment(
+ "ComplexConcurrency/QueriedDateTime");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
req.setFormat(ODataFormat.TEXT_PLAIN);
final ODataValue value = req.execute().getBody();
@@ -145,8 +145,8 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveNullPropertyValueTest() {
CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Product").appendKeySegment(-10).appendPropertySegment(
- "ComplexConcurrency/Token");
+ appendEntitySetSegment("Product").appendKeySegment(-10).appendPropertySegment(
+ "ComplexConcurrency/Token");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
try {
req.execute().getBody();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/QueryOptionsTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/QueryOptionsTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/QueryOptionsTestITCase.java
index 09f4a33..202af48 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/QueryOptionsTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/QueryOptionsTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -52,17 +52,17 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
/**
* Test <tt>$filter</tt> and <tt>orderby</tt>.
- *
+ *
* @see org.apache.olingo.fit.v3.FilterFactoryTestITCase for more tests.
*/
@Test
public void filterOrderby() throws EdmPrimitiveTypeException {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Car").filter("(VIN lt 16)");
+ appendEntitySetSegment("Car").filter("(VIN lt 16)");
// 1. check that filtered entity set looks as expected
ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
- getEntitySetRequest(uriBuilder.build());
+ getEntitySetRequest(uriBuilder.build());
ODataEntitySet feed = req.execute().getBody();
assertNotNull(feed);
assertEquals(5, feed.getEntities().size());
@@ -98,7 +98,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
@Test
public void format() {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Customer").appendKeySegment(-10).format("json");
+ appendEntitySetSegment("Customer").appendKeySegment(-10).format("json");
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setFormat(ODataFormat.ATOM);
@@ -106,7 +106,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
final ODataRetrieveResponse<ODataEntity> res = req.execute();
assertNotNull(res);
assertTrue(res.getContentType().replaceAll(" ", "").
- startsWith(ODataFormat.JSON.getContentType(client.getServiceVersion()).toContentTypeString()));
+ startsWith(ODataFormat.JSON.getContentType(client.getServiceVersion()).toContentTypeString()));
}
/**
@@ -132,7 +132,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
uriBuilder.appendEntitySetSegment("Customer").skipToken("-10");
final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
- getEntitySetRequest(uriBuilder.build());
+ getEntitySetRequest(uriBuilder.build());
final ODataEntitySet feed = req.execute().getBody();
assertNotNull(feed);
assertEquals(2, feed.getEntities().size());
@@ -148,10 +148,10 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
@Test
public void inlinecount() {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car").
- inlineCount(InlineCount.allpages);
+ inlineCount(InlineCount.allpages);
final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
- getEntitySetRequest(uriBuilder.build());
+ getEntitySetRequest(uriBuilder.build());
req.setFormat(ODataFormat.ATOM);
final ODataEntitySet feed = req.execute().getBody();
assertNotNull(feed);
@@ -164,7 +164,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
@Test
public void select() {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Customer").appendKeySegment(-10).select("CustomerId,Orders").expand("Orders");
+ appendEntitySetSegment("Customer").appendKeySegment(-10).select("CustomerId,Orders").expand("Orders");
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
final ODataEntity customer = req.execute().getBody();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/ServiceDocumentTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/ServiceDocumentTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/ServiceDocumentTestITCase.java
index 25a2b37..f961f4f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/ServiceDocumentTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/ServiceDocumentTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.v3;
import static org.junit.Assert.assertEquals;
import java.net.URI;
+
import org.apache.olingo.client.api.communication.request.retrieve.ODataServiceDocumentRequest;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.commons.api.domain.ODataServiceDocument;
@@ -31,7 +32,7 @@ public class ServiceDocumentTestITCase extends AbstractTestITCase {
private void retrieveServiceDocument(final ODataFormat format) {
final ODataServiceDocumentRequest req =
- client.getRetrieveRequestFactory().getServiceDocumentRequest(testStaticServiceRootURL);
+ client.getRetrieveRequestFactory().getServiceDocumentRequest(testStaticServiceRootURL);
req.setFormat(format);
final ODataRetrieveResponse<ODataServiceDocument> res = req.execute();
@@ -41,7 +42,7 @@ public class ServiceDocumentTestITCase extends AbstractTestITCase {
assertEquals(24, serviceDocument.getEntitySetNames().size());
assertEquals(URI.create(testStaticServiceRootURL + "/ComputerDetail"),
- serviceDocument.getEntitySetURI("ComputerDetail"));
+ serviceDocument.getEntitySetURI("ComputerDetail"));
}
@Test
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/XHTTPMethodEntityUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/XHTTPMethodEntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/XHTTPMethodEntityUpdateTestITCase.java
index a7589b7..ea12efd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/XHTTPMethodEntityUpdateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/XHTTPMethodEntityUpdateTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/XHTTPMethodPropertyUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/XHTTPMethodPropertyUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/XHTTPMethodPropertyUpdateTestITCase.java
index 99ec3b5..291bac4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/XHTTPMethodPropertyUpdateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/XHTTPMethodPropertyUpdateTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
index c7f3557..1ecd4bb 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -81,7 +81,7 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
testAuthServiceRootURL = "http://localhost:9080/stub/DefaultService.svc/V40/Static.svc";
edmClient = ODataClientFactory.getEdmEnabledV4(testStaticServiceRootURL);
-
+
edmClient.getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
client.getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
}
@@ -109,36 +109,36 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
protected void createAndDeleteOrder(final ODataFormat format, final int id) {
final ODataEntity order = new ODataEntityImpl(
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order"));
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order"));
final ODataProperty orderId = getClient().getObjectFactory().newPrimitiveProperty("OrderID",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id));
order.getProperties().add(orderId);
Calendar dateTime = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
dateTime.set(2011, 2, 4, 16, 3, 57);
final ODataProperty orderDate = getClient().getObjectFactory().newPrimitiveProperty("OrderDate",
- getClient().getObjectFactory().newPrimitiveValueBuilder()
+ getClient().getObjectFactory().newPrimitiveValueBuilder()
.setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(dateTime).build());
order.getProperties().add(orderDate);
final ODataProperty shelfLife = getClient().getObjectFactory().newPrimitiveProperty("ShelfLife",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
setType(EdmPrimitiveTypeKind.Duration).setValue(BigDecimal.TEN.scaleByPowerOfTen(7)).build());
order.getProperties().add(shelfLife);
final ODataCollectionValue<ODataValue> orderShelfLifesValue = getClient().getObjectFactory().
- newCollectionValue("Collection(Duration)");
+ newCollectionValue("Collection(Duration)");
orderShelfLifesValue.add(getClient().getObjectFactory().newPrimitiveValueBuilder().
- setType(EdmPrimitiveTypeKind.Duration).setValue(new BigDecimal("0.0000001")).build());
+ setType(EdmPrimitiveTypeKind.Duration).setValue(new BigDecimal("0.0000001")).build());
orderShelfLifesValue.add(getClient().getObjectFactory().newPrimitiveValueBuilder().
- setType(EdmPrimitiveTypeKind.Duration).setValue(new BigDecimal("0.0000002")).build());
+ setType(EdmPrimitiveTypeKind.Duration).setValue(new BigDecimal("0.0000002")).build());
final ODataProperty orderShelfLifes = getClient().getObjectFactory().
- newCollectionProperty("OrderShelfLifes", orderShelfLifesValue);
+ newCollectionProperty("OrderShelfLifes", orderShelfLifesValue);
order.getProperties().add(orderShelfLifes);
final ODataEntityCreateRequest<ODataEntity> req = getClient().getCUDRequestFactory().getEntityCreateRequest(
- getClient().newURIBuilder(testStaticServiceRootURL).
+ getClient().newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Orders").build(), order);
req.setFormat(format);
final ODataEntity created = req.execute().getBody();
@@ -146,9 +146,9 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
assertEquals(2, created.getProperty("OrderShelfLifes").getCollectionValue().size());
final URI deleteURI = created.getEditLink() == null
- ? getClient().newURIBuilder(testStaticServiceRootURL).
+ ? getClient().newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Orders").appendKeySegment(id).build()
- : created.getEditLink();
+ : created.getEditLink();
final ODataDeleteRequest deleteReq = getClient().getCUDRequestFactory().getDeleteRequest(deleteURI);
final ODataDeleteResponse deleteRes = deleteReq.execute();
assertEquals(204, deleteRes.getStatusCode());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java
index bcc8313..56c07a6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -48,9 +48,9 @@ public class AsyncTestITCase extends AbstractTestITCase {
@Test
public void clientAsync() throws InterruptedException, ExecutionException {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Customers");
+ appendEntitySetSegment("Customers");
final Future<ODataRetrieveResponse<ODataEntitySet>> futureRes =
- client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build()).asyncExecute();
+ client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build()).asyncExecute();
assertNotNull(futureRes);
while (!futureRes.isDone()) {
@@ -65,13 +65,13 @@ public class AsyncTestITCase extends AbstractTestITCase {
private void withInlineEntry(final ODataFormat format) {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company");
+ appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company");
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setFormat(format);
final AsyncRequestWrapper<ODataRetrieveResponse<ODataEntity>> async =
- client.getAsyncRequestFactory().<ODataRetrieveResponse<ODataEntity>>getAsyncRequestWrapper(req);
+ client.getAsyncRequestFactory().<ODataRetrieveResponse<ODataEntity>> getAsyncRequestWrapper(req);
final AsyncResponseWrapper<ODataRetrieveResponse<ODataEntity>> responseWrapper = async.execute();
@@ -102,15 +102,15 @@ public class AsyncTestITCase extends AbstractTestITCase {
assertEquals(5, properties.size());
assertTrue(properties.get(0).getName().equals("CompanyID")
- || properties.get(1).getName().equals("CompanyID")
- || properties.get(2).getName().equals("CompanyID")
- || properties.get(3).getName().equals("CompanyID")
- || properties.get(4).getName().equals("CompanyID"));
+ || properties.get(1).getName().equals("CompanyID")
+ || properties.get(2).getName().equals("CompanyID")
+ || properties.get(3).getName().equals("CompanyID")
+ || properties.get(4).getName().equals("CompanyID"));
assertTrue(properties.get(0).getValue().toString().equals("0")
- || properties.get(1).getValue().toString().equals("0")
- || properties.get(2).getValue().toString().equals("0")
- || properties.get(3).getValue().toString().equals("0")
- || properties.get(4).getValue().toString().equals("0"));
+ || properties.get(1).getValue().toString().equals("0")
+ || properties.get(2).getValue().toString().equals("0")
+ || properties.get(3).getValue().toString().equals("0")
+ || properties.get(4).getValue().toString().equals("0"));
found = true;
}
@@ -132,14 +132,14 @@ public class AsyncTestITCase extends AbstractTestITCase {
private void asyncOrders(final ODataFormat format) {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("async").appendEntitySetSegment("Orders");
+ appendEntitySetSegment("async").appendEntitySetSegment("Orders");
final ODataEntitySetRequest<ODataEntitySet> req =
- client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
+ client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
req.setFormat(format);
final AsyncRequestWrapper<ODataRetrieveResponse<ODataEntitySet>> async =
- client.getAsyncRequestFactory().<ODataRetrieveResponse<ODataEntitySet>>getAsyncRequestWrapper(req);
+ client.getAsyncRequestFactory().<ODataRetrieveResponse<ODataEntitySet>> getAsyncRequestWrapper(req);
async.callback(URI.create("http://client.service.it/callback/endpoint"));
final AsyncResponseWrapper<ODataRetrieveResponse<ODataEntitySet>> responseWrapper = async.execute();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java
index d09db86..ca42f04 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java
@@ -1,12 +1,12 @@
/*
* Copyright 2014 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -96,15 +96,15 @@ public class AuthBatchTestITCase extends AbstractTestITCase {
final URI editLink = targetURI.build();
final ODataEntity patch = client.getObjectFactory().newEntity(
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
patch.setEditLink(editLink);
patch.getProperties().add(client.getObjectFactory().newPrimitiveProperty(
- "LastName",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("new last name")));
+ "LastName",
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("new last name")));
final ODataEntityUpdateRequest<ODataEntity> changeReq =
- client.getCUDRequestFactory().getEntityUpdateRequest(UpdateType.PATCH, patch);
+ client.getCUDRequestFactory().getEntityUpdateRequest(UpdateType.PATCH, patch);
changeReq.setFormat(ODataFormat.JSON_FULL_METADATA);
changeset.addRequest(changeReq);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java
index 0f511b8..6fdf434 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -158,7 +158,7 @@ public class BatchTestITCase extends AbstractTestITCase {
assertEquals(404, res.getStatusCode());
assertEquals("Not Found", res.getStatusMessage());
assertEquals(Integer.valueOf(3), Integer.valueOf(
- res.getHeader(ODataBatchConstants.CHANGESET_CONTENT_ID_NAME).iterator().next()));
+ res.getHeader(ODataBatchConstants.CHANGESET_CONTENT_ID_NAME).iterator().next()));
assertFalse(retitem.hasNext());
assertFalse(iter.hasNext());
@@ -249,7 +249,7 @@ public class BatchTestITCase extends AbstractTestITCase {
// add create request
final ODataEntityCreateRequest<ODataEntity> createReq =
- client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), order);
+ client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), order);
changeset.addRequest(createReq);
@@ -259,19 +259,19 @@ public class BatchTestITCase extends AbstractTestITCase {
// add update request: link CustomerInfo(17) to the new customer
final ODataEntity customerChanges = client.getObjectFactory().newEntity(order.getTypeName());
customerChanges.addLink(client.getObjectFactory().newEntitySetNavigationLink(
- "OrderDetails",
- client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("OrderDetails").
+ "OrderDetails",
+ client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("OrderDetails").
appendKeySegment(new HashMap<String, Object>() {
- private static final long serialVersionUID = 3109256773218160485L;
+ private static final long serialVersionUID = 3109256773218160485L;
- {
- put("OrderID", 7);
- put("ProductID", 5);
- }
- }).build()));
+ {
+ put("OrderID", 7);
+ put("ProductID", 5);
+ }
+ }).build()));
final ODataEntityUpdateRequest<ODataEntity> updateReq = client.getCUDRequestFactory().getEntityUpdateRequest(
- URI.create("$" + createRequestRef), UpdateType.PATCH, customerChanges);
+ URI.create("$" + createRequestRef), UpdateType.PATCH, customerChanges);
changeset.addRequest(updateReq);
@@ -293,10 +293,10 @@ public class BatchTestITCase extends AbstractTestITCase {
order = ((ODataEntityCreateResponse<ODataEntity>) res).getBody();
final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().getEntitySetRequest(
- URIUtils.getURI(testStaticServiceRootURL, order.getEditLink().toASCIIString() + "/OrderDetails"));
+ URIUtils.getURI(testStaticServiceRootURL, order.getEditLink().toASCIIString() + "/OrderDetails"));
assertEquals(Integer.valueOf(7),
- req.execute().getBody().getEntities().get(0).getProperty("OrderID").getPrimitiveValue().
+ req.execute().getBody().getEntities().get(0).getProperty("OrderID").getPrimitiveValue().
toCastValue(Integer.class));
res = chgitem.next();
@@ -305,13 +305,13 @@ public class BatchTestITCase extends AbstractTestITCase {
// clean ...
assertEquals(204, client.getCUDRequestFactory().getDeleteRequest(
- URIUtils.getURI(testStaticServiceRootURL, order.getEditLink().toASCIIString())).execute().
- getStatusCode());
+ URIUtils.getURI(testStaticServiceRootURL, order.getEditLink().toASCIIString())).execute().
+ getStatusCode());
try {
client.getRetrieveRequestFactory().getEntityRequest(
- URIUtils.getURI(testStaticServiceRootURL, order.getEditLink().toASCIIString())).
- execute().getBody();
+ URIUtils.getURI(testStaticServiceRootURL, order.getEditLink().toASCIIString())).
+ execute().getBody();
fail();
} catch (Exception e) {
// ignore
@@ -332,7 +332,7 @@ public class BatchTestITCase extends AbstractTestITCase {
// prepare URI
URIBuilder targetURI = client.newURIBuilder(testStaticServiceRootURL);
targetURI.appendEntitySetSegment("Customers").appendKeySegment(1).
- expand("Orders").select("PersonID,Orders/OrderID");
+ expand("Orders").select("PersonID,Orders/OrderID");
// create new request
ODataEntityRequest<ODataEntity> queryReq = client.getRetrieveRequestFactory().getEntityRequest(targetURI.build());
@@ -348,7 +348,7 @@ public class BatchTestITCase extends AbstractTestITCase {
targetURI = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Orders");
final ODataEntity original = newOrder(2000);
final ODataEntityCreateRequest<ODataEntity> createReq =
- client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), original);
+ client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), original);
createReq.setFormat(ODataFormat.JSON);
streamManager.addRequest(createReq);
// -------------------------------------------
@@ -386,7 +386,7 @@ public class BatchTestITCase extends AbstractTestITCase {
}
@Test
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings({ "unchecked" })
public void batchRequest() throws EdmPrimitiveTypeException {
// create your request
final ODataBatchRequest request = client.getBatchRequestFactory().getBatchRequest(testStaticServiceRootURL);
@@ -418,15 +418,15 @@ public class BatchTestITCase extends AbstractTestITCase {
final URI editLink = targetURI.build();
final ODataEntity patch = client.getObjectFactory().newEntity(
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
patch.setEditLink(editLink);
patch.getProperties().add(client.getObjectFactory().newPrimitiveProperty(
- "LastName",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("new last name")));
+ "LastName",
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("new last name")));
final ODataEntityUpdateRequest<ODataEntity> changeReq =
- client.getCUDRequestFactory().getEntityUpdateRequest(UpdateType.PATCH, patch);
+ client.getCUDRequestFactory().getEntityUpdateRequest(UpdateType.PATCH, patch);
changeReq.setFormat(ODataFormat.JSON_FULL_METADATA);
changeset.addRequest(changeReq);
@@ -435,7 +435,7 @@ public class BatchTestITCase extends AbstractTestITCase {
targetURI = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Orders");
final ODataEntity original = newOrder(1000);
final ODataEntityCreateRequest<ODataEntity> createReq =
- client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), original);
+ client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), original);
createReq.setFormat(ODataFormat.JSON);
changeset.addRequest(createReq);
// -------------------------------------------
@@ -468,7 +468,7 @@ public class BatchTestITCase extends AbstractTestITCase {
assertEquals("OK", res.getStatusMessage());
ODataEntityRequestImpl<ODataEntity>.ODataEntityResponseImpl entres =
- (ODataEntityRequestImpl.ODataEntityResponseImpl) res;
+ (ODataEntityRequestImpl.ODataEntityResponseImpl) res;
ODataEntity entity = entres.getBody();
assertEquals(1, entity.getProperty("PersonID").getPrimitiveValue().toCastValue(Integer.class), 0);
@@ -513,7 +513,7 @@ public class BatchTestITCase extends AbstractTestITCase {
public void async() {
// create your request
final ODataBatchRequest request = client.getBatchRequestFactory().getBatchRequest(
- URI.create(testStaticServiceRootURL + "/async/").normalize().toASCIIString());
+ URI.create(testStaticServiceRootURL + "/async/").normalize().toASCIIString());
request.setAccept(ACCEPT);
final AsyncBatchRequestWrapper async = client.getAsyncRequestFactory().getAsyncBatchRequestWrapper(request);
@@ -632,54 +632,22 @@ public class BatchTestITCase extends AbstractTestITCase {
}
}
- private static class BatchStreamingThread extends Thread {
-
- private final BatchManager streaming;
-
- public BatchStreamingThread(final BatchManager streaming) {
- super();
- this.streaming = streaming;
- }
-
- @Override
- public void run() {
- try {
- final StringBuilder builder = new StringBuilder();
-
- final byte[] buff = new byte[1024];
-
- int len;
-
- while ((len = streaming.getBody().read(buff)) >= 0) {
- builder.append(new String(buff, 0, len));
- }
-
- LOG.debug("Batch request {}", builder.toString());
-
- assertTrue(builder.toString().contains("Content-Id:2"));
- assertTrue(builder.toString().contains("GET " + testStaticServiceRootURL));
- } catch (IOException e) {
- fail();
- }
- }
- }
-
private ODataEntity newOrder(final int id) {
final ODataEntity order = getClient().getObjectFactory().
- newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order"));
+ newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order"));
order.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("OrderID",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
order.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("OrderDate",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(Calendar.getInstance()).build()));
order.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("ShelfLife",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
setType(EdmPrimitiveTypeKind.Duration).setValue(new BigDecimal("0.0000002")).build()));
order.getProperties().add(getClient().getObjectFactory().newCollectionProperty("OrderShelfLifes",
- getClient().getObjectFactory().newCollectionValue(EdmPrimitiveTypeKind.Duration.name()).add(
+ getClient().getObjectFactory().newCollectionValue(EdmPrimitiveTypeKind.Duration.name()).add(
getClient().getObjectFactory().newPrimitiveValueBuilder().setType(EdmPrimitiveTypeKind.Duration).
- setValue(new BigDecimal("0.0000002")).build())));
+ setValue(new BigDecimal("0.0000002")).build())));
return order;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java
index 1e6fc57..122096e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -54,7 +54,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
// GetEmployeesCount
URIBuilder builder = client.newURIBuilder(testStaticServiceRootURL).appendSingletonSegment("Company");
final ODataEntityRequest<ODataSingleton> singletonReq =
- client.getRetrieveRequestFactory().getSingletonRequest(builder.build());
+ client.getRetrieveRequestFactory().getSingletonRequest(builder.build());
singletonReq.setFormat(format);
final ODataSingleton company = singletonReq.execute().getBody();
assertNotNull(company);
@@ -63,7 +63,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
assertNotNull(boundOp);
final ODataInvokeRequest<ODataProperty> getEmployeesCountReq =
- client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataProperty.class);
+ client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataProperty.class);
getEmployeesCountReq.setFormat(format);
final ODataProperty getEmployeesCountRes = getEmployeesCountReq.execute().getBody();
assertNotNull(getEmployeesCountRes);
@@ -71,9 +71,9 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
// GetProductDetails
builder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Products").appendKeySegment(5);
+ appendEntitySetSegment("Products").appendKeySegment(5);
ODataEntityRequest<ODataEntity> entityReq = client.getRetrieveRequestFactory().
- getEntityRequest(builder.build());
+ getEntityRequest(builder.build());
entityReq.setFormat(format);
ODataEntity entity = entityReq.execute().getBody();
assertNotNull(entity);
@@ -83,8 +83,8 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
final ODataPrimitiveValue count = client.getObjectFactory().newPrimitiveValueBuilder().buildInt32(1);
final ODataInvokeRequest<ODataEntitySet> getProductDetailsReq =
- client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataEntitySet.class,
- Collections.<String, ODataValue>singletonMap("count", count));
+ client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataEntitySet.class,
+ Collections.<String, ODataValue> singletonMap("count", count));
getProductDetailsReq.setFormat(format);
final ODataEntitySet getProductDetailsRes = getProductDetailsReq.execute().getBody();
assertNotNull(getProductDetailsRes);
@@ -95,7 +95,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
keyMap.put("ProductID", 6);
keyMap.put("ProductDetailID", 1);
builder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("ProductDetails").appendKeySegment(keyMap);
+ appendEntitySetSegment("ProductDetails").appendKeySegment(keyMap);
entityReq = client.getRetrieveRequestFactory().getEntityRequest(builder.build());
entityReq.setFormat(format);
entity = entityReq.execute().getBody();
@@ -105,17 +105,17 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
assertNotNull(boundOp);
final ODataInvokeRequest<ODataEntity> getRelatedProductReq =
- client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataEntity.class);
+ client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataEntity.class);
getRelatedProductReq.setFormat(format);
final ODataEntity getRelatedProductRes = getRelatedProductReq.execute().getBody();
assertNotNull(getRelatedProductRes);
assertEquals("Microsoft.Test.OData.Services.ODataWCFService.Product",
- getRelatedProductRes.getTypeName().toString());
+ getRelatedProductRes.getTypeName().toString());
assertEquals(6, getRelatedProductRes.getProperty("ProductID").getPrimitiveValue().toCastValue(Integer.class), 0);
// GetDefaultPI
builder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Accounts").appendKeySegment(102);
+ appendEntitySetSegment("Accounts").appendKeySegment(102);
entityReq = client.getRetrieveRequestFactory().getEntityRequest(builder.build());
entityReq.setFormat(format);
entity = entityReq.execute().getBody();
@@ -125,31 +125,31 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
assertNotNull(boundOp);
final ODataInvokeRequest<ODataEntity> getDefaultPIReq =
- client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataEntity.class);
+ client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataEntity.class);
getDefaultPIReq.setFormat(format);
final ODataEntity getDefaultPIRes = getDefaultPIReq.execute().getBody();
assertNotNull(getDefaultPIRes);
assertEquals("Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument",
- getDefaultPIRes.getTypeName().toString());
+ getDefaultPIRes.getTypeName().toString());
assertEquals(102901,
- getDefaultPIRes.getProperty("PaymentInstrumentID").getPrimitiveValue().toCastValue(Integer.class), 0);
+ getDefaultPIRes.getProperty("PaymentInstrumentID").getPrimitiveValue().toCastValue(Integer.class), 0);
// GetAccountInfo
boundOp = entity.getOperation("Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo");
assertNotNull(boundOp);
final ODataInvokeRequest<ODataProperty> getAccountInfoReq =
- client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataProperty.class);
+ client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataProperty.class);
getAccountInfoReq.setFormat(format);
final ODataProperty getAccountInfoRes = getAccountInfoReq.execute().getBody();
assertNotNull(getAccountInfoRes);
assertTrue(getAccountInfoRes.hasComplexValue());
assertEquals("Microsoft.Test.OData.Services.ODataWCFService.AccountInfo",
- getAccountInfoRes.getComplexValue().getTypeName());
+ getAccountInfoRes.getComplexValue().getTypeName());
// GetActualAmount
entityReq = client.getRetrieveRequestFactory().getEntityRequest(
- entity.getNavigationLink("MyGiftCard").getLink());
+ entity.getNavigationLink("MyGiftCard").getLink());
entityReq.setFormat(format);
entity = entityReq.execute().getBody();
assertNotNull(entity);
@@ -160,8 +160,8 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
final ODataPrimitiveValue bonusRate = client.getObjectFactory().newPrimitiveValueBuilder().buildDouble(1.1);
final ODataInvokeRequest<ODataProperty> getActualAmountReq =
- client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataProperty.class,
- Collections.<String, ODataValue>singletonMap("bonusRate", bonusRate));
+ client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ODataProperty.class,
+ Collections.<String, ODataValue> singletonMap("bonusRate", bonusRate));
getActualAmountReq.setFormat(format);
final ODataProperty getActualAmountRes = getActualAmountReq.execute().getBody();
assertNotNull(getActualAmountRes);
@@ -182,11 +182,11 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
public void edmEnabledFunctions() throws EdmPrimitiveTypeException {
// GetEmployeesCount
final ODataInvokeRequest<ODataProperty> getEmployeesCountReq =
- edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
- edmClient.newURIBuilder().appendSingletonSegment("Company").build(),
- new FullQualifiedName(("Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount")),
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Company"),
- false);
+ edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
+ edmClient.newURIBuilder().appendSingletonSegment("Company").build(),
+ new FullQualifiedName(("Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount")),
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Company"),
+ false);
final ODataProperty getEmployeesCountRes = getEmployeesCountReq.execute().getBody();
assertNotNull(getEmployeesCountRes);
assertTrue(getEmployeesCountRes.hasPrimitiveValue());
@@ -194,12 +194,12 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
// GetProductDetails
final ODataPrimitiveValue count = edmClient.getObjectFactory().newPrimitiveValueBuilder().buildInt32(1);
final ODataInvokeRequest<ODataEntitySet> getProductDetailsReq =
- edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
- edmClient.newURIBuilder().appendEntitySetSegment("Products").appendKeySegment(5).build(),
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"),
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Product"),
- false,
- Collections.<String, ODataValue>singletonMap("count", count));
+ edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
+ edmClient.newURIBuilder().appendEntitySetSegment("Products").appendKeySegment(5).build(),
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"),
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Product"),
+ false,
+ Collections.<String, ODataValue> singletonMap("count", count));
final ODataEntitySet getProductDetailsRes = getProductDetailsReq.execute().getBody();
assertNotNull(getProductDetailsRes);
assertEquals(1, getProductDetailsRes.getCount());
@@ -211,54 +211,54 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
URIBuilder builder = edmClient.newURIBuilder().appendEntitySetSegment("ProductDetails").appendKeySegment(keyMap);
final ODataInvokeRequest<ODataEntity> getRelatedProductReq =
- edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
- builder.build(),
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct"),
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.ProductDetail"),
- false);
+ edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
+ builder.build(),
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct"),
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.ProductDetail"),
+ false);
final ODataEntity getRelatedProductRes = getRelatedProductReq.execute().getBody();
assertNotNull(getRelatedProductRes);
assertEquals("Microsoft.Test.OData.Services.ODataWCFService.Product",
- getRelatedProductRes.getTypeName().toString());
+ getRelatedProductRes.getTypeName().toString());
assertEquals(6, getRelatedProductRes.getProperty("ProductID").getPrimitiveValue().toCastValue(Integer.class), 0);
// GetDefaultPI
final ODataInvokeRequest<ODataEntity> getDefaultPIReq =
- edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
- edmClient.newURIBuilder().appendEntitySetSegment("Accounts").appendKeySegment(102).build(),
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"),
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Account"),
- false);
+ edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
+ edmClient.newURIBuilder().appendEntitySetSegment("Accounts").appendKeySegment(102).build(),
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"),
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Account"),
+ false);
final ODataEntity getDefaultPIRes = getDefaultPIReq.execute().getBody();
assertNotNull(getDefaultPIRes);
assertEquals("Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument",
- getDefaultPIRes.getTypeName().toString());
+ getDefaultPIRes.getTypeName().toString());
assertEquals(102901,
- getDefaultPIRes.getProperty("PaymentInstrumentID").getPrimitiveValue().toCastValue(Integer.class), 0);
+ getDefaultPIRes.getProperty("PaymentInstrumentID").getPrimitiveValue().toCastValue(Integer.class), 0);
// GetAccountInfo
final ODataInvokeRequest<ODataProperty> getAccountInfoReq =
- edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
- edmClient.newURIBuilder().appendEntitySetSegment("Accounts").appendKeySegment(102).build(),
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"),
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Account"),
- false);
+ edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
+ edmClient.newURIBuilder().appendEntitySetSegment("Accounts").appendKeySegment(102).build(),
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"),
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Account"),
+ false);
final ODataProperty getAccountInfoRes = getAccountInfoReq.execute().getBody();
assertNotNull(getAccountInfoRes);
assertTrue(getAccountInfoRes.hasComplexValue());
assertEquals("Microsoft.Test.OData.Services.ODataWCFService.AccountInfo",
- getAccountInfoRes.getComplexValue().getTypeName());
+ getAccountInfoRes.getComplexValue().getTypeName());
// GetActualAmount
final ODataPrimitiveValue bonusRate = edmClient.getObjectFactory().newPrimitiveValueBuilder().buildDouble(1.1);
final ODataInvokeRequest<ODataProperty> getActualAmountReq =
- edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
- edmClient.newURIBuilder().appendEntitySetSegment("Accounts").appendKeySegment(102).
- appendNavigationSegment("MyGiftCard").build(),
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"),
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GiftCard"),
- false,
- Collections.<String, ODataValue>singletonMap("bonusRate", bonusRate));
+ edmClient.getInvokeRequestFactory().getBoundFunctionInvokeRequest(
+ edmClient.newURIBuilder().appendEntitySetSegment("Accounts").appendKeySegment(102).
+ appendNavigationSegment("MyGiftCard").build(),
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"),
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.GiftCard"),
+ false,
+ Collections.<String, ODataValue> singletonMap("bonusRate", bonusRate));
final ODataProperty getActualAmountRes = getActualAmountReq.execute().getBody();
assertNotNull(getActualAmountRes);
assertEquals(41.79, getActualAmountRes.getPrimitiveValue().toCastValue(Double.class), 0);
@@ -268,7 +268,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
// IncreaseRevenue
URIBuilder builder = client.newURIBuilder(testStaticServiceRootURL).appendSingletonSegment("Company");
ODataEntityRequest<ODataEntity> entityReq =
- client.getRetrieveRequestFactory().getEntityRequest(builder.build());
+ client.getRetrieveRequestFactory().getEntityRequest(builder.build());
entityReq.setFormat(format);
ODataEntity entity = entityReq.execute().getBody();
assertNotNull(entity);
@@ -277,10 +277,10 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
assertNotNull(boundOp);
final ODataPrimitiveValue increaseValue =
- client.getObjectFactory().newPrimitiveValueBuilder().buildInt64(12L);
+ client.getObjectFactory().newPrimitiveValueBuilder().buildInt64(12L);
final ODataInvokeRequest<ODataProperty> increaseRevenueReq =
- client.getInvokeRequestFactory().getActionInvokeRequest(boundOp.getTarget(), ODataProperty.class,
- Collections.<String, ODataValue>singletonMap("IncreaseValue", increaseValue));
+ client.getInvokeRequestFactory().getActionInvokeRequest(boundOp.getTarget(), ODataProperty.class,
+ Collections.<String, ODataValue> singletonMap("IncreaseValue", increaseValue));
increaseRevenueReq.setFormat(format);
final ODataProperty increaseRevenueRes = increaseRevenueReq.execute().getBody();
assertNotNull(increaseRevenueRes);
@@ -288,7 +288,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
// AddAccessRight
builder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Products").appendKeySegment(5);
+ appendEntitySetSegment("Products").appendKeySegment(5);
entityReq = client.getRetrieveRequestFactory().getEntityRequest(builder.build());
entityReq.setFormat(format);
entity = entityReq.execute().getBody();
@@ -298,10 +298,10 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
assertNotNull(boundOp);
final ODataEnumValue accessRight = client.getObjectFactory().
- newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", "Execute");
+ newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", "Execute");
final ODataInvokeRequest<ODataProperty> getProductDetailsReq =
- client.getInvokeRequestFactory().getActionInvokeRequest(boundOp.getTarget(), ODataProperty.class,
- Collections.<String, ODataValue>singletonMap("accessRight", accessRight));
+ client.getInvokeRequestFactory().getActionInvokeRequest(boundOp.getTarget(), ODataProperty.class,
+ Collections.<String, ODataValue> singletonMap("accessRight", accessRight));
getProductDetailsReq.setFormat(format);
final ODataProperty getProductDetailsRes = getProductDetailsReq.execute().getBody();
assertNotNull(getProductDetailsRes);
@@ -309,7 +309,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
// ResetAddress
builder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Customers").appendKeySegment(2);
+ appendEntitySetSegment("Customers").appendKeySegment(2);
entityReq = client.getRetrieveRequestFactory().getEntityRequest(builder.build());
entityReq.setFormat(format);
entity = entityReq.execute().getBody();
@@ -319,23 +319,23 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
assertNotNull(boundOp);
final ODataCollectionValue<org.apache.olingo.commons.api.domain.v4.ODataValue> addresses =
- client.getObjectFactory().
+ client.getObjectFactory().
newCollectionValue("Collection(Microsoft.Test.OData.Services.ODataWCFService.Address)");
final ODataComplexValue<ODataProperty> address = client.getObjectFactory().
- newLinkedComplexValue("Microsoft.Test.OData.Services.ODataWCFService.Address");
+ newLinkedComplexValue("Microsoft.Test.OData.Services.ODataWCFService.Address");
address.add(client.getObjectFactory().newPrimitiveProperty("Street",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("Piazza La Bomba E Scappa")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("Piazza La Bomba E Scappa")));
address.add(client.getObjectFactory().newPrimitiveProperty("City",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("Tollo")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("Tollo")));
address.add(client.getObjectFactory().newPrimitiveProperty("PostalCode",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("66010")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("66010")));
addresses.add(address);
final ODataPrimitiveValue index = client.getObjectFactory().newPrimitiveValueBuilder().buildInt32(0);
final Map<String, ODataValue> params = new LinkedHashMap<String, ODataValue>(2);
params.put("addresses", addresses);
params.put("index", index);
final ODataInvokeRequest<ODataEntity> resetAddressReq =
- client.getInvokeRequestFactory().getActionInvokeRequest(boundOp.getTarget(), ODataEntity.class, params);
+ client.getInvokeRequestFactory().getActionInvokeRequest(boundOp.getTarget(), ODataEntity.class, params);
resetAddressReq.setFormat(format);
final ODataEntity resetAddressRes = resetAddressReq.execute().getBody();
assertNotNull(resetAddressRes);
@@ -343,7 +343,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
// RefreshDefaultPI
builder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Accounts").appendKeySegment(102);
+ appendEntitySetSegment("Accounts").appendKeySegment(102);
entityReq = client.getRetrieveRequestFactory().getEntityRequest(builder.build());
entityReq.setFormat(format);
entity = entityReq.execute().getBody();
@@ -355,17 +355,17 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
Calendar dateTime = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
dateTime.set(2014, 3, 9, 0, 0, 0);
final ODataPrimitiveValue newDate = client.getObjectFactory().newPrimitiveValueBuilder().
- setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(dateTime).build();
+ setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(dateTime).build();
final ODataInvokeRequest<ODataEntity> getDefaultPIReq =
- client.getInvokeRequestFactory().getActionInvokeRequest(boundOp.getTarget(), ODataEntity.class,
- Collections.<String, ODataValue>singletonMap("newDate", newDate));
+ client.getInvokeRequestFactory().getActionInvokeRequest(boundOp.getTarget(), ODataEntity.class,
+ Collections.<String, ODataValue> singletonMap("newDate", newDate));
getDefaultPIReq.setFormat(format);
final ODataEntity getDefaultPIRes = getDefaultPIReq.execute().getBody();
assertNotNull(getDefaultPIRes);
assertEquals("Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument",
- getDefaultPIRes.getTypeName().toString());
+ getDefaultPIRes.getTypeName().toString());
assertEquals(102901,
- getDefaultPIRes.getProperty("PaymentInstrumentID").getPrimitiveValue().toCastValue(Integer.class), 0);
+ getDefaultPIRes.getProperty("PaymentInstrumentID").getPrimitiveValue().toCastValue(Integer.class), 0);
}
@Test
@@ -383,42 +383,42 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
// IncreaseRevenue
final ODataPrimitiveValue increaseValue = edmClient.getObjectFactory().newPrimitiveValueBuilder().buildInt64(12L);
final ODataInvokeRequest<ODataProperty> increaseRevenueReq =
- edmClient.getInvokeRequestFactory().getBoundActionInvokeRequest(
- edmClient.newURIBuilder().appendSingletonSegment("Company").build(),
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue"),
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Company"),
- false,
- Collections.<String, ODataValue>singletonMap("IncreaseValue", increaseValue));
+ edmClient.getInvokeRequestFactory().getBoundActionInvokeRequest(
+ edmClient.newURIBuilder().appendSingletonSegment("Company").build(),
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue"),
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Company"),
+ false,
+ Collections.<String, ODataValue> singletonMap("IncreaseValue", increaseValue));
final ODataProperty increaseRevenueRes = increaseRevenueReq.execute().getBody();
assertNotNull(increaseRevenueRes);
assertTrue(increaseRevenueRes.hasPrimitiveValue());
// AddAccessRight
final ODataEnumValue accessRight = edmClient.getObjectFactory().
- newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", "Execute");
+ newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", "Execute");
final ODataInvokeRequest<ODataProperty> getProductDetailsReq =
- edmClient.getInvokeRequestFactory().getBoundActionInvokeRequest(
- edmClient.newURIBuilder().appendEntitySetSegment("Products").appendKeySegment(5).build(),
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"),
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Product"),
- false,
- Collections.<String, ODataValue>singletonMap("accessRight", accessRight));
+ edmClient.getInvokeRequestFactory().getBoundActionInvokeRequest(
+ edmClient.newURIBuilder().appendEntitySetSegment("Products").appendKeySegment(5).build(),
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"),
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Product"),
+ false,
+ Collections.<String, ODataValue> singletonMap("accessRight", accessRight));
final ODataProperty getProductDetailsRes = getProductDetailsReq.execute().getBody();
assertNotNull(getProductDetailsRes);
assertTrue(getProductDetailsRes.hasEnumValue());
// ResetAddress
final ODataCollectionValue<org.apache.olingo.commons.api.domain.v4.ODataValue> addresses =
- edmClient.getObjectFactory().
+ edmClient.getObjectFactory().
newCollectionValue("Collection(Microsoft.Test.OData.Services.ODataWCFService.Address)");
final ODataComplexValue<ODataProperty> address = edmClient.getObjectFactory().
- newLinkedComplexValue("Microsoft.Test.OData.Services.ODataWCFService.Address");
+ newLinkedComplexValue("Microsoft.Test.OData.Services.ODataWCFService.Address");
address.add(edmClient.getObjectFactory().newPrimitiveProperty("Street",
- edmClient.getObjectFactory().newPrimitiveValueBuilder().buildString("Piazza La Bomba E Scappa")));
+ edmClient.getObjectFactory().newPrimitiveValueBuilder().buildString("Piazza La Bomba E Scappa")));
address.add(edmClient.getObjectFactory().newPrimitiveProperty("City",
- edmClient.getObjectFactory().newPrimitiveValueBuilder().buildString("Tollo")));
+ edmClient.getObjectFactory().newPrimitiveValueBuilder().buildString("Tollo")));
address.add(edmClient.getObjectFactory().newPrimitiveProperty("PostalCode",
- edmClient.getObjectFactory().newPrimitiveValueBuilder().buildString("66010")));
+ edmClient.getObjectFactory().newPrimitiveValueBuilder().buildString("66010")));
addresses.add(address);
final ODataPrimitiveValue index = edmClient.getObjectFactory().newPrimitiveValueBuilder().buildInt32(0);
final Map<String, ODataValue> params = new LinkedHashMap<String, ODataValue>(2);
@@ -427,12 +427,12 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
final Map<String, Object> keys = new HashMap<String, Object>();
keys.put("PersonID", 2);
final ODataInvokeRequest<ODataEntity> resetAddressReq =
- edmClient.getInvokeRequestFactory().getBoundActionInvokeRequest(
- edmClient.newURIBuilder().appendEntitySetSegment("Customers").appendKeySegment(keys).build(),
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"),
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Person"),
- false,
- params);
+ edmClient.getInvokeRequestFactory().getBoundActionInvokeRequest(
+ edmClient.newURIBuilder().appendEntitySetSegment("Customers").appendKeySegment(keys).build(),
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"),
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Person"),
+ false,
+ params);
final ODataEntity resetAddressRes = resetAddressReq.execute().getBody();
assertNotNull(resetAddressRes);
assertEquals(2, resetAddressRes.getProperty("PersonID").getPrimitiveValue().toCastValue(Integer.class), 0);
@@ -441,19 +441,19 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
Calendar dateTime = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
dateTime.set(2014, 3, 9, 0, 0, 0);
final ODataPrimitiveValue newDate = edmClient.getObjectFactory().newPrimitiveValueBuilder().
- setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(dateTime).build();
+ setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(dateTime).build();
final ODataInvokeRequest<ODataEntity> getDefaultPIReq =
- edmClient.getInvokeRequestFactory().getBoundActionInvokeRequest(
- edmClient.newURIBuilder().appendEntitySetSegment("Accounts").appendKeySegment(102).build(),
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"),
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Account"),
- false,
- Collections.<String, ODataValue>singletonMap("newDate", newDate));
+ edmClient.getInvokeRequestFactory().getBoundActionInvokeRequest(
+ edmClient.newURIBuilder().appendEntitySetSegment("Accounts").appendKeySegment(102).build(),
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"),
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Account"),
+ false,
+ Collections.<String, ODataValue> singletonMap("newDate", newDate));
final ODataEntity getDefaultPIRes = getDefaultPIReq.execute().getBody();
assertNotNull(getDefaultPIRes);
assertEquals("Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument",
- getDefaultPIRes.getTypeName().toString());
+ getDefaultPIRes.getTypeName().toString());
assertEquals(102901,
- getDefaultPIRes.getProperty("PaymentInstrumentID").getPrimitiveValue().toCastValue(Integer.class), 0);
+ getDefaultPIRes.getProperty("PaymentInstrumentID").getPrimitiveValue().toCastValue(Integer.class), 0);
}
}
[16/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java
index ff7231d..17ba646 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java
@@ -1,258 +1,220 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.demo.odatademo.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "PersonDetail",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface PersonDetail
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPersonID();
-
- void setPersonID(java.lang.Integer _personID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Age",
- type = "Edm.Byte",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Short getAge();
-
- void setAge(java.lang.Short _age);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Gender",
- type = "Edm.Boolean",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Boolean getGender();
-
- void setGender(java.lang.Boolean _gender);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Phone",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getPhone();
-
- void setPhone(java.lang.String _phone);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
- type = "ODataDemo.Address",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address getAddress();
-
- void setAddress(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address _address);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Photo",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.io.InputStream getPhoto();
-
- void setPhoto(java.io.InputStream _photo);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Person",
- type = "ODataDemo.Person",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "Persons",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person getPerson();
-
- void setPerson(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person _person);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
- type = "ODataDemo.Address")
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address newAddress();
-
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonID",
- type = "Edm.Int32")
- Annotatable getPersonIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Age",
- type = "Edm.Byte")
- Annotatable getAgeAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Gender",
- type = "Edm.Boolean")
- Annotatable getGenderAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Phone",
- type = "Edm.String")
- Annotatable getPhoneAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Address",
- type = "ODataDemo.Address")
- Annotatable getAddressAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Photo",
- type = "Edm.Stream")
- Annotatable getPhotoAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Person",
- type = "ODataDemo.Person")
- Annotatable getPersonAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface PersonDetail
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPersonID();
+
+ void setPersonID(java.lang.Integer _personID);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Age",
+ type = "Edm.Byte",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Short getAge();
+
+ void setAge(java.lang.Short _age);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Gender",
+ type = "Edm.Boolean",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Boolean getGender();
+
+ void setGender(java.lang.Boolean _gender);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Phone",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getPhone();
+
+ void setPhone(java.lang.String _phone);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
+ type = "ODataDemo.Address",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address getAddress();
+
+ void setAddress(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address _address);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Photo",
+ type = "Edm.Stream",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.io.InputStream getPhoto();
+
+ void setPhoto(java.io.InputStream _photo);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Person",
+ type = "ODataDemo.Person",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "Persons",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person getPerson();
+
+ void setPerson(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person _person);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
+ type = "ODataDemo.Address")
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address newAddress();
+
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonID",
+ type = "Edm.Int32")
+ Annotatable getPersonIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Age",
+ type = "Edm.Byte")
+ Annotatable getAgeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Gender",
+ type = "Edm.Boolean")
+ Annotatable getGenderAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Phone",
+ type = "Edm.String")
+ Annotatable getPhoneAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Address",
+ type = "ODataDemo.Address")
+ Annotatable getAddressAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Photo",
+ type = "Edm.Stream")
+ Annotatable getPhotoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Person",
+ type = "ODataDemo.Person")
+ Annotatable getPersonAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollection.java
index bb4dfd1..2bebd96 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollection.java
@@ -1,50 +1,31 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.demo.odatademo.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface PersonDetailCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail> {
+public interface PersonDetailCollection extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Product.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Product.java
index af46c8d..e6220e0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Product.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Product.java
@@ -1,321 +1,285 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.demo.odatademo.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.ext.proxy.api.annotations.Key;
+import org.apache.olingo.ext.proxy.api.annotations.Parameter;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Product",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Product
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getID();
-
- void setID(java.lang.Integer _iD);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getDescription();
-
- void setDescription(java.lang.String _description);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReleaseDate",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getReleaseDate();
-
- void setReleaseDate(java.util.Calendar _releaseDate);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DiscontinuedDate",
- type = "Edm.DateTimeOffset",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getDiscontinuedDate();
-
- void setDiscontinuedDate(java.util.Calendar _discontinuedDate);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Rating",
- type = "Edm.Int16",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Short getRating();
-
- void setRating(java.lang.Short _rating);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Price",
- type = "Edm.Double",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Double getPrice();
-
- void setPrice(java.lang.Double _price);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Categories",
- type = "ODataDemo.Category",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "Categories",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection getCategories();
-
- void setCategories(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection _categories);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Supplier",
- type = "ODataDemo.Supplier",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "Suppliers",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier getSupplier();
-
- void setSupplier(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier _supplier);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ProductDetail",
- type = "ODataDemo.ProductDetail",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "ProductDetails",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail getProductDetail();
-
- void setProductDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail _productDetail);
-
-
- Operations operations();
-
- interface Operations {
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "Discount",
- type = OperationType.ACTION,
- returnType = "Edm.Double")
- java.lang.Double discount(
- @Parameter(name = "discountPercentage", type = "Edm.Int32", nullable = false) java.lang.Integer discountPercentage
- );
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
- type = "Edm.Int32")
- Annotatable getIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
- type = "Edm.String")
- Annotatable getDescriptionAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ReleaseDate",
- type = "Edm.DateTimeOffset")
- Annotatable getReleaseDateAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DiscontinuedDate",
- type = "Edm.DateTimeOffset")
- Annotatable getDiscontinuedDateAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Rating",
- type = "Edm.Int16")
- Annotatable getRatingAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Price",
- type = "Edm.Double")
- Annotatable getPriceAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Categories",
- type = "ODataDemo.Category")
- Annotatable getCategoriesAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Supplier",
- type = "ODataDemo.Supplier")
- Annotatable getSupplierAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ProductDetail",
- type = "ODataDemo.ProductDetail")
- Annotatable getProductDetailAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Product
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getID();
+
+ void setID(java.lang.Integer _iD);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getDescription();
+
+ void setDescription(java.lang.String _description);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReleaseDate",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getReleaseDate();
+
+ void setReleaseDate(java.util.Calendar _releaseDate);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DiscontinuedDate",
+ type = "Edm.DateTimeOffset",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getDiscontinuedDate();
+
+ void setDiscontinuedDate(java.util.Calendar _discontinuedDate);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Rating",
+ type = "Edm.Int16",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Short getRating();
+
+ void setRating(java.lang.Short _rating);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Price",
+ type = "Edm.Double",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Double getPrice();
+
+ void setPrice(java.lang.Double _price);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Categories",
+ type = "ODataDemo.Category",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "Categories",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection getCategories();
+
+ void setCategories(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection _categories);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Supplier",
+ type = "ODataDemo.Supplier",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "Suppliers",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier getSupplier();
+
+ void setSupplier(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier _supplier);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ProductDetail",
+ type = "ODataDemo.ProductDetail",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "ProductDetails",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail getProductDetail();
+
+ void setProductDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail _productDetail);
+
+ Operations operations();
+
+ interface Operations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "Discount",
+ type = OperationType.ACTION,
+ returnType = "Edm.Double")
+ java.lang.Double
+ discount(
+ @Parameter(name = "discountPercentage", type = "Edm.Int32", nullable = false) java.lang.Integer discountPercentage
+ );
+
+ }
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
+ type = "Edm.Int32")
+ Annotatable getIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
+ type = "Edm.String")
+ Annotatable getDescriptionAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ReleaseDate",
+ type = "Edm.DateTimeOffset")
+ Annotatable getReleaseDateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DiscontinuedDate",
+ type = "Edm.DateTimeOffset")
+ Annotatable getDiscontinuedDateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Rating",
+ type = "Edm.Int16")
+ Annotatable getRatingAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Price",
+ type = "Edm.Double")
+ Annotatable getPriceAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Categories",
+ type = "ODataDemo.Category")
+ Annotatable getCategoriesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Supplier",
+ type = "ODataDemo.Supplier")
+ Annotatable getSupplierAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ProductDetail",
+ type = "ODataDemo.ProductDetail")
+ Annotatable getProductDetailAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollection.java
index c65cef7..dafa453 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollection.java
@@ -1,50 +1,31 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.demo.odatademo.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface ProductCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product> {
+public interface ProductCollection extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetail.java
index 875da63..d340220 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetail.java
@@ -1,146 +1,111 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.demo.odatademo.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ProductDetail",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface ProductDetail
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductID();
-
- void setProductID(java.lang.Integer _productID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Details",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getDetails();
-
- void setDetails(java.lang.String _details);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
- type = "ODataDemo.Product",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "Products",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product getProduct();
-
- void setProduct(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product _product);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductID",
- type = "Edm.Int32")
- Annotatable getProductIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Details",
- type = "Edm.String")
- Annotatable getDetailsAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
- type = "ODataDemo.Product")
- Annotatable getProductAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface ProductDetail
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductID();
+
+ void setProductID(java.lang.Integer _productID);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Details",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getDetails();
+
+ void setDetails(java.lang.String _details);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
+ type = "ODataDemo.Product",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "Products",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product getProduct();
+
+ void setProduct(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product _product);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductID",
+ type = "Edm.Int32")
+ Annotatable getProductIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Details",
+ type = "Edm.String")
+ Annotatable getDetailsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
+ type = "ODataDemo.Product")
+ Annotatable getProductAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailCollection.java
index a90c3fa..3f0b568 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailCollection.java
@@ -1,50 +1,31 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.demo.odatademo.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface ProductDetailCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail> {
+public interface ProductDetailCollection extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Supplier.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Supplier.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Supplier.java
index 40df7e9..43cbbaf 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Supplier.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Supplier.java
@@ -1,231 +1,194 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.demo.odatademo.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Supplier",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Supplier
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getID();
-
- void setID(java.lang.Integer _iD);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
- type = "ODataDemo.Address",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address getAddress();
-
- void setAddress(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address _address);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Location",
- type = "Edm.GeographyPoint",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.Point getLocation();
-
- void setLocation(org.apache.olingo.commons.api.edm.geo.Point _location);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getConcurrency();
-
- void setConcurrency(java.lang.Integer _concurrency);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Products",
- type = "ODataDemo.Product",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "Products",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection getProducts();
-
- void setProducts(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection _products);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
- type = "ODataDemo.Address")
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address newAddress();
-
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
- type = "Edm.Int32")
- Annotatable getIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Address",
- type = "ODataDemo.Address")
- Annotatable getAddressAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Location",
- type = "Edm.GeographyPoint")
- Annotatable getLocationAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Concurrency",
- type = "Edm.Int32")
- Annotatable getConcurrencyAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Products",
- type = "ODataDemo.Product")
- Annotatable getProductsAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Supplier
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getID();
+
+ void setID(java.lang.Integer _iD);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
+ type = "ODataDemo.Address",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address getAddress();
+
+ void setAddress(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address _address);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Location",
+ type = "Edm.GeographyPoint",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.Point getLocation();
+
+ void setLocation(org.apache.olingo.commons.api.edm.geo.Point _location);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getConcurrency();
+
+ void setConcurrency(java.lang.Integer _concurrency);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Products",
+ type = "ODataDemo.Product",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "Products",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection getProducts();
+
+ void setProducts(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection _products);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
+ type = "ODataDemo.Address")
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address newAddress();
+
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
+ type = "Edm.Int32")
+ Annotatable getIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Address",
+ type = "ODataDemo.Address")
+ Annotatable getAddressAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Location",
+ type = "Edm.GeographyPoint")
+ Annotatable getLocationAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Concurrency",
+ type = "Edm.Int32")
+ Annotatable getConcurrencyAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Products",
+ type = "ODataDemo.Product")
+ Annotatable getProductsAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierCollection.java
index 47792b9..d03e346 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierCollection.java
@@ -1,50 +1,31 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.demo.odatademo.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface SupplierCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier> {
+public interface SupplierCollection extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/package-info.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/package-info.java
index 9c9e0b7..f7a0822 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/package-info.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/package-info.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java
index a391c3e..b914cba 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java
@@ -1,76 +1,54 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.opentype.microsoft.test.odata.services.opentypesservicev4;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.PersistenceManager;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4")
@org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "DefaultContainer",
- namespace = "Microsoft.Test.OData.Services.OpenTypesServiceV4",
- isDefaultEntityContainer = true)
+ namespace = "Microsoft.Test.OData.Services.OpenTypesServiceV4",
+ isDefaultEntityContainer = true)
public interface DefaultContainer extends PersistenceManager {
- Row getRow();
- RowIndex getRowIndex();
-
+ Row getRow();
+ RowIndex getRowIndex();
Operations operations();
public interface Operations {
-
- }
- ComplexFactory complexFactory();
+ }
+
+ ComplexFactory complexFactory();
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactDetails",
- type = "Microsoft.Test.OData.Services.OpenTypesServiceV4.ContactDetails")
- org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.ContactDetails newContactDetails();
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactDetails",
+ type = "Microsoft.Test.OData.Services.OpenTypesServiceV4.ContactDetails")
+ org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.ContactDetails
+ newContactDetails();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountInfo",
- type = "Microsoft.Test.OData.Services.OpenTypesServiceV4.AccountInfo")
- org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.AccountInfo newAccountInfo();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountInfo",
+ type = "Microsoft.Test.OData.Services.OpenTypesServiceV4.AccountInfo")
+ org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.AccountInfo
+ newAccountInfo();
- }
}
+}
[02/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/MediaEntityTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/MediaEntityTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/MediaEntityTestITCase.java
index b82f22c..09eb266 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/MediaEntityTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/MediaEntityTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -59,10 +59,10 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
private void read(final ODataClient client, final ODataFormat format) throws IOException {
final URIBuilder builder = client.newURIBuilder(testDemoServiceRootURL).
- appendEntitySetSegment("Advertisements").
- appendKeySegment(UUID.fromString("f89dee73-af9f-4cd4-b330-db93c25ff3c7"));
+ appendEntitySetSegment("Advertisements").
+ appendKeySegment(UUID.fromString("f89dee73-af9f-4cd4-b330-db93c25ff3c7"));
final ODataEntityRequest<ODataEntity> entityReq =
- client.getRetrieveRequestFactory().getEntityRequest(builder.build());
+ client.getRetrieveRequestFactory().getEntityRequest(builder.build());
entityReq.setFormat(format);
final ODataEntity entity = entityReq.execute().getBody();
@@ -70,10 +70,10 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
assertTrue(entity.isMediaEntity());
// cast to workaround JDK 6 bug, fixed in JDK 7
assertEquals(EdmPrimitiveTypeKind.DateTimeOffset.getFullQualifiedName().toString(),
- ((ODataValuable) entity.getProperty("AirDate")).getValue().getTypeName());
+ ((ODataValuable) entity.getProperty("AirDate")).getValue().getTypeName());
final ODataMediaRequest streamReq = client.getRetrieveRequestFactory().
- getMediaRequest(entity.getMediaContentSource());
+ getMediaRequest(entity.getMediaContentSource());
final ODataRetrieveResponse<InputStream> streamRes = streamReq.execute();
assertEquals(200, streamRes.getStatusCode());
@@ -102,7 +102,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
final URI uri = client.newURIBuilder(testDemoServiceRootURL).appendEntitySetSegment("Advertisements").build();
final ODataMediaEntityCreateRequest<ODataEntity> createReq =
- client.getCUDRequestFactory().getMediaEntityCreateRequest(uri, input);
+ client.getCUDRequestFactory().getMediaEntityCreateRequest(uri, input);
final MediaEntityCreateStreamManager<ODataEntity> streamManager = createReq.payloadManager();
final ODataMediaEntityCreateResponse<ODataEntity> createRes = streamManager.getResponse();
@@ -113,20 +113,20 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
final URI createdLocation = URI.create(location.iterator().next());
final ODataEntity changes = client.getObjectFactory().
- newEntity(new FullQualifiedName("ODataDemo.Advertisement"));
+ newEntity(new FullQualifiedName("ODataDemo.Advertisement"));
changes.getProperties().add(client.getObjectFactory().newPrimitiveProperty("AirDate",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(Calendar.getInstance()).build()));
final ODataEntityUpdateRequest<ODataEntity> updateReq = getClient().getCUDRequestFactory().
- getEntityUpdateRequest(createdLocation, UpdateType.PATCH, changes);
+ getEntityUpdateRequest(createdLocation, UpdateType.PATCH, changes);
updateReq.setFormat(format);
final ODataEntityUpdateResponse<ODataEntity> updateRes = updateReq.execute();
assertEquals(204, updateRes.getStatusCode());
final ODataMediaRequest retrieveReq = client.getRetrieveRequestFactory().
- getMediaEntityRequest(client.newURIBuilder(createdLocation.toASCIIString()).build());
+ getMediaEntityRequest(client.newURIBuilder(createdLocation.toASCIIString()).build());
final ODataRetrieveResponse<InputStream> retrieveRes = retrieveReq.execute();
assertEquals(200, retrieveRes.getStatusCode());
@@ -147,14 +147,14 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
private void update(final ODataFormat format) throws IOException, EdmPrimitiveTypeException {
final URI uri = client.newURIBuilder(testDemoServiceRootURL).
- appendEntitySetSegment("Advertisements").
- appendKeySegment(UUID.fromString("f89dee73-af9f-4cd4-b330-db93c25ff3c7")).build();
+ appendEntitySetSegment("Advertisements").
+ appendKeySegment(UUID.fromString("f89dee73-af9f-4cd4-b330-db93c25ff3c7")).build();
final String random = RandomStringUtils.random(124);
// 1. update providing media content
final ODataMediaEntityUpdateRequest<ODataEntity> updateReq = client.getCUDRequestFactory().
- getMediaEntityUpdateRequest(uri, IOUtils.toInputStream(random));
+ getMediaEntityUpdateRequest(uri, IOUtils.toInputStream(random));
updateReq.setFormat(format);
final MediaEntityUpdateStreamManager<ODataEntity> streamManager = updateReq.payloadManager();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/MetadataTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/MetadataTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/MetadataTestITCase.java
index 6db1804..793b214 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/MetadataTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/MetadataTestITCase.java
@@ -1,26 +1,26 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.fit.v4;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.apache.olingo.commons.api.edm.Edm;
@@ -47,7 +47,7 @@ public class MetadataTestITCase extends AbstractTestITCase {
assertNotNull(edm);
final EdmEntityType order = edm.getEntityType(
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService", "Order"));
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService", "Order"));
assertNotNull(order);
final EdmProperty orderDate = order.getStructuralProperty("OrderDate");
@@ -68,12 +68,12 @@ public class MetadataTestITCase extends AbstractTestITCase {
assertEquals(3, record.getPropertyValues().size());
assertTrue(record.getPropertyValues().get(0).getValue().isConstant());
assertTrue(record.getPropertyValues().get(0).getValue().asConstant().getValue().asPrimitive().
- toCastValue(Boolean.class));
+ toCastValue(Boolean.class));
assertTrue(record.getPropertyValues().get(1).getValue().asDynamic().isCollection());
assertEquals(1, record.getPropertyValues().get(1).getValue().asDynamic().asCollection().getItems().size());
assertTrue(record.getPropertyValues().get(1).getValue().asDynamic().asCollection().getItems().get(0).isDynamic());
assertEquals("OrderID", record.getPropertyValues().get(1).getValue().asDynamic().asCollection().
- getItems().get(0).asDynamic().asPropertyPath().getValue());
+ getItems().get(0).asDynamic().asPropertyPath().getValue());
}
@Test
@@ -82,7 +82,7 @@ public class MetadataTestITCase extends AbstractTestITCase {
assertNotNull(edm);
final EdmEntityContainer container = edm.getEntityContainer(
- new FullQualifiedName("ODataWebExperimental.Northwind.Model", "NorthwindEntities"));
+ new FullQualifiedName("ODataWebExperimental.Northwind.Model", "NorthwindEntities"));
assertNotNull(container);
final EdmEntitySet categories = container.getEntitySet("Categories");
@@ -93,7 +93,7 @@ public class MetadataTestITCase extends AbstractTestITCase {
@Test
public void vocabularies() {
final Edm edm = client.getRetrieveRequestFactory().
- getMetadataRequest(testVocabulariesServiceRootURL).execute().getBody();
+ getMetadataRequest(testVocabulariesServiceRootURL).execute().getBody();
assertNotNull(edm);
// 1. core
@@ -105,12 +105,12 @@ public class MetadataTestITCase extends AbstractTestITCase {
final EdmTerm descriptionTerm = edm.getTerm(new FullQualifiedName("Core.Description"));
assertNotNull(descriptionTerm);
assertEquals(descriptionTerm.getFullQualifiedName(),
- edm.getTerm(new FullQualifiedName("Org.OData.Core.V1.Description")).getFullQualifiedName());
+ edm.getTerm(new FullQualifiedName("Org.OData.Core.V1.Description")).getFullQualifiedName());
final EdmAnnotation description = core.getAnnotation(descriptionTerm);
assertNotNull(description);
assertEquals("Core terms needed to write vocabularies",
- description.getExpression().asConstant().getValue().asPrimitive().toString());
+ description.getExpression().asConstant().getValue().asPrimitive().toString());
final EdmTerm isLanguageDependent = edm.getTerm(new FullQualifiedName("Core.IsLanguageDependent"));
assertNotNull(isLanguageDependent);
@@ -132,7 +132,7 @@ public class MetadataTestITCase extends AbstractTestITCase {
assertNotNull(scale);
final EdmAnnotation requiresTypeInScale = edm.getAnnotation(
- scale.getFullQualifiedName(), edm.getTerm(new FullQualifiedName("Core.RequiresType")));
+ scale.getFullQualifiedName(), edm.getTerm(new FullQualifiedName("Core.RequiresType")));
assertNotNull(requiresTypeInScale);
assertEquals("Edm.Decimal", requiresTypeInScale.getExpression().asConstant().getValue().toString());
@@ -140,6 +140,6 @@ public class MetadataTestITCase extends AbstractTestITCase {
final EdmTerm deleteRestrictions = edm.getTerm(new FullQualifiedName("Capabilities.DeleteRestrictions"));
assertNotNull(deleteRestrictions);
assertEquals(deleteRestrictions.getType().getFullQualifiedName(),
- edm.getComplexType(new FullQualifiedName("Capabilities.DeleteRestrictionsType")).getFullQualifiedName());
+ edm.getComplexType(new FullQualifiedName("Capabilities.DeleteRestrictionsType")).getFullQualifiedName());
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java
index fabc739..7486b9a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -45,7 +45,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
@Test
public void checkOpenTypeEntityTypesExist() {
final Edm metadata = getClient().getRetrieveRequestFactory().
- getMetadataRequest(testOpenTypeServiceRootURL).execute().getBody();
+ getMetadataRequest(testOpenTypeServiceRootURL).execute().getBody();
final EdmSchema schema = metadata.getSchemas().get(0);
@@ -56,7 +56,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
private ODataEntity readRow(final ODataFormat format, final String uuid) {
final URIBuilder builder = getClient().newURIBuilder(testOpenTypeServiceRootURL).
- appendEntitySetSegment("Row").appendKeySegment(UUID.fromString(uuid));
+ appendEntitySetSegment("Row").appendKeySegment(UUID.fromString(uuid));
return read(format, builder.build());
}
@@ -83,84 +83,84 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
final Integer id = 1426;
ODataEntity rowIndex = getClient().getObjectFactory().newEntity(
- new FullQualifiedName("Microsoft.Test.OData.Services.OpenTypesServiceV4.RowIndex"));
+ new FullQualifiedName("Microsoft.Test.OData.Services.OpenTypesServiceV4.RowIndex"));
getClient().getBinder().add(rowIndex,
- getClient().getObjectFactory().newPrimitiveProperty("Id",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
+ getClient().getObjectFactory().newPrimitiveProperty("Id",
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
getClient().getBinder().add(rowIndex,
- getClient().getObjectFactory().newPrimitiveProperty("aString",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("string")));
+ getClient().getObjectFactory().newPrimitiveProperty("aString",
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("string")));
getClient().getBinder().add(rowIndex,
- getClient().getObjectFactory().newPrimitiveProperty("aBoolean",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildBoolean(true)));
+ getClient().getObjectFactory().newPrimitiveProperty("aBoolean",
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildBoolean(true)));
getClient().getBinder().add(rowIndex,
- getClient().getObjectFactory().newPrimitiveProperty("aDouble",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildDouble(1.5D)));
+ getClient().getObjectFactory().newPrimitiveProperty("aDouble",
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildDouble(1.5D)));
getClient().getBinder().add(rowIndex,
- getClient().getObjectFactory().newPrimitiveProperty("aByte",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
- setType(EdmPrimitiveTypeKind.SByte).setValue(Byte.MAX_VALUE).
- build()));
+ getClient().getObjectFactory().newPrimitiveProperty("aByte",
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
+ setType(EdmPrimitiveTypeKind.SByte).setValue(Byte.MAX_VALUE).
+ build()));
getClient().getBinder().add(rowIndex,
- getClient().getObjectFactory().newPrimitiveProperty("aDate",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
- setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(Calendar.getInstance()).
- build()));
+ getClient().getObjectFactory().newPrimitiveProperty("aDate",
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
+ setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(Calendar.getInstance()).
+ build()));
getClient().getBinder().add(rowIndex,
- getClient().getObjectFactory().newPrimitiveProperty("aDate",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
- setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(Calendar.getInstance()).
- build()));
+ getClient().getObjectFactory().newPrimitiveProperty("aDate",
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
+ setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(Calendar.getInstance()).
+ build()));
getClient().getBinder().add(rowIndex,
- getClient().getObjectFactory().newEnumProperty("aColor", getClient().getObjectFactory().
- newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.Color", "Blue")));
+ getClient().getObjectFactory().newEnumProperty("aColor", getClient().getObjectFactory().
+ newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.Color", "Blue")));
final ODataComplexValue<ODataProperty> contactDetails = getClient().getObjectFactory().newComplexValue(
- "Microsoft.Test.OData.Services.OpenTypesServiceV4.ContactDetails");
+ "Microsoft.Test.OData.Services.OpenTypesServiceV4.ContactDetails");
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("FirstContacted",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildBinary("text".getBytes())));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildBinary("text".getBytes())));
Calendar dateTime = Calendar.getInstance(TimeZone.getTimeZone("GMT+00:01"));
dateTime.set(2014, 3, 5, 5, 5, 5);
dateTime.set(Calendar.MILLISECOND, 1);
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("LastContacted",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(dateTime).build()));
Calendar date = Calendar.getInstance();
date.set(2001, 3, 5);
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("Contacted",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
setType(EdmPrimitiveTypeKind.Date).setValue(date).build()));
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("GUID",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildGuid(UUID.randomUUID())));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildGuid(UUID.randomUUID())));
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("PreferedContactTime",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
setType(EdmPrimitiveTypeKind.Duration).setValue(0).build()));
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("Byte",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
setType(EdmPrimitiveTypeKind.Byte).setValue(24).build()));
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("SignedByte",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
setType(EdmPrimitiveTypeKind.SByte).setValue(Byte.MAX_VALUE).build()));
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("Double",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildDouble(Double.MAX_VALUE)));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildDouble(Double.MAX_VALUE)));
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("Single",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildSingle(Float.MAX_VALUE)));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildSingle(Float.MAX_VALUE)));
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("Short",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt16(Short.MAX_VALUE)));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt16(Short.MAX_VALUE)));
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("Int",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(Integer.MAX_VALUE)));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(Integer.MAX_VALUE)));
getClient().getBinder().add(rowIndex,
- getClient().getObjectFactory().newComplexProperty("aContact", contactDetails));
+ getClient().getObjectFactory().newComplexProperty("aContact", contactDetails));
final ODataEntityCreateRequest<ODataEntity> createReq = getClient().getCUDRequestFactory().
- getEntityCreateRequest(getClient().newURIBuilder(testOpenTypeServiceRootURL).
- appendEntitySetSegment("RowIndex").build(), rowIndex);
+ getEntityCreateRequest(getClient().newURIBuilder(testOpenTypeServiceRootURL).
+ appendEntitySetSegment("RowIndex").build(), rowIndex);
createReq.setFormat(format);
final ODataEntityCreateResponse<ODataEntity> createRes = createReq.execute();
assertEquals(201, createRes.getStatusCode());
final URIBuilder builder = getClient().newURIBuilder(testOpenTypeServiceRootURL).
- appendEntitySetSegment("RowIndex").appendKeySegment(id);
+ appendEntitySetSegment("RowIndex").appendKeySegment(id);
rowIndex = read(format, builder.build());
assertNotNull(rowIndex);
assertEquals(EdmPrimitiveTypeKind.Int32, rowIndex.getProperty("Id").getPrimitiveValue().getTypeKind());
@@ -174,7 +174,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
assertTrue(rowIndex.getProperty("aContact").getComplexValue().get("SignedByte").hasPrimitiveValue());
final ODataDeleteResponse deleteRes = getClient().getCUDRequestFactory().
- getDeleteRequest(rowIndex.getEditLink()).execute();
+ getDeleteRequest(rowIndex.getEditLink()).execute();
assertEquals(204, deleteRes.getStatusCode());
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/OperationImportInvokeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/OperationImportInvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/OperationImportInvokeTestITCase.java
index 972db5d..6226396 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/OperationImportInvokeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/OperationImportInvokeTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -45,8 +45,8 @@ public class OperationImportInvokeTestITCase extends AbstractTestITCase {
private void functionImports(final ODataFormat format) throws EdmPrimitiveTypeException {
// GetDefaultColor
final ODataInvokeRequest<ODataProperty> defaultColorReq = getClient().getInvokeRequestFactory().
- getFunctionInvokeRequest(getClient().newURIBuilder(testStaticServiceRootURL).
- appendOperationCallSegment("GetDefaultColor").build(), ODataProperty.class);
+ getFunctionInvokeRequest(getClient().newURIBuilder(testStaticServiceRootURL).
+ appendOperationCallSegment("GetDefaultColor").build(), ODataProperty.class);
defaultColorReq.setFormat(format);
final ODataProperty defaultColor = defaultColorReq.execute().getBody();
assertNotNull(defaultColor);
@@ -58,9 +58,9 @@ public class OperationImportInvokeTestITCase extends AbstractTestITCase {
final ODataPrimitiveValue city = getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("London");
final ODataInvokeRequest<ODataEntity> person2Req = getClient().getInvokeRequestFactory().
- getFunctionInvokeRequest(getClient().newURIBuilder(testStaticServiceRootURL).
- appendOperationCallSegment("GetPerson2").build(), ODataEntity.class,
- Collections.<String, ODataValue>singletonMap("city", city));
+ getFunctionInvokeRequest(getClient().newURIBuilder(testStaticServiceRootURL).
+ appendOperationCallSegment("GetPerson2").build(), ODataEntity.class,
+ Collections.<String, ODataValue> singletonMap("city", city));
person2Req.setFormat(format);
final ODataEntity person2 = person2Req.execute().getBody();
assertNotNull(person2);
@@ -69,18 +69,18 @@ public class OperationImportInvokeTestITCase extends AbstractTestITCase {
// GetPerson
final ODataComplexValue<ODataProperty> address = getClient().getObjectFactory().
- newLinkedComplexValue("Microsoft.Test.OData.Services.ODataWCFService.Address");
+ newLinkedComplexValue("Microsoft.Test.OData.Services.ODataWCFService.Address");
address.add(client.getObjectFactory().newPrimitiveProperty("Street",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("1 Microsoft Way")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("1 Microsoft Way")));
address.add(client.getObjectFactory().newPrimitiveProperty("City",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("London")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("London")));
address.add(client.getObjectFactory().newPrimitiveProperty("PostalCode",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("98052")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("98052")));
final ODataInvokeRequest<ODataEntity> personReq = getClient().getInvokeRequestFactory().
- getFunctionInvokeRequest(getClient().newURIBuilder(testStaticServiceRootURL).
- appendOperationCallSegment("GetPerson").build(), ODataEntity.class,
- Collections.<String, ODataValue>singletonMap("address", address));
+ getFunctionInvokeRequest(getClient().newURIBuilder(testStaticServiceRootURL).
+ appendOperationCallSegment("GetPerson").build(), ODataEntity.class,
+ Collections.<String, ODataValue> singletonMap("address", address));
personReq.setFormat(format);
final ODataEntity person = personReq.execute().getBody();
assertNotNull(person);
@@ -88,8 +88,8 @@ public class OperationImportInvokeTestITCase extends AbstractTestITCase {
// GetAllProducts
final ODataInvokeRequest<ODataEntitySet> productsReq = getClient().getInvokeRequestFactory()
- .getFunctionInvokeRequest(getClient().newURIBuilder(testStaticServiceRootURL).
- appendOperationCallSegment("GetAllProducts").build(), ODataEntitySet.class);
+ .getFunctionInvokeRequest(getClient().newURIBuilder(testStaticServiceRootURL).
+ appendOperationCallSegment("GetAllProducts").build(), ODataEntitySet.class);
productsReq.setFormat(format);
final ODataEntitySet products = productsReq.execute().getBody();
assertNotNull(products);
@@ -97,12 +97,12 @@ public class OperationImportInvokeTestITCase extends AbstractTestITCase {
// GetProductsByAccessLevel
final ODataEnumValue accessLevel = getClient().getObjectFactory().
- newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", "None");
+ newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", "None");
final ODataInvokeRequest<ODataProperty> prodByALReq = getClient().getInvokeRequestFactory().
- getFunctionInvokeRequest(getClient().newURIBuilder(testStaticServiceRootURL).
- appendOperationCallSegment("GetProductsByAccessLevel").build(), ODataProperty.class,
- Collections.<String, ODataValue>singletonMap("accessLevel", accessLevel));
+ getFunctionInvokeRequest(getClient().newURIBuilder(testStaticServiceRootURL).
+ appendOperationCallSegment("GetProductsByAccessLevel").build(), ODataProperty.class,
+ Collections.<String, ODataValue> singletonMap("accessLevel", accessLevel));
prodByALReq.setFormat(format);
final ODataProperty prodByAL = prodByALReq.execute().getBody();
assertNotNull(prodByAL);
@@ -125,7 +125,7 @@ public class OperationImportInvokeTestITCase extends AbstractTestITCase {
public void edmEnabledFunctionImports() throws EdmPrimitiveTypeException {
// GetDefaultColor
final ODataInvokeRequest<ODataProperty> defaultColorReq = edmClient.getInvokeRequestFactory().
- getFunctionImportInvokeRequest("GetDefaultColor");
+ getFunctionImportInvokeRequest("GetDefaultColor");
final ODataProperty defaultColor = defaultColorReq.execute().getBody();
assertNotNull(defaultColor);
assertTrue(defaultColor.hasEnumValue());
@@ -134,10 +134,10 @@ public class OperationImportInvokeTestITCase extends AbstractTestITCase {
// GetPerson2
final ODataPrimitiveValue city =
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("London");
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("London");
final ODataInvokeRequest<ODataEntity> person2Req = edmClient.getInvokeRequestFactory().
- getFunctionImportInvokeRequest(
- "GetPerson2", Collections.<String, ODataValue>singletonMap("city", city));
+ getFunctionImportInvokeRequest(
+ "GetPerson2", Collections.<String, ODataValue> singletonMap("city", city));
final ODataEntity person2 = person2Req.execute().getBody();
assertNotNull(person2);
assertEquals("Microsoft.Test.OData.Services.ODataWCFService.Customer", person2.getTypeName().toString());
@@ -145,36 +145,36 @@ public class OperationImportInvokeTestITCase extends AbstractTestITCase {
// GetPerson
final ODataComplexValue<ODataProperty> address = getClient().getObjectFactory().
- newLinkedComplexValue("Microsoft.Test.OData.Services.ODataWCFService.Address");
+ newLinkedComplexValue("Microsoft.Test.OData.Services.ODataWCFService.Address");
address.add(client.getObjectFactory().newPrimitiveProperty("Street",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("1 Microsoft Way")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("1 Microsoft Way")));
address.add(client.getObjectFactory().newPrimitiveProperty("City",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("London")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("London")));
address.add(client.getObjectFactory().newPrimitiveProperty("PostalCode",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("98052")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("98052")));
final ODataInvokeRequest<ODataEntity> personReq = edmClient.getInvokeRequestFactory().
- getFunctionImportInvokeRequest(
- "GetPerson", Collections.<String, ODataValue>singletonMap("address", address));
+ getFunctionImportInvokeRequest(
+ "GetPerson", Collections.<String, ODataValue> singletonMap("address", address));
final ODataEntity person = personReq.execute().getBody();
assertNotNull(person);
assertEquals(person2, person);
// GetAllProducts
final ODataInvokeRequest<ODataEntitySet> productsReq = edmClient.getInvokeRequestFactory().
- getFunctionImportInvokeRequest("GetAllProducts");
+ getFunctionImportInvokeRequest("GetAllProducts");
final ODataEntitySet products = productsReq.execute().getBody();
assertNotNull(products);
assertEquals(5, products.getCount());
// GetProductsByAccessLevel
final ODataEnumValue accessLevel = getClient().getObjectFactory().
- newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", "None");
+ newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", "None");
final ODataInvokeRequest<ODataProperty> prodByALReq = edmClient.getInvokeRequestFactory().
- getFunctionImportInvokeRequest(
- "GetProductsByAccessLevel",
- Collections.<String, ODataValue>singletonMap("accessLevel", accessLevel));
+ getFunctionImportInvokeRequest(
+ "GetProductsByAccessLevel",
+ Collections.<String, ODataValue> singletonMap("accessLevel", accessLevel));
final ODataProperty prodByAL = prodByALReq.execute().getBody();
assertNotNull(prodByAL);
assertTrue(prodByAL.hasCollectionValue());
@@ -186,27 +186,27 @@ public class OperationImportInvokeTestITCase extends AbstractTestITCase {
// Discount
final ODataPrimitiveValue percentage = getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(22);
final ODataInvokeRequest<ODataNoContent> discountReq = getClient().getInvokeRequestFactory().
- getActionInvokeRequest(getClient().newURIBuilder(testStaticServiceRootURL).
- appendOperationCallSegment("Discount").build(), ODataNoContent.class,
- Collections.<String, ODataValue>singletonMap("percentage", percentage));
+ getActionInvokeRequest(getClient().newURIBuilder(testStaticServiceRootURL).
+ appendOperationCallSegment("Discount").build(), ODataNoContent.class,
+ Collections.<String, ODataValue> singletonMap("percentage", percentage));
discountReq.setFormat(format);
final ODataNoContent discount = discountReq.execute().getBody();
assertNotNull(discount);
// ResetBossAddress
final ODataComplexValue<ODataProperty> address = getClient().getObjectFactory().
- newLinkedComplexValue("Microsoft.Test.OData.Services.ODataWCFService.Address");
+ newLinkedComplexValue("Microsoft.Test.OData.Services.ODataWCFService.Address");
address.add(client.getObjectFactory().newPrimitiveProperty("Street",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("Via Le Mani Dal Naso, 123")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("Via Le Mani Dal Naso, 123")));
address.add(client.getObjectFactory().newPrimitiveProperty("City",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("Tollo")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("Tollo")));
address.add(client.getObjectFactory().newPrimitiveProperty("PostalCode",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("66010")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("66010")));
final ODataInvokeRequest<ODataProperty> resetBossAddressReq = getClient().getInvokeRequestFactory().
- getActionInvokeRequest(getClient().newURIBuilder(testStaticServiceRootURL).
- appendOperationCallSegment("ResetBossAddress").build(), ODataProperty.class,
- Collections.<String, ODataValue>singletonMap("address", address));
+ getActionInvokeRequest(getClient().newURIBuilder(testStaticServiceRootURL).
+ appendOperationCallSegment("ResetBossAddress").build(), ODataProperty.class,
+ Collections.<String, ODataValue> singletonMap("address", address));
resetBossAddressReq.setFormat(format);
final ODataProperty resetBossAddress = resetBossAddressReq.execute().getBody();
assertNotNull(resetBossAddress);
@@ -228,24 +228,24 @@ public class OperationImportInvokeTestITCase extends AbstractTestITCase {
// Discount
final ODataPrimitiveValue percentage = getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(22);
final ODataInvokeRequest<ODataNoContent> discountReq = edmClient.getInvokeRequestFactory().
- getActionImportInvokeRequest(
- "Discount", Collections.<String, ODataValue>singletonMap("percentage", percentage));
+ getActionImportInvokeRequest(
+ "Discount", Collections.<String, ODataValue> singletonMap("percentage", percentage));
final ODataNoContent discount = discountReq.execute().getBody();
assertNotNull(discount);
// ResetBossAddress
final ODataComplexValue<ODataProperty> address = getClient().getObjectFactory().
- newLinkedComplexValue("Microsoft.Test.OData.Services.ODataWCFService.Address");
+ newLinkedComplexValue("Microsoft.Test.OData.Services.ODataWCFService.Address");
address.add(client.getObjectFactory().newPrimitiveProperty("Street",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("Via Le Mani Dal Naso, 123")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("Via Le Mani Dal Naso, 123")));
address.add(client.getObjectFactory().newPrimitiveProperty("City",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("Tollo")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("Tollo")));
address.add(client.getObjectFactory().newPrimitiveProperty("PostalCode",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("66010")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("66010")));
final ODataInvokeRequest<ODataProperty> resetBossAddressReq = edmClient.getInvokeRequestFactory().
- getActionImportInvokeRequest(
- "ResetBossAddress", Collections.<String, ODataValue>singletonMap("address", address));
+ getActionImportInvokeRequest(
+ "ResetBossAddress", Collections.<String, ODataValue> singletonMap("address", address));
final ODataProperty resetBossAddress = resetBossAddressReq.execute().getBody();
assertNotNull(resetBossAddress);
assertEquals(address.getTypeName(), resetBossAddress.getComplexValue().getTypeName());
@@ -254,13 +254,13 @@ public class OperationImportInvokeTestITCase extends AbstractTestITCase {
private void bossEmails(final ODataFormat format) {
// ResetBossEmail
final ODataCollectionValue<org.apache.olingo.commons.api.domain.v4.ODataValue> emails =
- getClient().getObjectFactory().newCollectionValue("Collection(Edm.String)");
+ getClient().getObjectFactory().newCollectionValue("Collection(Edm.String)");
emails.add(getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("first@olingo.apache.org"));
emails.add(getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("second@olingo.apache.org"));
ODataInvokeRequest<ODataProperty> bossEmailsReq = getClient().getInvokeRequestFactory().
- getActionInvokeRequest(getClient().newURIBuilder(testStaticServiceRootURL).
- appendOperationCallSegment("ResetBossEmail").build(), ODataProperty.class,
- Collections.<String, ODataValue>singletonMap("emails", emails));
+ getActionInvokeRequest(getClient().newURIBuilder(testStaticServiceRootURL).
+ appendOperationCallSegment("ResetBossEmail").build(), ODataProperty.class,
+ Collections.<String, ODataValue> singletonMap("emails", emails));
bossEmailsReq.setFormat(format);
final ODataProperty bossEmails = bossEmailsReq.execute().getBody();
assertNotNull(bossEmails);
@@ -271,7 +271,7 @@ public class OperationImportInvokeTestITCase extends AbstractTestITCase {
params.put("start", getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(0));
params.put("count", getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(100));
bossEmailsReq = getClient().getInvokeRequestFactory().getFunctionInvokeRequest(
- getClient().newURIBuilder(testStaticServiceRootURL).
+ getClient().newURIBuilder(testStaticServiceRootURL).
appendOperationCallSegment("GetBossEmails").build(), ODataProperty.class, params);
bossEmailsReq.setFormat(format);
final ODataProperty bossEmailsViaGET = bossEmailsReq.execute().getBody();
@@ -279,7 +279,7 @@ public class OperationImportInvokeTestITCase extends AbstractTestITCase {
assertTrue(bossEmailsViaGET.hasCollectionValue());
assertEquals(2, bossEmailsViaGET.getCollectionValue().size());
assertEquals(bossEmails.getCollectionValue().asJavaCollection(),
- bossEmailsViaGET.getCollectionValue().asJavaCollection());
+ bossEmailsViaGET.getCollectionValue().asJavaCollection());
}
@Test
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/PropertyTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/PropertyTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/PropertyTestITCase.java
index c300087..05fa606 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/PropertyTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/PropertyTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import java.io.IOException;
+
import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest;
import org.apache.olingo.client.api.communication.request.cud.ODataPropertyUpdateRequest;
@@ -44,16 +45,16 @@ public class PropertyTestITCase extends AbstractTestITCase {
private void _enum(final ODataClient client, final ODataFormat format) {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Products").appendKeySegment(5).appendPropertySegment("CoverColors");
+ appendEntitySetSegment("Products").appendKeySegment(5).appendPropertySegment("CoverColors");
final ODataPropertyRequest<ODataProperty> req = client.getRetrieveRequestFactory().
- getPropertyRequest(uriBuilder.build());
+ getPropertyRequest(uriBuilder.build());
req.setFormat(format);
final ODataProperty prop = req.execute().getBody();
assertNotNull(prop);
// cast to workaround JDK 6 bug, fixed in JDK 7
assertEquals("Collection(Microsoft.Test.OData.Services.ODataWCFService.Color)",
- ((ODataValuable) prop).getValue().getTypeName());
+ ((ODataValuable) prop).getValue().getTypeName());
}
@Test
@@ -73,9 +74,9 @@ public class PropertyTestITCase extends AbstractTestITCase {
private void geospatial(final ODataClient client, final ODataFormat format) {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("Home");
+ appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("Home");
final ODataPropertyRequest<ODataProperty> req = client.getRetrieveRequestFactory().
- getPropertyRequest(uriBuilder.build());
+ getPropertyRequest(uriBuilder.build());
req.setFormat(format);
final ODataProperty prop = req.execute().getBody();
@@ -101,16 +102,16 @@ public class PropertyTestITCase extends AbstractTestITCase {
private void complex(final ODataClient client, final ODataFormat format) {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Customers").appendKeySegment(2).appendPropertySegment("HomeAddress");
+ appendEntitySetSegment("Customers").appendKeySegment(2).appendPropertySegment("HomeAddress");
final ODataPropertyRequest<ODataProperty> req = client.getRetrieveRequestFactory().
- getPropertyRequest(uriBuilder.build());
+ getPropertyRequest(uriBuilder.build());
req.setFormat(format);
final ODataProperty prop = req.execute().getBody();
assertNotNull(prop);
// cast to workaround JDK 6 bug, fixed in JDK 7
assertEquals("Microsoft.Test.OData.Services.ODataWCFService.Address",
- ((ODataValuable) prop).getValue().getTypeName());
+ ((ODataValuable) prop).getValue().getTypeName());
}
@Test
@@ -130,23 +131,23 @@ public class PropertyTestITCase extends AbstractTestITCase {
private void updateComplexProperty(final ODataFormat format, final UpdateType type) throws IOException {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Customers").appendKeySegment(1).appendPropertySegment("HomeAddress");
+ appendEntitySetSegment("Customers").appendKeySegment(1).appendPropertySegment("HomeAddress");
ODataPropertyRequest<ODataProperty> retrieveReq =
- client.getRetrieveRequestFactory().getPropertyRequest(uriBuilder.build());
+ client.getRetrieveRequestFactory().getPropertyRequest(uriBuilder.build());
retrieveReq.setFormat(format);
ODataRetrieveResponse<ODataProperty> retrieveRes = retrieveReq.execute();
assertEquals(200, retrieveRes.getStatusCode());
ODataProperty homeAddress = client.getObjectFactory().newComplexProperty("HomeAddress",
- client.getObjectFactory().newComplexValue(retrieveRes.getBody().getComplexValue().getTypeName()));
+ client.getObjectFactory().newComplexValue(retrieveRes.getBody().getComplexValue().getTypeName()));
homeAddress.getComplexValue().add(client.getObjectFactory().
- newPrimitiveProperty("City", client.getObjectFactory().newPrimitiveValueBuilder().buildString("Pescara")));
+ newPrimitiveProperty("City", client.getObjectFactory().newPrimitiveValueBuilder().buildString("Pescara")));
final ODataPropertyUpdateRequest updateReq = client.getCUDRequestFactory().
- getPropertyComplexValueUpdateRequest(uriBuilder.build(), type, homeAddress);
+ getPropertyComplexValueUpdateRequest(uriBuilder.build(), type, homeAddress);
if (client.getConfiguration().isUseXHTTPMethod()) {
assertEquals(HttpMethod.POST, updateReq.getMethod());
} else {
@@ -177,23 +178,23 @@ public class PropertyTestITCase extends AbstractTestITCase {
// 1. create
final ODataEntity category = client.getObjectFactory().newEntity(null);
category.setId(client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Categories").appendKeySegment(1).build());
+ appendEntitySetSegment("Categories").appendKeySegment(1).build());
final URIBuilder createBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Products").appendKeySegment(0).appendNavigationSegment("Categories").
- appendRefSegment();
+ appendEntitySetSegment("Products").appendKeySegment(0).appendNavigationSegment("Categories").
+ appendRefSegment();
final ODataEntityCreateRequest<ODataEntity> createReq = client.getCUDRequestFactory().
- getEntityCreateRequest(createBuilder.build(), category);
+ getEntityCreateRequest(createBuilder.build(), category);
final ODataEntityCreateResponse<ODataEntity> createRes = createReq.execute();
assertEquals(204, createRes.getStatusCode());
// 2. delete
final URIBuilder deleteBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Products").appendKeySegment(0).appendNavigationSegment("Categories").
- appendKeySegment(1).appendRefSegment();
+ appendEntitySetSegment("Products").appendKeySegment(0).appendNavigationSegment("Categories").
+ appendKeySegment(1).appendRefSegment();
final ODataDeleteRequest deleteReq = client.getCUDRequestFactory().
- getDeleteRequest(deleteBuilder.build());
+ getDeleteRequest(deleteBuilder.build());
final ODataDeleteResponse deleteRes = deleteReq.execute();
assertEquals(204, deleteRes.getStatusCode());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java
index ed9c3ad..b9e8f70 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -41,7 +41,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveIntPropertyValueTest() throws EdmPrimitiveTypeException {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("PersonID");
+ appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("PersonID");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
req.setFormat(ODataFormat.TEXT_PLAIN);
assertEquals("5", req.execute().getBody().toString());
@@ -50,7 +50,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveBooleanPropertyValueTest() throws EdmPrimitiveTypeException {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("IsRegistered");
+ appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("IsRegistered");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
req.setFormat(ODataFormat.TEXT_PLAIN);
assertEquals("true", req.execute().getBody().toString());
@@ -59,7 +59,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveStringPropertyValueTest() throws EdmPrimitiveTypeException {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("FirstName");
+ appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("FirstName");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
req.setFormat(ODataFormat.TEXT_PLAIN);
assertEquals("Peter", req.execute().getBody().toString());
@@ -68,7 +68,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveDatePropertyValueTest() {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Orders").appendKeySegment(8).appendPropertySegment("OrderDate");
+ appendEntitySetSegment("Orders").appendKeySegment(8).appendPropertySegment("OrderDate");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
req.setFormat(ODataFormat.TEXT_PLAIN);
final ODataPrimitiveValue property = req.execute().getBody();
@@ -78,7 +78,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveDecimalPropertyValueTest() throws EdmPrimitiveTypeException {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("Height");
+ appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("Height");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
req.setFormat(ODataFormat.TEXT_PLAIN);
final ODataPrimitiveValue property = req.execute().getBody();
@@ -88,18 +88,18 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveBinaryPropertyValueTest() throws IOException {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("PDC");
+ appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("PDC");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
req.setFormat(ODataFormat.TEXT_PLAIN);
final ODataPrimitiveValue property = req.execute().getBody();
assertEquals("fi653p3+MklA/LdoBlhWgnMTUUEo8tEgtbMXnF0a3CUNL9BZxXpSRiD9ebTnmNR0zWPjJ"
- + "VIDx4tdmCnq55XrJh+RW9aI/b34wAogK3kcORw=", property.toString());
+ + "VIDx4tdmCnq55XrJh+RW9aI/b34wAogK3kcORw=", property.toString());
}
@Test(expected = ODataClientErrorException.class)
public void retrieveBinaryPropertyValueTestWithAtom() throws IOException {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("PDC");
+ appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("PDC");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
req.setAccept(ODataFormat.ATOM.getContentType(ODataServiceVersion.V40).toContentTypeString());
req.execute().getBody();
@@ -108,7 +108,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test(expected = ODataClientErrorException.class)
public void retrieveBinaryPropertyValueTestWithXML() throws IOException {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("PDC");
+ appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("PDC");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
req.setAccept(ODataFormat.XML.getContentType(client.getServiceVersion()).toContentTypeString());
req.execute().getBody();
@@ -117,9 +117,9 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveCollectionPropertyValueTest() {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("Numbers");
+ appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("Numbers");
final ODataPropertyRequest<ODataProperty> req = client.getRetrieveRequestFactory().
- getPropertyRequest(uriBuilder.build());
+ getPropertyRequest(uriBuilder.build());
req.setFormat(ODataFormat.XML);
final ODataProperty property = req.execute().getBody();
// cast to workaround JDK 6 bug, fixed in JDK 7
@@ -130,7 +130,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
@Test
public void retrieveNullPropertyValueTest() {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("HomeAddress");
+ appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("HomeAddress");
final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
req.setFormat(ODataFormat.TEXT_PLAIN);
final ODataPrimitiveValue property = req.execute().getBody();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java
index b55f4ef..413fcdd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -49,7 +49,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
*/
public void expand() {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Customers").appendKeySegment(1).expand("Orders");
+ appendEntitySetSegment("Customers").appendKeySegment(1).expand("Orders");
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
@@ -60,9 +60,9 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
@Test
public void expandWithFilter() {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Customers").appendKeySegment(1).
- expandWithOptions("Orders", Collections.<QueryOption, Object>singletonMap(
- QueryOption.FILTER, getClient().getFilterFactory().gt("OrderID", 7).build()));
+ appendEntitySetSegment("Customers").appendKeySegment(1).
+ expandWithOptions("Orders", Collections.<QueryOption, Object> singletonMap(
+ QueryOption.FILTER, getClient().getFilterFactory().gt("OrderID", 7).build()));
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
@@ -72,17 +72,17 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
/**
* Test <tt>$filter</tt> and <tt>$orderby</tt>.
- *
+ *
* @see org.apache.olingo.fit.v4.FilterFactoryTestITCase for more tests.
*/
@Test
public void filterOrderby() throws EdmPrimitiveTypeException {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("People").filter("(PersonID lt 3)");
+ appendEntitySetSegment("People").filter("(PersonID lt 3)");
// 1. check that filtered entity set looks as expected
ODataEntitySetRequest<ODataEntitySet> req =
- client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
+ client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
ODataEntitySet feed = req.execute().getBody();
assertNotNull(feed);
@@ -122,7 +122,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
@Test
public void format() {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Customers").appendKeySegment(1).format("json");
+ appendEntitySetSegment("Customers").appendKeySegment(1).format("json");
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setFormat(ODataFormat.ATOM);
@@ -130,7 +130,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
final ODataRetrieveResponse<ODataEntity> res = req.execute();
assertNotNull(res);
assertTrue(res.getContentType().replaceAll(" ", "").
- startsWith(ODataFormat.JSON.getContentType(client.getServiceVersion()).toContentTypeString()));
+ startsWith(ODataFormat.JSON.getContentType(client.getServiceVersion()).toContentTypeString()));
}
/**
@@ -141,7 +141,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
// 1. check that filtered entity set looks as expected
final ODataEntitySetRequest<ODataEntitySet> req =
- client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.skip(2).build());
+ client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.skip(2).build());
final ODataEntitySet feed = req.execute().getBody();
assertEquals(3, feed.getEntities().size());
@@ -155,7 +155,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
// 1. check that filtered entity set looks as expected
final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
- getEntitySetRequest(uriBuilder.top(2).build());
+ getEntitySetRequest(uriBuilder.top(2).build());
final ODataEntitySet feed = req.execute().getBody();
assertEquals(2, feed.getEntities().size());
@@ -170,7 +170,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
uriBuilder.appendEntitySetSegment("People").skipToken("5");
final ODataEntitySetRequest<ODataEntitySet> req =
- client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
+ client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
final ODataEntitySet feed = req.execute().getBody();
assertNotNull(feed);
@@ -187,10 +187,10 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
@Test
public void count() {
final URIBuilder uriBuilder =
- client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customers").count(true);
+ client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customers").count(true);
final ODataEntitySetRequest<ODataEntitySet> req =
- client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
+ client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
final ODataEntitySet feed = req.execute().getBody();
assertNotNull(feed);
@@ -203,7 +203,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
@Test
public void select() {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Customers").appendKeySegment(1).select("PersonID,Orders").expand("Orders");
+ appendEntitySetSegment("Customers").appendKeySegment(1).select("PersonID,Orders").expand("Orders");
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
@@ -216,8 +216,8 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
@Test
public void issue253() {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("relatedEntitySelect").appendEntitySetSegment("Customers").appendKeySegment(1).
- expandWithSelect("Orders", "OrderID", "OrderDetails");
+ appendEntitySetSegment("relatedEntitySelect").appendEntitySetSegment("Customers").appendKeySegment(1).
+ expandWithSelect("Orders", "OrderID", "OrderDetails");
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
@@ -228,11 +228,11 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
@Test
public void search() {
final URIBuilder builder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("People").search(client.getSearchFactory().
- or(client.getSearchFactory().literal("Bob"), client.getSearchFactory().literal("Jill")));
+ appendEntitySetSegment("People").search(client.getSearchFactory().
+ or(client.getSearchFactory().literal("Bob"), client.getSearchFactory().literal("Jill")));
final ODataEntitySetRequest<ODataEntitySet> req =
- client.getRetrieveRequestFactory().getEntitySetRequest(builder.build());
+ client.getRetrieveRequestFactory().getEntitySetRequest(builder.build());
final ODataRetrieveResponse<ODataEntitySet> res = req.execute();
assertEquals(200, res.getStatusCode());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/ServiceDocumentTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/ServiceDocumentTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/ServiceDocumentTestITCase.java
index 5c01b65..25fb633 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/ServiceDocumentTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/ServiceDocumentTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.v4;
import static org.junit.Assert.assertEquals;
import java.net.URI;
+
import org.apache.olingo.client.api.communication.request.retrieve.ODataServiceDocumentRequest;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.commons.api.domain.ODataServiceDocument;
@@ -31,7 +32,7 @@ public class ServiceDocumentTestITCase extends AbstractTestITCase {
private void retrieveServiceDocument(final ODataFormat format) {
final ODataServiceDocumentRequest req =
- client.getRetrieveRequestFactory().getServiceDocumentRequest(testStaticServiceRootURL);
+ client.getRetrieveRequestFactory().getServiceDocumentRequest(testStaticServiceRootURL);
req.setFormat(format);
final ODataRetrieveResponse<ODataServiceDocument> res = req.execute();
@@ -43,11 +44,11 @@ public class ServiceDocumentTestITCase extends AbstractTestITCase {
assertEquals(6, serviceDocument.getFunctionImports().size());
assertEquals(URI.create(testStaticServiceRootURL + "/ProductDetails"),
- serviceDocument.getEntitySetURI("ProductDetails"));
+ serviceDocument.getEntitySetURI("ProductDetails"));
assertEquals(URI.create(testStaticServiceRootURL + "/Boss"),
- serviceDocument.getSingletonURI("Boss"));
+ serviceDocument.getSingletonURI("Boss"));
assertEquals(URI.create(testStaticServiceRootURL + "/GetPerson"),
- serviceDocument.getFunctionImportURI("GetPerson"));
+ serviceDocument.getFunctionImportURI("GetPerson"));
}
@Test
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java
index 03621cc..e6059c4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -44,7 +44,7 @@ public class SingletonTestITCase extends AbstractTestITCase {
private void read(final ODataClient client, final ODataFormat format) throws EdmPrimitiveTypeException {
final URIBuilder builder = client.newURIBuilder(testStaticServiceRootURL).appendSingletonSegment("Company");
final ODataEntityRequest<ODataSingleton> singleton =
- client.getRetrieveRequestFactory().getSingletonRequest(builder.build());
+ client.getRetrieveRequestFactory().getSingletonRequest(builder.build());
singleton.setFormat(format);
final ODataSingleton company = singleton.execute().getBody();
assertNotNull(company);
@@ -52,13 +52,13 @@ public class SingletonTestITCase extends AbstractTestITCase {
assertEquals(0, company.getProperty("CompanyID").getPrimitiveValue().toCastValue(Integer.class), 0);
// cast to workaround JDK 6 bug, fixed in JDK 7
assertEquals("Microsoft.Test.OData.Services.ODataWCFService.CompanyCategory",
- ((ODataValuable) company.getProperty("CompanyCategory")).getValue().getTypeName());
+ ((ODataValuable) company.getProperty("CompanyCategory")).getValue().getTypeName());
assertTrue(company.getProperty("CompanyCategory").hasEnumValue());
}
@Test
public void readFromAtom() throws EdmPrimitiveTypeException {
- read(client, ODataFormat.ATOM);
+ read(client, ODataFormat.ATOM);
}
@Test
@@ -71,12 +71,12 @@ public class SingletonTestITCase extends AbstractTestITCase {
read(client, ODataFormat.JSON_FULL_METADATA);
}
- private void readWithAnnotations(final ODataClient client, final ODataFormat format)
- throws EdmPrimitiveTypeException {
-
- final URIBuilder builder = client.newURIBuilder(testStaticServiceRootURL).appendSingletonSegment("Boss");
+ private void readWithAnnotations(final ODataClient client, final ODataFormat format)
+ throws EdmPrimitiveTypeException {
+
+ final URIBuilder builder = client.newURIBuilder(testStaticServiceRootURL).appendSingletonSegment("Boss");
final ODataEntityRequest<ODataSingleton> singleton =
- client.getRetrieveRequestFactory().getSingletonRequest(builder.build());
+ client.getRetrieveRequestFactory().getSingletonRequest(builder.build());
singleton.setFormat(format);
singleton.setPrefer(client.newPreferences().includeAnnotations("*"));
final ODataSingleton boss = singleton.execute().getBody();
@@ -104,13 +104,13 @@ public class SingletonTestITCase extends AbstractTestITCase {
private void update(final ODataFormat format) throws EdmPrimitiveTypeException {
final ODataSingleton changes = getClient().getObjectFactory().newSingleton(
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Company"));
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Company"));
changes.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("Revenue",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt64(132520L)));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt64(132520L)));
final URI uri = client.newURIBuilder(testStaticServiceRootURL).appendSingletonSegment("Company").build();
final ODataEntityUpdateRequest<ODataSingleton> req = getClient().getCUDRequestFactory().
- getSingletonUpdateRequest(uri, UpdateType.PATCH, changes);
+ getSingletonUpdateRequest(uri, UpdateType.PATCH, changes);
req.setFormat(format);
final ODataEntityUpdateResponse<ODataSingleton> res = req.execute();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/lib/commons-api/src/main/java/org/apache/olingo/commons/api/Constants.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/Constants.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/Constants.java
index 2eacd47..8241457 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/Constants.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/Constants.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataApplicationException.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataApplicationException.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataApplicationException.java
index eacac21..a4a76e0 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataApplicationException.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataApplicationException.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataException.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataException.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataException.java
index 334b83f..784a8ac 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataException.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataException.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataNotImplementedException.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataNotImplementedException.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataNotImplementedException.java
index 8cb8096..de6fc5e 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataNotImplementedException.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataNotImplementedException.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataRuntimeException.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataRuntimeException.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataRuntimeException.java
index 849e509..0a2c3c8 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataRuntimeException.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataRuntimeException.java
@@ -22,15 +22,15 @@ public class ODataRuntimeException extends RuntimeException {
private static final long serialVersionUID = 1L;
- public ODataRuntimeException(String msg) {
+ public ODataRuntimeException(final String msg) {
super(msg);
}
- public ODataRuntimeException(String msg, Exception e) {
+ public ODataRuntimeException(final String msg, final Exception e) {
super(msg, e);
}
- public ODataRuntimeException(Exception e) {
+ public ODataRuntimeException(final Exception e) {
super(e);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotatable.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotatable.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotatable.java
index 4be0262..b2e3583 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotatable.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotatable.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
[19/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
index ec4ad23..9c5ab37 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
@@ -1,343 +1,340 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "SpecialEmployee",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee")
-public interface SpecialEmployee
- extends Annotatable,org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPersonId();
-
- void setPersonId(java.lang.Integer _personId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManagersPersonId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getManagersPersonId();
-
- void setManagersPersonId(java.lang.Integer _managersPersonId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Salary",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getSalary();
-
- void setSalary(java.lang.Integer _salary);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Title",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getTitle();
-
- void setTitle(java.lang.String _title);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CarsVIN",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getCarsVIN();
-
- void setCarsVIN(java.lang.Integer _carsVIN);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Bonus",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getBonus();
-
- void setBonus(java.lang.Integer _bonus);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "IsFullyVested",
- type = "Edm.Boolean",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Boolean getIsFullyVested();
-
- void setIsFullyVested(java.lang.Boolean _isFullyVested);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonMetadata",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "PersonMetadata",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection getPersonMetadata();
-
- void setPersonMetadata(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Manager",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Person",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee getManager();
-
- void setManager(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee _manager);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Car",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Car",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car getCar();
-
- void setCar(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car _car);
-
-
- @Override
- Operations operations();
-
- interface Operations extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee.Operations{
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee.ComplexFactory{
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
- type = "Edm.Int32")
- Annotatable getPersonIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManagersPersonId",
- type = "Edm.Int32")
- Annotatable getManagersPersonIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Salary",
- type = "Edm.Int32")
- Annotatable getSalaryAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Title",
- type = "Edm.String")
- Annotatable getTitleAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CarsVIN",
- type = "Edm.Int32")
- Annotatable getCarsVINAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Bonus",
- type = "Edm.Int32")
- Annotatable getBonusAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "IsFullyVested",
- type = "Edm.Boolean")
- Annotatable getIsFullyVestedAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonMetadata",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata")
- Annotatable getPersonMetadataAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Manager",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee")
- Annotatable getManagerAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Car",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Car")
- Annotatable getCarAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee")
+public interface SpecialEmployee
+ extends Annotatable,
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee {
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPersonId();
+
+ @Override
+ void setPersonId(java.lang.Integer _personId);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ @Override
+ void setName(java.lang.String _name);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManagersPersonId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getManagersPersonId();
+
+ @Override
+ void setManagersPersonId(java.lang.Integer _managersPersonId);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Salary",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getSalary();
+
+ @Override
+ void setSalary(java.lang.Integer _salary);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Title",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getTitle();
+
+ @Override
+ void setTitle(java.lang.String _title);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CarsVIN",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getCarsVIN();
+
+ void setCarsVIN(java.lang.Integer _carsVIN);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Bonus",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getBonus();
+
+ void setBonus(java.lang.Integer _bonus);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "IsFullyVested",
+ type = "Edm.Boolean",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Boolean getIsFullyVested();
+
+ void setIsFullyVested(java.lang.Boolean _isFullyVested);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonMetadata",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "PersonMetadata",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection
+ getPersonMetadata();
+
+ @Override
+ void
+ setPersonMetadata(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Manager",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Person",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee
+ getManager();
+
+ @Override
+ void
+ setManager(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee _manager);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Car",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Car",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car getCar();
+
+ void setCar(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car _car);
+
+ @Override
+ Operations operations();
+
+ interface Operations
+ extends
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee.Operations {
+
+ }
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory
+ extends
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee.ComplexFactory {}
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations
+ extends
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
+ type = "Edm.Int32")
+ Annotatable getPersonIdAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManagersPersonId",
+ type = "Edm.Int32")
+ Annotatable getManagersPersonIdAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Salary",
+ type = "Edm.Int32")
+ Annotatable getSalaryAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Title",
+ type = "Edm.String")
+ Annotatable getTitleAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CarsVIN",
+ type = "Edm.Int32")
+ Annotatable getCarsVINAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Bonus",
+ type = "Edm.Int32")
+ Annotatable getBonusAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "IsFullyVested",
+ type = "Edm.Boolean")
+ Annotatable getIsFullyVestedAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonMetadata",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata")
+ Annotatable getPersonMetadataAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Manager",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee")
+ Annotatable getManagerAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Car",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Car")
+ Annotatable getCarAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java
index 6a02064..e91123d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface SpecialEmployeeCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee> {
+public interface SpecialEmployeeCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/package-info.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/package-info.java
index c6af535..f9fa1b2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/package-info.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/package-info.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java
index 2bfcdf5..e3440fc 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -27,6 +27,7 @@ import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Calendar;
import java.util.TimeZone;
+
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.ext.proxy.EntityContainerFactory;
@@ -81,7 +82,7 @@ public abstract class AbstractTestITCase {
containerFactory.getContext().detachAll();
}
- protected Customer readCustomer(final InMemoryEntities container, int id) {
+ protected Customer readCustomer(final InMemoryEntities container, final int id) {
final Customer customer = container.getCustomers().get(id);
assertNotNull(customer);
assertEquals(id, customer.getPersonID(), 0);
@@ -90,8 +91,8 @@ public abstract class AbstractTestITCase {
}
protected void createAndDeleteOrder(
- final InMemoryEntities container, final EntityContainerFactory<EdmEnabledODataClient> containerFactory) {
-
+ final InMemoryEntities container, final EntityContainerFactory<EdmEnabledODataClient> containerFactory) {
+
final Order order = container.getOrders().newOrder();
order.setOrderID(105);
@@ -101,7 +102,7 @@ public abstract class AbstractTestITCase {
order.setOrderDate(orderDate);
order.setShelfLife(BigDecimal.TEN);
- order.setOrderShelfLifes(Arrays.asList(new BigDecimal[] {BigDecimal.TEN.negate(), BigDecimal.TEN}));
+ order.setOrderShelfLifes(Arrays.asList(new BigDecimal[] { BigDecimal.TEN.negate(), BigDecimal.TEN }));
container.flush();
@@ -110,7 +111,7 @@ public abstract class AbstractTestITCase {
assertEquals(orderDate.getTimeInMillis(), actual.getOrderDate().getTimeInMillis());
assertEquals(BigDecimal.TEN, actual.getShelfLife());
assertEquals(2, actual.getOrderShelfLifes().size());
-
+
container.getOrders().delete(105);
actual = container.getOrders().get(105);
assertNull(actual);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AsyncTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AsyncTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AsyncTestITCase.java
index 3295824..ea1179f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AsyncTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AsyncTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -24,12 +24,14 @@ import static org.junit.Assert.assertNotNull;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
+
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.olingo.ext.proxy.api.AsyncCall;
+//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.
- CustomerCollection;
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
+//CHECKSTYLE:ON (Maven checkstyle)
import org.junit.Test;
public class AsyncTestITCase extends AbstractTestITCase {
@@ -37,13 +39,13 @@ public class AsyncTestITCase extends AbstractTestITCase {
@Test
public void retrieveEntitySet() throws InterruptedException, ExecutionException {
final Future<CustomerCollection> futureCustomers =
- new AsyncCall<CustomerCollection>(containerFactory.getClient().getConfiguration()) {
+ new AsyncCall<CustomerCollection>(containerFactory.getClient().getConfiguration()) {
- @Override
- public CustomerCollection call() {
- return container.getCustomers().getAll();
- }
- };
+ @Override
+ public CustomerCollection call() {
+ return container.getCustomers().getAll();
+ }
+ };
assertNotNull(futureCustomers);
while (!futureCustomers.isDone()) {
@@ -79,7 +81,7 @@ public class AsyncTestITCase extends AbstractTestITCase {
Thread.sleep(1000L);
}
- final Future<Person> futureProd = new AsyncCall<Person>(containerFactory.getClient().getConfiguration()) {
+ new AsyncCall<Person>(containerFactory.getClient().getConfiguration()) {
@Override
public Person call() {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityCreateTestITCase.java
index f447b9f..4293292 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityCreateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityCreateTestITCase.java
@@ -1,29 +1,27 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4;
+import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.ext.proxy.EntityContainerFactory;
-
-import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
-import static org.apache.olingo.fit.proxy.v4.AbstractTestITCase.testAuthServiceRootURL;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
public class AuthEntityCreateTestITCase extends EntityCreateTestITCase {
@@ -38,7 +36,7 @@ public class AuthEntityCreateTestITCase extends EntityCreateTestITCase {
ecf = EntityContainerFactory.getV4(testAuthServiceRootURL);
ecf.getClient().getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
ecf.getClient().getConfiguration().
- setHttpClientFactory(new BasicAuthHttpClientFactory("odatajclient", "odatajclient"));
+ setHttpClientFactory(new BasicAuthHttpClientFactory("odatajclient", "odatajclient"));
}
return ecf;
}
@@ -50,5 +48,5 @@ public class AuthEntityCreateTestITCase extends EntityCreateTestITCase {
}
return ime;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityRetrieveTestITCase.java
index 818d3b7..15ebfed 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityRetrieveTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityRetrieveTestITCase.java
@@ -1,25 +1,24 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
-
import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.ext.proxy.EntityContainerFactory;
@@ -32,7 +31,7 @@ public class AuthEntityRetrieveTestITCase extends EntityRetrieveTestITCase {
final EntityContainerFactory<EdmEnabledODataClient> ecf = EntityContainerFactory.getV4(testAuthServiceRootURL);
ecf.getClient().getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
ecf.getClient().getConfiguration().
- setHttpClientFactory(new BasicAuthHttpClientFactory("odatajclient", "odatajclient"));
+ setHttpClientFactory(new BasicAuthHttpClientFactory("odatajclient", "odatajclient"));
return ecf.getEntityContainer(InMemoryEntities.class);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/BoundOperationInvokeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/BoundOperationInvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/BoundOperationInvokeTestITCase.java
index 7ee2234..e37df00 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/BoundOperationInvokeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/BoundOperationInvokeTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -23,18 +23,18 @@ import static org.junit.Assert.assertNotNull;
import java.util.Calendar;
import java.util.Collections;
+
+//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.
- PaymentInstrument;
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.
- ProductDetailCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.
- ProductDetailKey;
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection;
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailKey;
+//CHECKSTYLE:ON (Maven checkstyle)
import org.junit.Test;
public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
@@ -100,7 +100,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
address.setCity("66010");
final Person person = container.getCustomers().get(2).operations().
- resetAddress(Collections.singletonList(address), 0);
+ resetAddress(Collections.singletonList(address), 0);
assertEquals(2, person.getPersonID(), 0);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/DerivedTypeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/DerivedTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/DerivedTypeTestITCase.java
index 06ad28f..3d2dcd2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/DerivedTypeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/DerivedTypeTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -24,16 +24,16 @@ import static org.junit.Assert.assertTrue;
import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Collections;
+
+//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyAddress;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.
- CreditCardPI;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.
- CreditCardPICollection;
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI;
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPICollection;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.
- CustomerCollection;
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
+//CHECKSTYLE:ON (Maven checkstyle)
import org.junit.Test;
public class DerivedTypeTestITCase extends AbstractTestITCase {
@@ -48,7 +48,7 @@ public class DerivedTypeTestITCase extends AbstractTestITCase {
}
final CreditCardPICollection creditCards = container.getAccounts().get(101).
- getMyPaymentInstruments().getAll(CreditCardPICollection.class);
+ getMyPaymentInstruments().getAll(CreditCardPICollection.class);
assertNotNull(creditCards);
for (CreditCardPI creditCard : creditCards) {
assertTrue(creditCard instanceof CreditCardPI);
@@ -68,8 +68,8 @@ public class DerivedTypeTestITCase extends AbstractTestITCase {
homeAddress.setPostalCode("65127");
customer.setHomeAddress(homeAddress);
- customer.setNumbers(Collections.<String>emptyList());
- customer.setEmails(Collections.<String>emptyList());
+ customer.setNumbers(Collections.<String> emptyList());
+ customer.setEmails(Collections.<String> emptyList());
customer.setCity("Pescara");
final Calendar birthday = Calendar.getInstance();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java
index 959e62b..f54876e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -28,9 +28,11 @@ import java.util.Arrays;
import java.util.Calendar;
import java.util.Collections;
import java.util.TimeZone;
+
import org.apache.commons.lang3.RandomUtils;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.ext.proxy.EntityContainerFactory;
+//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
@@ -41,14 +43,12 @@ import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.service
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.
- PaymentInstrument;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.
- PaymentInstrumentCollection;
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument;
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.
- ProductDetailCollection;
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection;
+//CHECKSTYLE:ON (Maven checkstyle)
import org.junit.Test;
/**
@@ -77,7 +77,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
employee.setPersonID(id);
employee.setFirstName("Fabio");
employee.setLastName("Martelli");
- employee.setEmails(Collections.<String>singleton("fabio.martelli@tirasa.net"));
+ employee.setEmails(Collections.<String> singleton("fabio.martelli@tirasa.net"));
final Calendar date = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
date.clear();
date.set(2011, 3, 4, 9, 0, 0);
@@ -87,7 +87,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
homeAddress.setPostalCode("65100");
homeAddress.setStreet("viale Gabriele D'Annunzio 256");
employee.setHomeAddress(homeAddress);
- employee.setNumbers(Arrays.asList(new String[] {"3204725072", "08569930"}));
+ employee.setNumbers(Arrays.asList(new String[] { "3204725072", "08569930" }));
getContainer().flush();
@@ -123,13 +123,13 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
customer.setFirstName("Fabio");
customer.setLastName("Martelli");
customer.setCity("Pescara");
- customer.setEmails(Collections.<String>singleton("fabio.martelli@tirasa.net"));
+ customer.setEmails(Collections.<String> singleton("fabio.martelli@tirasa.net"));
Address homeAddress = customer.factory().newHomeAddress();
homeAddress.setCity("Pescara");
homeAddress.setPostalCode("65100");
homeAddress.setStreet("viale Gabriele D'Annunzio 256");
customer.setHomeAddress(homeAddress);
- customer.setNumbers(Arrays.asList(new String[] {"3204725072", "08569930"}));
+ customer.setNumbers(Arrays.asList(new String[] { "3204725072", "08569930" }));
final OrderCollection orders = getContainer().getOrders().newOrderCollection();
orders.add(getContainer().getOrders().get(8));
@@ -165,7 +165,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
order.setOrderDate(orderDate);
order.setShelfLife(BigDecimal.TEN);
- order.setOrderShelfLifes(Arrays.asList(new BigDecimal[] {BigDecimal.TEN.negate(), BigDecimal.TEN}));
+ order.setOrderShelfLifes(Arrays.asList(new BigDecimal[] { BigDecimal.TEN.negate(), BigDecimal.TEN }));
// -------------------------------
// -------------------------------
@@ -177,13 +177,13 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
customer.setFirstName("Fabio");
customer.setLastName("Martelli");
customer.setCity("Pescara");
- customer.setEmails(Collections.<String>singleton("fabio.martelli@tirasa.net"));
+ customer.setEmails(Collections.<String> singleton("fabio.martelli@tirasa.net"));
final Address homeAddress = customer.factory().newHomeAddress();
homeAddress.setCity("Pescara");
homeAddress.setPostalCode("65100");
homeAddress.setStreet("viale Gabriele D'Annunzio 256");
customer.setHomeAddress(homeAddress);
- customer.setNumbers(Arrays.asList(new String[] {"3204725072", "08569930"}));
+ customer.setNumbers(Arrays.asList(new String[] { "3204725072", "08569930" }));
final OrderCollection orders = getContainer().getOrders().newOrderCollection();
orders.add(order);
@@ -264,7 +264,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
product.setDiscontinued(false);
product.setUserAccess(AccessLevel.Execute);
product.setSkinColor(Color.Blue);
- product.setCoverColors(Arrays.asList(new Color[] {Color.Red, Color.Green}));
+ product.setCoverColors(Arrays.asList(new Color[] { Color.Red, Color.Green }));
final ProductDetail detail = getContainer().getProductDetails().newProductDetail();
detail.setProductID(product.getProductID());
@@ -290,7 +290,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
final int sizeBefore = instruments.size();
final PaymentInstrument instrument = getContainer().getAccounts().get(101).
- getMyPaymentInstruments().newPaymentInstrument();
+ getMyPaymentInstruments().newPaymentInstrument();
final int id = RandomUtils.nextInt(101999, 105000);
instrument.setPaymentInstrumentID(id);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityRetrieveTestITCase.java
index 6504fa9..d9900fd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityRetrieveTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityRetrieveTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -27,28 +27,27 @@ import static org.junit.Assert.fail;
import java.lang.reflect.Proxy;
import java.util.Calendar;
import java.util.TimeZone;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler;
+//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.
- CustomerCollection;
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.
- EmployeeCollection;
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.
- PaymentInstrument;
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.
- PersonCollection;
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product;
+//CHECKSTYLE:ON (Maven checkstyle)
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntitySetTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntitySetTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntitySetTestITCase.java
index da32cfe..ef537ee 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntitySetTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntitySetTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java
index 10d9a03..7069d67 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java
@@ -1,24 +1,23 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4;
-import static org.apache.olingo.fit.proxy.v4.AbstractTestITCase.container;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -28,21 +27,23 @@ import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Collections;
import java.util.UUID;
+
import org.apache.commons.lang3.RandomUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.ext.proxy.EntityContainerFactory;
import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler;
+//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.
- PaymentInstrument;
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
+//CHECKSTYLE:ON (Maven checkstyle)
import org.junit.Test;
/**
@@ -104,8 +105,8 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
homeAddress.setPostalCode("65127");
customer.setHomeAddress(homeAddress);
- customer.setNumbers(Collections.<String>emptyList());
- customer.setEmails(Collections.<String>emptyList());
+ customer.setNumbers(Collections.<String> emptyList());
+ customer.setEmails(Collections.<String> emptyList());
customer.setCity("Pescara");
final Calendar birthday = Calendar.getInstance();
@@ -113,11 +114,11 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
birthday.set(1977, 8, 8);
customer.setBirthday(birthday);
- customer.setTimeBetweenLastTwoOrders(BigDecimal.valueOf(0.0000002));
-
+ customer.setTimeBetweenLastTwoOrders(BigDecimal.valueOf(0.0000002));
+
// 2. create order and set it to customer
final int orderId = RandomUtils.nextInt(400, 410);
-
+
Order order = getContainer().getOrders().newOrder();
order.setOrderID(orderId);
@@ -135,7 +136,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
customer = getContainer().getCustomers().get(977);
- //assertEquals(1, customer.getOrders().size());
+ // assertEquals(1, customer.getOrders().size());
int count = 0;
for (Order inside : customer.getOrders()) {
@@ -145,11 +146,11 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
}
assertEquals(1, count);
assertEquals(977, order.getCustomerForOrder().getPersonID(), 0);
-
+
// 4. delete customer and order
getContainer().getCustomers().delete(977);
getContainer().getOrders().delete(orderId);
-
+
getContainer().flush();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/FilterTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/FilterTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/FilterTestITCase.java
index 3eb135f..3b2d0b3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/FilterTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/FilterTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -25,12 +25,14 @@ import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+
import org.apache.olingo.ext.proxy.api.Filter;
import org.apache.olingo.ext.proxy.api.Search;
import org.apache.olingo.ext.proxy.api.Sort;
+//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.
- PersonCollection;
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection;
+//CHECKSTYLE:ON (Maven checkstyle)
import org.junit.Test;
public class FilterTestITCase extends AbstractTestITCase {
@@ -38,7 +40,7 @@ public class FilterTestITCase extends AbstractTestITCase {
@Test
public void filterOrderby() {
final Filter<Person, PersonCollection> filter = container.getPeople().createFilter().setFilter(
- containerFactory.getClient().getFilterFactory().lt("PersonID", 3));
+ containerFactory.getClient().getFilterFactory().lt("PersonID", 3));
// 1. check that result looks as expected
PersonCollection result = filter.getResult();
@@ -72,9 +74,9 @@ public class FilterTestITCase extends AbstractTestITCase {
@Test
public void search() {
final Search<Person, PersonCollection> search = container.getPeople().createSearch().setSearch(
- containerFactory.getClient().getSearchFactory().or(
- containerFactory.getClient().getSearchFactory().literal("Bob"),
- containerFactory.getClient().getSearchFactory().literal("Jill")));
+ containerFactory.getClient().getSearchFactory().or(
+ containerFactory.getClient().getSearchFactory().literal("Bob"),
+ containerFactory.getClient().getSearchFactory().literal("Jill")));
final PersonCollection result = search.getResult();
assertFalse(result.isEmpty());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/KeyAsSegmentTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/KeyAsSegmentTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/KeyAsSegmentTestITCase.java
index 54c0390..e681f00 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/KeyAsSegmentTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/KeyAsSegmentTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java
index e1df392..01ec7ba 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -32,7 +32,6 @@ import org.apache.commons.lang3.RandomStringUtils;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.ext.proxy.EntityContainerFactory;
-import org.apache.olingo.fit.proxy.v4.AbstractTestITCase;
import org.apache.olingo.fit.proxy.v4.demo.odatademo.DemoService;
import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalAuthEntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalAuthEntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalAuthEntityCreateTestITCase.java
index 1dd08b5..4a56853 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalAuthEntityCreateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalAuthEntityCreateTestITCase.java
@@ -1,29 +1,27 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4;
+import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.ext.proxy.EntityContainerFactory;
-
-import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
-import static org.apache.olingo.fit.proxy.v4.AbstractTestITCase.testAuthServiceRootURL;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
public class NonTransactionalAuthEntityCreateTestITCase extends EntityCreateTestITCase {
@@ -38,7 +36,7 @@ public class NonTransactionalAuthEntityCreateTestITCase extends EntityCreateTest
ecf = EntityContainerFactory.getV4(testAuthServiceRootURL, false);
ecf.getClient().getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
ecf.getClient().getConfiguration().
- setHttpClientFactory(new BasicAuthHttpClientFactory("odatajclient", "odatajclient"));
+ setHttpClientFactory(new BasicAuthHttpClientFactory("odatajclient", "odatajclient"));
}
return ecf;
}
@@ -49,5 +47,5 @@ public class NonTransactionalAuthEntityCreateTestITCase extends EntityCreateTest
ime = getContainerFactory().getEntityContainer(InMemoryEntities.class);
}
return ime;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityCreateTestITCase.java
index ac31cfe..8041486 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityCreateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityCreateTestITCase.java
@@ -1,27 +1,26 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4;
+import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.ext.proxy.EntityContainerFactory;
-
-import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
public class NonTransactionalEntityCreateTestITCase extends EntityCreateTestITCase {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityUpdateTestITCase.java
index 4b8c6e9..cfc3a4f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityUpdateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityUpdateTestITCase.java
@@ -1,27 +1,26 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4;
+import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.ext.proxy.EntityContainerFactory;
-
-import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
public class NonTransactionalEntityUpdateTestITCase extends EntityUpdateTestITCase {
[22/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java
index 71c8e7e..73eb378 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface MessageCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Message> {
+public interface MessageCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Message> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java
index 142f87c..9b857e6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java
@@ -1,74 +1,50 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.AbstractEntityKey;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class MessageKey extends AbstractEntityKey {
- private java.lang.String _fromUsername;
+ private static final long serialVersionUID = 1L;
+ private java.lang.String _fromUsername;
- @CompoundKeyElement(name = "FromUsername", position = 0)
- public java.lang.String getFromUsername() {
- return _fromUsername;
- }
+ @CompoundKeyElement(name = "FromUsername", position = 0)
+ public java.lang.String getFromUsername() {
+ return _fromUsername;
+ }
- public void setFromUsername(java.lang.String _fromUsername) {
- this._fromUsername = _fromUsername;
- }
+ public void setFromUsername(final java.lang.String _fromUsername) {
+ this._fromUsername = _fromUsername;
+ }
- private java.lang.Integer _messageId;
+ private java.lang.Integer _messageId;
- @CompoundKeyElement(name = "MessageId", position = 1)
- public java.lang.Integer getMessageId() {
- return _messageId;
- }
+ @CompoundKeyElement(name = "MessageId", position = 1)
+ public java.lang.Integer getMessageId() {
+ return _messageId;
+ }
- public void setMessageId(java.lang.Integer _messageId) {
- this._messageId = _messageId;
- }
+ public void setMessageId(final java.lang.Integer _messageId) {
+ this._messageId = _messageId;
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java
index 0f137e2..c6a0de3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java
@@ -1,191 +1,166 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Order",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Order
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getOrderId();
-
- void setOrderId(java.lang.Integer _orderId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerId",
- type = "Edm.Int32",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getCustomerId();
-
- void setCustomerId(java.lang.Integer _customerId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getConcurrency();
-
- void setConcurrency(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login getLogin();
-
- void setLogin(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Customer",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Customer",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer getCustomer();
-
- void setCustomer(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer _customer);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newConcurrency();
-
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
- type = "Edm.Int32")
- Annotatable getOrderIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerId",
- type = "Edm.Int32")
- Annotatable getCustomerIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Concurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
- Annotatable getConcurrencyAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
- Annotatable getLoginAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Customer",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
- Annotatable getCustomerAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Order
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getOrderId();
+
+ void setOrderId(java.lang.Integer _orderId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerId",
+ type = "Edm.Int32",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getCustomerId();
+
+ void setCustomerId(java.lang.Integer _customerId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo
+ getConcurrency();
+
+ void
+ setConcurrency(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Login",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login
+ getLogin();
+
+ void
+ setLogin(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Customer",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Customer",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer
+ getCustomer();
+
+ void
+ setCustomer(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer _customer);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo
+ newConcurrency();
+
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
+ type = "Edm.Int32")
+ Annotatable getOrderIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerId",
+ type = "Edm.Int32")
+ Annotatable getCustomerIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Concurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
+ Annotatable getConcurrencyAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getLoginAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Customer",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
+ Annotatable getCustomerAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java
index 04fb16f..44341f9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface OrderCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order> {
+public interface OrderCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
index 9259705..b46ab4a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
@@ -1,241 +1,212 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
@KeyRef(OrderLineKey.class)
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "OrderLine",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface OrderLine
- extends Annotatable,java.io.Serializable {
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderLineStream",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.io.InputStream getOrderLineStream();
-
- void setOrderLineStream(java.io.InputStream _orderLineStream);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getOrderId();
-
- void setOrderId(java.lang.Integer _orderId);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductId();
-
- void setProductId(java.lang.Integer _productId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getQuantity();
-
- void setQuantity(java.lang.Integer _quantity);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getConcurrencyToken();
-
- void setConcurrencyToken(java.lang.String _concurrencyToken);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Order",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Order",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order getOrder();
-
- void setOrder(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Product",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product getProduct();
-
- void setProduct(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderLineStream",
- type = "Edm.Stream")
- Annotatable getOrderLineStreamAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
- type = "Edm.Int32")
- Annotatable getOrderIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
- type = "Edm.Int32")
- Annotatable getProductIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Quantity",
- type = "Edm.Int32")
- Annotatable getQuantityAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
- type = "Edm.String")
- Annotatable getConcurrencyTokenAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Order",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
- Annotatable getOrderAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
- Annotatable getProductAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface OrderLine
+ extends Annotatable, java.io.Serializable {
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderLineStream",
+ type = "Edm.Stream",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.io.InputStream getOrderLineStream();
+
+ void setOrderLineStream(java.io.InputStream _orderLineStream);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getOrderId();
+
+ void setOrderId(java.lang.Integer _orderId);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductId();
+
+ void setProductId(java.lang.Integer _productId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getQuantity();
+
+ void setQuantity(java.lang.Integer _quantity);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getConcurrencyToken();
+
+ void setConcurrencyToken(java.lang.String _concurrencyToken);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Order",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Order",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order
+ getOrder();
+
+ void
+ setOrder(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Product",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product
+ getProduct();
+
+ void
+ setProduct(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderLineStream",
+ type = "Edm.Stream")
+ Annotatable getOrderLineStreamAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
+ type = "Edm.Int32")
+ Annotatable getOrderIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Quantity",
+ type = "Edm.Int32")
+ Annotatable getQuantityAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
+ type = "Edm.String")
+ Annotatable getConcurrencyTokenAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Order",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
+ Annotatable getOrderAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getProductAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java
index 56daf2b..f68e463 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface OrderLineCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine> {
+public interface OrderLineCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java
index 6363e84..f43b356 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java
@@ -1,74 +1,50 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.AbstractEntityKey;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class OrderLineKey extends AbstractEntityKey {
- private java.lang.Integer _orderId;
+ private static final long serialVersionUID = 1L;
+ private java.lang.Integer _orderId;
- @CompoundKeyElement(name = "OrderId", position = 0)
- public java.lang.Integer getOrderId() {
- return _orderId;
- }
+ @CompoundKeyElement(name = "OrderId", position = 0)
+ public java.lang.Integer getOrderId() {
+ return _orderId;
+ }
- public void setOrderId(java.lang.Integer _orderId) {
- this._orderId = _orderId;
- }
+ public void setOrderId(final java.lang.Integer _orderId) {
+ this._orderId = _orderId;
+ }
- private java.lang.Integer _productId;
+ private java.lang.Integer _productId;
- @CompoundKeyElement(name = "ProductId", position = 1)
- public java.lang.Integer getProductId() {
- return _productId;
- }
+ @CompoundKeyElement(name = "ProductId", position = 1)
+ public java.lang.Integer getProductId() {
+ return _productId;
+ }
- public void setProductId(java.lang.Integer _productId) {
- this._productId = _productId;
- }
+ public void setProductId(final java.lang.Integer _productId) {
+ this._productId = _productId;
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java
index 9b1e61f..2144c24 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java
@@ -1,227 +1,192 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "PageView",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface PageView
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageViewId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPageViewId();
-
- void setPageViewId(java.lang.Integer _pageViewId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Username",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getUsername();
-
- void setUsername(java.lang.String _username);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Viewed",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getViewed();
-
- void setViewed(java.util.Calendar _viewed);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TimeSpentOnPage",
- type = "Edm.Time",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.math.BigDecimal getTimeSpentOnPage();
-
- void setTimeSpentOnPage(java.math.BigDecimal _timeSpentOnPage);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageUrl",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getPageUrl();
-
- void setPageUrl(java.lang.String _pageUrl);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login getLogin();
-
- void setLogin(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PageViewId",
- type = "Edm.Int32")
- Annotatable getPageViewIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Username",
- type = "Edm.String")
- Annotatable getUsernameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Viewed",
- type = "Edm.DateTimeOffset")
- Annotatable getViewedAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TimeSpentOnPage",
- type = "Edm.Time")
- Annotatable getTimeSpentOnPageAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PageUrl",
- type = "Edm.String")
- Annotatable getPageUrlAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
- Annotatable getLoginAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface PageView
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageViewId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPageViewId();
+
+ void setPageViewId(java.lang.Integer _pageViewId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Username",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getUsername();
+
+ void setUsername(java.lang.String _username);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Viewed",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getViewed();
+
+ void setViewed(java.util.Calendar _viewed);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TimeSpentOnPage",
+ type = "Edm.Time",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.math.BigDecimal getTimeSpentOnPage();
+
+ void setTimeSpentOnPage(java.math.BigDecimal _timeSpentOnPage);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageUrl",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getPageUrl();
+
+ void setPageUrl(java.lang.String _pageUrl);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Login",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login
+ getLogin();
+
+ void
+ setLogin(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PageViewId",
+ type = "Edm.Int32")
+ Annotatable getPageViewIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Username",
+ type = "Edm.String")
+ Annotatable getUsernameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Viewed",
+ type = "Edm.DateTimeOffset")
+ Annotatable getViewedAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TimeSpentOnPage",
+ type = "Edm.Time")
+ Annotatable getTimeSpentOnPageAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PageUrl",
+ type = "Edm.String")
+ Annotatable getPageUrlAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getLoginAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java
index 2f0aa84..2b79136 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface PageViewCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView> {
+public interface PageViewCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java
index 3430a90..a9dc483 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java
@@ -1,146 +1,114 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Person",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Person
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPersonId();
-
- void setPersonId(java.lang.Integer _personId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonMetadata",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "PersonMetadata",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection getPersonMetadata();
-
- void setPersonMetadata(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
- type = "Edm.Int32")
- Annotatable getPersonIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonMetadata",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata")
- Annotatable getPersonMetadataAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Person
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPersonId();
+
+ void setPersonId(java.lang.Integer _personId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonMetadata",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "PersonMetadata",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection
+ getPersonMetadata();
+
+ void
+ setPersonMetadata(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
+ type = "Edm.Int32")
+ Annotatable getPersonIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonMetadata",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata")
+ Annotatable getPersonMetadataAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java
index 79b80ea..5c02188 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface PersonCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person> {
+public interface PersonCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person> {
Object getAnnotation(Class<? extends AbstractTerm> term);
[12/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java
index a9b4ead..bb4fae7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java
@@ -1,292 +1,276 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.ext.proxy.api.annotations.Key;
+import org.apache.olingo.ext.proxy.api.annotations.Parameter;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Company",
- openType = true,
- hasStream = false,
- isAbstract = false)
-public interface Company
- extends Annotatable,AbstractOpenType {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CompanyID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getCompanyID();
-
- void setCompanyID(java.lang.Integer _companyID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CompanyCategory",
- type = "Microsoft.Test.OData.Services.ODataWCFService.CompanyCategory",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory getCompanyCategory();
-
- void setCompanyCategory(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory _companyCategory);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Revenue",
- type = "Edm.Int64",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Long getRevenue();
-
- void setRevenue(java.lang.Long _revenue);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Address",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address getAddress();
-
- void setAddress(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _address);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Employees",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Employee",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "Employees",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection getEmployees();
-
- void setEmployees(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection _employees);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "VipCustomer",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Customer",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "VipCustomer",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer getVipCustomer();
-
- void setVipCustomer(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer _vipCustomer);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Departments",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Department",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "Departments",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection getDepartments();
-
- void setDepartments(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection _departments);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "CoreDepartment",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Department",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "Departments",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department getCoreDepartment();
-
- void setCoreDepartment(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department _coreDepartment);
-
-
- Operations operations();
-
- interface Operations {
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetEmployeesCount",
- type = OperationType.FUNCTION,
- isComposable = false,
- returnType = "Edm.Int32")
- java.lang.Integer getEmployeesCount(
- );
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "IncreaseRevenue",
- type = OperationType.ACTION,
- returnType = "Edm.Int64")
- java.lang.Long increaseRevenue(
- @Parameter(name = "IncreaseValue", type = "Edm.Int64", nullable = true) java.lang.Long increaseValue
- );
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newAddress();
-
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CompanyID",
- type = "Edm.Int32")
- Annotatable getCompanyIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CompanyCategory",
- type = "Microsoft.Test.OData.Services.ODataWCFService.CompanyCategory")
- Annotatable getCompanyCategoryAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Revenue",
- type = "Edm.Int64")
- Annotatable getRevenueAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Address",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
- Annotatable getAddressAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Employees",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Employee")
- Annotatable getEmployeesAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "VipCustomer",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Customer")
- Annotatable getVipCustomerAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Departments",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Department")
- Annotatable getDepartmentsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "CoreDepartment",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Department")
- Annotatable getCoreDepartmentAnnotations();
- }
+ openType = true,
+ hasStream = false,
+ isAbstract = false)
+public interface Company
+ extends Annotatable, AbstractOpenType {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CompanyID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getCompanyID();
+
+ void setCompanyID(java.lang.Integer _companyID);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CompanyCategory",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.CompanyCategory",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory
+ getCompanyCategory();
+
+ void
+ setCompanyCategory(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory _companyCategory);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Revenue",
+ type = "Edm.Int64",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Long getRevenue();
+
+ void setRevenue(java.lang.Long _revenue);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Address",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address getAddress();
+
+ void
+ setAddress(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _address);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Employees",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Employee",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "Employees",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection
+ getEmployees();
+
+ void
+ setEmployees(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection _employees);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "VipCustomer",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Customer",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "VipCustomer",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer
+ getVipCustomer();
+
+ void
+ setVipCustomer(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer _vipCustomer);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Departments",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Department",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "Departments",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection
+ getDepartments();
+
+ void
+ setDepartments(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection _departments);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "CoreDepartment",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Department",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "Departments",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department
+ getCoreDepartment();
+
+ void
+ setCoreDepartment(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department _coreDepartment);
+
+ Operations operations();
+
+ interface Operations {
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetEmployeesCount",
+ type = OperationType.FUNCTION,
+ isComposable = false,
+ returnType = "Edm.Int32")
+ java.lang.Integer getEmployeesCount(
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "IncreaseRevenue",
+ type = OperationType.ACTION,
+ returnType = "Edm.Int64")
+ java.lang.Long increaseRevenue(
+ @Parameter(name = "IncreaseValue", type = "Edm.Int64", nullable = true) java.lang.Long increaseValue
+ );
+
+ }
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address
+ newAddress();
+
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CompanyID",
+ type = "Edm.Int32")
+ Annotatable getCompanyIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CompanyCategory",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.CompanyCategory")
+ Annotatable getCompanyCategoryAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Revenue",
+ type = "Edm.Int64")
+ Annotatable getRevenueAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Address",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
+ Annotatable getAddressAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Employees",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Employee")
+ Annotatable getEmployeesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "VipCustomer",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Customer")
+ Annotatable getVipCustomerAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Departments",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Department")
+ Annotatable getDepartmentsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "CoreDepartment",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Department")
+ Annotatable getCoreDepartmentAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java
index 071eae6..d16f37f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java
@@ -1,158 +1,134 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "CompanyAddress",
- isOpenType = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.ODataWCFService.Address")
-public interface CompanyAddress
- extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address,java.io.Serializable {
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.String getStreet();
-
- void setStreet(java.lang.String _street);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.String getCity();
-
- void setCity(java.lang.String _city);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PostalCode",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.String getPostalCode();
-
- void setPostalCode(java.lang.String _postalCode);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CompanyName",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.String getCompanyName();
-
- void setCompanyName(java.lang.String _companyName);
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address.ComplexFactory{
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Street",
- type = "Edm.String")
- Annotatable getStreetAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "City",
- type = "Edm.String")
- Annotatable getCityAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PostalCode",
- type = "Edm.String")
- Annotatable getPostalCodeAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CompanyName",
- type = "Edm.String")
- Annotatable getCompanyNameAnnotations();
-
-
- }
-
+ isOpenType = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.ODataWCFService.Address")
+public interface CompanyAddress
+ extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address,
+ java.io.Serializable {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getStreet();
+
+ @Override
+ void setStreet(java.lang.String _street);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getCity();
+
+ @Override
+ void setCity(java.lang.String _city);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PostalCode",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getPostalCode();
+
+ @Override
+ void setPostalCode(java.lang.String _postalCode);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CompanyName",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getCompanyName();
+
+ void setCompanyName(java.lang.String _companyName);
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory
+ extends
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address.ComplexFactory {}
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations
+ extends
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Street",
+ type = "Edm.String")
+ Annotatable getStreetAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "City",
+ type = "Edm.String")
+ Annotatable getCityAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PostalCode",
+ type = "Edm.String")
+ Annotatable getPostalCodeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CompanyName",
+ type = "Edm.String")
+ Annotatable getCompanyNameAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java
index 8845b92..d77c1bb 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java
@@ -1,46 +1,43 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EnumType;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EnumType(name = "CompanyCategory",
- underlyingType = EdmPrimitiveTypeKind.Int32,
- isFlags = false)
+ underlyingType = EdmPrimitiveTypeKind.Int32,
+ isFlags = false)
public enum CompanyCategory {
- IT(0),
- Communication(1),
- Electronics(2),
- Others(4);
+ IT(0),
+ Communication(1),
+ Electronics(2),
+ Others(4);
+
+ private java.lang.Integer value;
- private java.lang.Integer value;
-
- public java.lang.Integer getValue(){
- return this.value;
- }
+ public java.lang.Integer getValue() {
+ return value;
+ }
- private CompanyCategory(final java.lang.Integer value){
- this.value=value;
- }
+ private CompanyCategory(final java.lang.Integer value) {
+ this.value = value;
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java
index 888bd00..441b9b9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface CompanyCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company> {
+public interface CompanyCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java
index 694d2bc..6760c90 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java
@@ -1,351 +1,345 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "CreditCardPI",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument")
-public interface CreditCardPI
- extends Annotatable,org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PaymentInstrumentID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPaymentInstrumentID();
-
- void setPaymentInstrumentID(java.lang.Integer _paymentInstrumentID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FriendlyName",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getFriendlyName();
-
- void setFriendlyName(java.lang.String _friendlyName);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CreatedDate",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getCreatedDate();
-
- void setCreatedDate(java.util.Calendar _createdDate);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CardNumber",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getCardNumber();
-
- void setCardNumber(java.lang.String _cardNumber);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CVV",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getCVV();
-
- void setCVV(java.lang.String _cVV);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HolderName",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getHolderName();
-
- void setHolderName(java.lang.String _holderName);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Balance",
- type = "Edm.Double",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Double getBalance();
-
- void setBalance(java.lang.Double _balance);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ExperationDate",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getExperationDate();
-
- void setExperationDate(java.util.Calendar _experationDate);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "TheStoredPI",
- type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "StoredPIs",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI getTheStoredPI();
-
- void setTheStoredPI(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI _theStoredPI);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "BackupStoredPI",
- type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "StoredPIs",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI getBackupStoredPI();
-
- void setBackupStoredPI(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI _backupStoredPI);
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.ComplexFactory{
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PaymentInstrumentID",
- type = "Edm.Int32")
- Annotatable getPaymentInstrumentIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FriendlyName",
- type = "Edm.String")
- Annotatable getFriendlyNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CreatedDate",
- type = "Edm.DateTimeOffset")
- Annotatable getCreatedDateAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CardNumber",
- type = "Edm.String")
- Annotatable getCardNumberAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CVV",
- type = "Edm.String")
- Annotatable getCVVAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HolderName",
- type = "Edm.String")
- Annotatable getHolderNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Balance",
- type = "Edm.Double")
- Annotatable getBalanceAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ExperationDate",
- type = "Edm.DateTimeOffset")
- Annotatable getExperationDateAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "TheStoredPI",
- type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI")
- Annotatable getTheStoredPIAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "BillingStatements",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Statement")
- Annotatable getBillingStatementsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "BackupStoredPI",
- type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI")
- Annotatable getBackupStoredPIAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "CreditRecords",
- type = "Microsoft.Test.OData.Services.ODataWCFService.CreditRecord")
- Annotatable getCreditRecordsAnnotations();
- }
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "CreditRecords",
- type = "Microsoft.Test.OData.Services.ODataWCFService.CreditRecord",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "",
- targetEntitySet = "",
- containsTarget = true)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI.CreditRecords getCreditRecords();
- void setCreditRecords(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI.CreditRecords _creditRecords);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "CreditRecords", contained = true)
- interface CreditRecords
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecord, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecordCollection> {
-
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecord newCreditRecord();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecordCollection newCreditRecordCollection();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument")
+public interface CreditCardPI
+ extends Annotatable,
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument {
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PaymentInstrumentID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPaymentInstrumentID();
+
+ @Override
+ void setPaymentInstrumentID(java.lang.Integer _paymentInstrumentID);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FriendlyName",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getFriendlyName();
+
+ @Override
+ void setFriendlyName(java.lang.String _friendlyName);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CreatedDate",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getCreatedDate();
+
+ @Override
+ void setCreatedDate(java.util.Calendar _createdDate);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CardNumber",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getCardNumber();
+
+ void setCardNumber(java.lang.String _cardNumber);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CVV",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getCVV();
+
+ void setCVV(java.lang.String _cVV);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HolderName",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getHolderName();
+
+ void setHolderName(java.lang.String _holderName);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Balance",
+ type = "Edm.Double",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Double getBalance();
+
+ void setBalance(java.lang.Double _balance);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ExperationDate",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getExperationDate();
+
+ void setExperationDate(java.util.Calendar _experationDate);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "TheStoredPI",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "StoredPIs",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI
+ getTheStoredPI();
+
+ @Override
+ void
+ setTheStoredPI(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI _theStoredPI);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "BackupStoredPI",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "StoredPIs",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI
+ getBackupStoredPI();
+
+ @Override
+ void
+ setBackupStoredPI(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI _backupStoredPI);
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory
+ extends
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.ComplexFactory {}
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations
+ extends
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PaymentInstrumentID",
+ type = "Edm.Int32")
+ Annotatable getPaymentInstrumentIDAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FriendlyName",
+ type = "Edm.String")
+ Annotatable getFriendlyNameAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CreatedDate",
+ type = "Edm.DateTimeOffset")
+ Annotatable getCreatedDateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CardNumber",
+ type = "Edm.String")
+ Annotatable getCardNumberAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CVV",
+ type = "Edm.String")
+ Annotatable getCVVAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HolderName",
+ type = "Edm.String")
+ Annotatable getHolderNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Balance",
+ type = "Edm.Double")
+ Annotatable getBalanceAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ExperationDate",
+ type = "Edm.DateTimeOffset")
+ Annotatable getExperationDateAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "TheStoredPI",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI")
+ Annotatable getTheStoredPIAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "BillingStatements",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Statement")
+ Annotatable getBillingStatementsAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "BackupStoredPI",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI")
+ Annotatable getBackupStoredPIAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "CreditRecords",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.CreditRecord")
+ Annotatable getCreditRecordsAnnotations();
+ }
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "CreditRecords",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.CreditRecord",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "",
+ targetEntitySet = "",
+ containsTarget = true)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI.CreditRecords
+ getCreditRecords();
+
+ void
+ setCreditRecords(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI.CreditRecords _creditRecords);
+
+ @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "CreditRecords", contained = true)
+ interface CreditRecords
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecord, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecordCollection> {
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecord
+ newCreditRecord();
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecordCollection
+ newCreditRecordCollection();
}
+
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java
index dd88a14..2a18f30 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface CreditCardPICollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI> {
+public interface CreditCardPICollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java
index 1774c41..fc93a89 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java
@@ -1,186 +1,150 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "CreditRecord",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface CreditRecord
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CreditRecordID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getCreditRecordID();
-
- void setCreditRecordID(java.lang.Integer _creditRecordID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "IsGood",
- type = "Edm.Boolean",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Boolean getIsGood();
-
- void setIsGood(java.lang.Boolean _isGood);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Reason",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getReason();
-
- void setReason(java.lang.String _reason);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CreatedDate",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getCreatedDate();
-
- void setCreatedDate(java.util.Calendar _createdDate);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CreditRecordID",
- type = "Edm.Int32")
- Annotatable getCreditRecordIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "IsGood",
- type = "Edm.Boolean")
- Annotatable getIsGoodAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Reason",
- type = "Edm.String")
- Annotatable getReasonAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CreatedDate",
- type = "Edm.DateTimeOffset")
- Annotatable getCreatedDateAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface CreditRecord
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CreditRecordID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getCreditRecordID();
+
+ void setCreditRecordID(java.lang.Integer _creditRecordID);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "IsGood",
+ type = "Edm.Boolean",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Boolean getIsGood();
+
+ void setIsGood(java.lang.Boolean _isGood);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Reason",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getReason();
+
+ void setReason(java.lang.String _reason);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CreatedDate",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getCreatedDate();
+
+ void setCreatedDate(java.util.Calendar _createdDate);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CreditRecordID",
+ type = "Edm.Int32")
+ Annotatable getCreditRecordIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "IsGood",
+ type = "Edm.Boolean")
+ Annotatable getIsGoodAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Reason",
+ type = "Edm.String")
+ Annotatable getReasonAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CreatedDate",
+ type = "Edm.DateTimeOffset")
+ Annotatable getCreatedDateAnnotations();
+
+ }
}
[34/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
index 55427ee..bfd9fe6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
@@ -1,354 +1,355 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "SpecialEmployee",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee")
-public interface SpecialEmployee
- extends Annotatable,org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPersonId();
-
- void setPersonId(java.lang.Integer _personId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManagersPersonId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getManagersPersonId();
-
- void setManagersPersonId(java.lang.Integer _managersPersonId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Salary",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getSalary();
-
- void setSalary(java.lang.Integer _salary);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Title",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getTitle();
-
- void setTitle(java.lang.String _title);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CarsVIN",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getCarsVIN();
-
- void setCarsVIN(java.lang.Integer _carsVIN);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Bonus",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getBonus();
-
- void setBonus(java.lang.Integer _bonus);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "IsFullyVested",
- type = "Edm.Boolean",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Boolean getIsFullyVested();
-
- void setIsFullyVested(java.lang.Boolean _isFullyVested);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonMetadata",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "PersonMetadata",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection getPersonMetadata();
-
- void setPersonMetadata(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Manager",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Person",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee getManager();
-
- void setManager(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee _manager);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Car",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Car",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Car getCar();
-
- void setCar(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Car _car);
-
-
- @Override
- Operations operations();
-
- interface Operations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee.Operations{
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "UpdatePersonInfo",
- type = OperationType.ACTION)
- void updatePersonInfo(
- );
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "IncreaseEmployeeSalary",
- type = OperationType.ACTION,
- returnType = "Edm.Int32")
- java.lang.Integer increaseEmployeeSalary(
- );
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee.ComplexFactory{
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
- type = "Edm.Int32")
- Annotatable getPersonIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManagersPersonId",
- type = "Edm.Int32")
- Annotatable getManagersPersonIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Salary",
- type = "Edm.Int32")
- Annotatable getSalaryAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Title",
- type = "Edm.String")
- Annotatable getTitleAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CarsVIN",
- type = "Edm.Int32")
- Annotatable getCarsVINAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Bonus",
- type = "Edm.Int32")
- Annotatable getBonusAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "IsFullyVested",
- type = "Edm.Boolean")
- Annotatable getIsFullyVestedAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonMetadata",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata")
- Annotatable getPersonMetadataAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Manager",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee")
- Annotatable getManagerAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Car",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Car")
- Annotatable getCarAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee")
+public interface SpecialEmployee
+ extends Annotatable,
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee {
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPersonId();
+
+ @Override
+ void setPersonId(java.lang.Integer _personId);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ @Override
+ void setName(java.lang.String _name);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManagersPersonId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getManagersPersonId();
+
+ @Override
+ void setManagersPersonId(java.lang.Integer _managersPersonId);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Salary",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getSalary();
+
+ @Override
+ void setSalary(java.lang.Integer _salary);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Title",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getTitle();
+
+ @Override
+ void setTitle(java.lang.String _title);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CarsVIN",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getCarsVIN();
+
+ void setCarsVIN(java.lang.Integer _carsVIN);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Bonus",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getBonus();
+
+ void setBonus(java.lang.Integer _bonus);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "IsFullyVested",
+ type = "Edm.Boolean",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Boolean getIsFullyVested();
+
+ void setIsFullyVested(java.lang.Boolean _isFullyVested);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonMetadata",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "PersonMetadata",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection
+ getPersonMetadata();
+
+ @Override
+ void
+ setPersonMetadata(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Manager",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Person",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee
+ getManager();
+
+ @Override
+ void
+ setManager(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee _manager);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Car",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Car",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Car
+ getCar();
+
+ void
+ setCar(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Car _car);
+
+ @Override
+ Operations operations();
+
+ interface Operations
+ extends
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee.Operations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "UpdatePersonInfo",
+ type = OperationType.ACTION)
+ void updatePersonInfo(
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "IncreaseEmployeeSalary",
+ type = OperationType.ACTION,
+ returnType = "Edm.Int32")
+ java.lang.Integer increaseEmployeeSalary(
+ );
+
+ }
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory
+ extends
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee.ComplexFactory {}
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations
+ extends
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
+ type = "Edm.Int32")
+ Annotatable getPersonIdAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManagersPersonId",
+ type = "Edm.Int32")
+ Annotatable getManagersPersonIdAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Salary",
+ type = "Edm.Int32")
+ Annotatable getSalaryAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Title",
+ type = "Edm.String")
+ Annotatable getTitleAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CarsVIN",
+ type = "Edm.Int32")
+ Annotatable getCarsVINAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Bonus",
+ type = "Edm.Int32")
+ Annotatable getBonusAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "IsFullyVested",
+ type = "Edm.Boolean")
+ Annotatable getIsFullyVestedAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonMetadata",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata")
+ Annotatable getPersonMetadataAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Manager",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee")
+ Annotatable getManagerAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Car",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Car")
+ Annotatable getCarAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java
index 2fd0e5a..cb10713 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java
@@ -1,62 +1,46 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
import org.apache.olingo.ext.proxy.api.OperationType;
import org.apache.olingo.ext.proxy.api.annotations.Operation;
import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface SpecialEmployeeCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee> {
- Operations operations();
+public interface SpecialEmployeeCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee> {
+ Operations operations();
- public interface Operations {
+ public interface Operations {
-
- @Operation(name = "IncreaseSalaries",
- type = OperationType.ACTION)
- void increaseSalaries(
- @Parameter(name = "n", type = "Edm.Int32", nullable = false) java.lang.Integer n
- );
+ @Operation(name = "IncreaseSalaries",
+ type = OperationType.ACTION)
+ void increaseSalaries(
+ @Parameter(name = "n", type = "Edm.Int32", nullable = false) java.lang.Integer n
+ );
- }
+ }
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/package-info.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/package-info.java
index 185d49a..31f8ffd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/package-info.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/package-info.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java
index 117a28e..c7d7960 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java
@@ -1,73 +1,49 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.opentype.microsoft.test.odata.services.opentypesservicev3;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.PersistenceManager;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.*;
-import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV3")
@org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "DefaultContainer",
- namespace = "Microsoft.Test.OData.Services.OpenTypesServiceV3",
- isDefaultEntityContainer = true)
+ namespace = "Microsoft.Test.OData.Services.OpenTypesServiceV3",
+ isDefaultEntityContainer = true)
public interface DefaultContainer extends PersistenceManager {
- Row getRow();
- RowIndex getRowIndex();
-
-
+ Row getRow();
+ RowIndex getRowIndex();
Operations operations();
public interface Operations {
-
- }
- ComplexFactory complexFactory();
+ }
+
+ ComplexFactory complexFactory();
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactDetails",
- type = "Microsoft.Test.OData.Services.OpenTypesServiceV3.ContactDetails")
- org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.ContactDetails newContactDetails();
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactDetails",
+ type = "Microsoft.Test.OData.Services.OpenTypesServiceV3.ContactDetails")
+ org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.ContactDetails
+ newContactDetails();
- }
}
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/Row.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/Row.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/Row.java
index dfff0a7..53265f1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/Row.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/Row.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,35 +20,20 @@
package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.*;
-import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.*;
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Row")
+public interface Row
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.Row, java.util.UUID, org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowCollection> {
+ org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.Row newRow();
-@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Row")
-public interface Row
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.Row, java.util.UUID, org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowCollection> {
+ org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowCollection
+ newRowCollection();
+
+ org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.IndexedRow
+ newIndexedRow();
- org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.Row newRow();
- org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowCollection newRowCollection();
- org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.IndexedRow newIndexedRow();
- org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.IndexedRowCollection newIndexedRowCollection();
+ org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.IndexedRowCollection
+ newIndexedRowCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/RowIndex.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/RowIndex.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/RowIndex.java
index ce72303..4a2458c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/RowIndex.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/RowIndex.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,14 @@
package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.*;
-import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "RowIndex")
-public interface RowIndex
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowIndex, java.lang.Integer, org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowIndexCollection> {
+public interface RowIndex
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowIndex, java.lang.Integer, org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowIndexCollection> {
+
+ org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowIndex newRowIndex();
- org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowIndex newRowIndex();
- org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowIndexCollection newRowIndexCollection();
+ org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowIndexCollection
+ newRowIndexCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/package-info.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/package-info.java
index e2b36cc..b90cff9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/package-info.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/package-info.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/ContactDetails.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/ContactDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/ContactDetails.java
index 158cfef..0b8c5f1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/ContactDetails.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/ContactDetails.java
@@ -1,145 +1,92 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.*;
-import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV3")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ContactDetails")
-public interface ContactDetails
+public interface ContactDetails
extends java.io.Serializable {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstContacted", type = "Edm.Binary", nullable = true)
+ byte[] getFirstContacted();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstContacted", type = "Edm.Binary", nullable = true)
- byte[] getFirstContacted();
-
- void setFirstContacted(byte[] _firstContacted);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastContacted", type = "Edm.DateTimeOffset", nullable = false)
- java.util.Calendar getLastContacted();
-
- void setLastContacted(java.util.Calendar _lastContacted);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Contacted", type = "Edm.DateTime", nullable = false)
- java.util.Calendar getContacted();
-
- void setContacted(java.util.Calendar _contacted);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GUID", type = "Edm.Guid", nullable = false)
- java.util.UUID getGUID();
-
- void setGUID(java.util.UUID _gUID);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PreferedContactTime", type = "Edm.Time", nullable = false)
- java.math.BigDecimal getPreferedContactTime();
-
- void setPreferedContactTime(java.math.BigDecimal _preferedContactTime);
+ void setFirstContacted(byte[] _firstContacted);
-
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastContacted", type = "Edm.DateTimeOffset",
+ nullable = false)
+ java.util.Calendar getLastContacted();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Byte", type = "Edm.Byte", nullable = false)
- java.lang.Short getByte();
+ void setLastContacted(java.util.Calendar _lastContacted);
- void setByte(java.lang.Short _byte);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Contacted", type = "Edm.DateTime", nullable = false)
+ java.util.Calendar getContacted();
-
+ void setContacted(java.util.Calendar _contacted);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SignedByte", type = "Edm.SByte", nullable = false)
- java.lang.Byte getSignedByte();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GUID", type = "Edm.Guid", nullable = false)
+ java.util.UUID getGUID();
- void setSignedByte(java.lang.Byte _signedByte);
+ void setGUID(java.util.UUID _gUID);
-
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PreferedContactTime", type = "Edm.Time",
+ nullable = false)
+ java.math.BigDecimal getPreferedContactTime();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Double", type = "Edm.Double", nullable = false)
- java.lang.Double getDouble();
+ void setPreferedContactTime(java.math.BigDecimal _preferedContactTime);
- void setDouble(java.lang.Double _double);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Byte", type = "Edm.Byte", nullable = false)
+ java.lang.Short getByte();
-
+ void setByte(java.lang.Short _byte);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Single", type = "Edm.Single", nullable = false)
- java.lang.Float getSingle();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SignedByte", type = "Edm.SByte", nullable = false)
+ java.lang.Byte getSignedByte();
- void setSingle(java.lang.Float _single);
+ void setSignedByte(java.lang.Byte _signedByte);
-
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Double", type = "Edm.Double", nullable = false)
+ java.lang.Double getDouble();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Short", type = "Edm.Int16", nullable = false)
- java.lang.Short getShort();
+ void setDouble(java.lang.Double _double);
- void setShort(java.lang.Short _short);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Single", type = "Edm.Single", nullable = false)
+ java.lang.Float getSingle();
-
+ void setSingle(java.lang.Float _single);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int", type = "Edm.Int32", nullable = false)
- java.lang.Integer getInt();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Short", type = "Edm.Int16", nullable = false)
+ java.lang.Short getShort();
- void setInt(java.lang.Integer _int);
+ void setShort(java.lang.Short _short);
-
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int", type = "Edm.Int32", nullable = false)
+ java.lang.Integer getInt();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Long", type = "Edm.Int64", nullable = false)
- java.lang.Long getLong();
+ void setInt(java.lang.Integer _int);
- void setLong(java.lang.Long _long);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Long", type = "Edm.Int64", nullable = false)
+ java.lang.Long getLong();
-
+ void setLong(java.lang.Long _long);
- ComplexFactory factory();
+ ComplexFactory factory();
- interface ComplexFactory {
- }
+ interface ComplexFactory {}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRow.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRow.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRow.java
index 635e3d9..fac5b0e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRow.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRow.java
@@ -1,106 +1,81 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.*;
-import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV3")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "IndexedRow",
- openType = true,
- hasStream = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.OpenTypesServiceV3.Row")
-public interface IndexedRow
- extends Annotatable,org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.Row {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Guid",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.UUID getId();
-
- void setId(java.util.UUID _id);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.Row.ComplexFactory{
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.Row.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Guid")
- Annotatable getIdAnnotations();
-
-
- }
+ openType = true,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.OpenTypesServiceV3.Row")
+public interface IndexedRow
+ extends Annotatable,
+ org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.Row {
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Guid",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.UUID getId();
+
+ @Override
+ void setId(java.util.UUID _id);
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory extends
+ org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.Row.ComplexFactory {}
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations extends
+ org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.Row.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Guid")
+ Annotatable getIdAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRowCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRowCollection.java
index 3d97e42..67da7b7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRowCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRowCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.*;
-import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface IndexedRowCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.IndexedRow> {
+public interface IndexedRowCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.IndexedRow> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/Row.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/Row.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/Row.java
index 2400b16..b2e0259 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/Row.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/Row.java
@@ -1,105 +1,73 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.*;
-import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV3")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Row",
- openType = true,
- hasStream = false,
- isAbstract = false)
-public interface Row
- extends Annotatable,AbstractOpenType {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Guid",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.UUID getId();
-
- void setId(java.util.UUID _id);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Guid")
- Annotatable getIdAnnotations();
-
-
- }
+ openType = true,
+ hasStream = false,
+ isAbstract = false)
+public interface Row
+ extends Annotatable, AbstractOpenType {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Guid",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.UUID getId();
+
+ void setId(java.util.UUID _id);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Guid")
+ Annotatable getIdAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowCollection.java
index bb08b6a..94570f6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.*;
-import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface RowCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.Row> {
+public interface RowCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.Row> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndex.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndex.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndex.java
index 8089faf..35e2f2f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndex.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndex.java
@@ -1,119 +1,89 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.*;
-import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV3")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "RowIndex",
- openType = true,
- hasStream = false,
- isAbstract = false)
-public interface RowIndex
- extends Annotatable,AbstractOpenType {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getId();
-
- void setId(java.lang.Integer _id);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Rows",
- type = "Microsoft.Test.OData.Services.OpenTypesServiceV3.IndexedRow",
- targetSchema = "Microsoft.Test.OData.Services.OpenTypesServiceV3",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Row",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.IndexedRowCollection getRows();
-
- void setRows(org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.IndexedRowCollection _rows);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Int32")
- Annotatable getIdAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Rows",
- type = "Microsoft.Test.OData.Services.OpenTypesServiceV3.IndexedRow")
- Annotatable getRowsAnnotations();
- }
+ openType = true,
+ hasStream = false,
+ isAbstract = false)
+public interface RowIndex
+ extends Annotatable, AbstractOpenType {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getId();
+
+ void setId(java.lang.Integer _id);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Rows",
+ type = "Microsoft.Test.OData.Services.OpenTypesServiceV3.IndexedRow",
+ targetSchema = "Microsoft.Test.OData.Services.OpenTypesServiceV3",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Row",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.IndexedRowCollection
+ getRows();
+
+ void
+ setRows(
+ org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.IndexedRowCollection _rows);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Rows",
+ type = "Microsoft.Test.OData.Services.OpenTypesServiceV3.IndexedRow")
+ Annotatable getRowsAnnotations();
+ }
}
[37/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java
index 3592230..53a966a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface MessageCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Message> {
+public interface MessageCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Message> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java
index ade91b2..c698658 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java
@@ -1,74 +1,50 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.AbstractEntityKey;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class MessageKey extends AbstractEntityKey {
- private java.lang.String _fromUsername;
+ private static final long serialVersionUID = 1L;
+ private java.lang.String _fromUsername;
- @CompoundKeyElement(name = "FromUsername", position = 0)
- public java.lang.String getFromUsername() {
- return _fromUsername;
- }
+ @CompoundKeyElement(name = "FromUsername", position = 0)
+ public java.lang.String getFromUsername() {
+ return _fromUsername;
+ }
- public void setFromUsername(java.lang.String _fromUsername) {
- this._fromUsername = _fromUsername;
- }
+ public void setFromUsername(final java.lang.String _fromUsername) {
+ this._fromUsername = _fromUsername;
+ }
- private java.lang.Integer _messageId;
+ private java.lang.Integer _messageId;
- @CompoundKeyElement(name = "MessageId", position = 1)
- public java.lang.Integer getMessageId() {
- return _messageId;
- }
+ @CompoundKeyElement(name = "MessageId", position = 1)
+ public java.lang.Integer getMessageId() {
+ return _messageId;
+ }
- public void setMessageId(java.lang.Integer _messageId) {
- this._messageId = _messageId;
- }
+ public void setMessageId(final java.lang.Integer _messageId) {
+ this._messageId = _messageId;
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Order.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Order.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Order.java
index b52b679..c49ab0c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Order.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Order.java
@@ -1,191 +1,166 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Order",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Order
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getOrderId();
-
- void setOrderId(java.lang.Integer _orderId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerId",
- type = "Edm.Int32",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getCustomerId();
-
- void setCustomerId(java.lang.Integer _customerId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getConcurrency();
-
- void setConcurrency(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login getLogin();
-
- void setLogin(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Customer",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Customer",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer getCustomer();
-
- void setCustomer(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer _customer);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newConcurrency();
-
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
- type = "Edm.Int32")
- Annotatable getOrderIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerId",
- type = "Edm.Int32")
- Annotatable getCustomerIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Concurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
- Annotatable getConcurrencyAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
- Annotatable getLoginAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Customer",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
- Annotatable getCustomerAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Order
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getOrderId();
+
+ void setOrderId(java.lang.Integer _orderId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerId",
+ type = "Edm.Int32",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getCustomerId();
+
+ void setCustomerId(java.lang.Integer _customerId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo
+ getConcurrency();
+
+ void
+ setConcurrency(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Login",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login
+ getLogin();
+
+ void
+ setLogin(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Customer",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Customer",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer
+ getCustomer();
+
+ void
+ setCustomer(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer _customer);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo
+ newConcurrency();
+
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
+ type = "Edm.Int32")
+ Annotatable getOrderIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerId",
+ type = "Edm.Int32")
+ Annotatable getCustomerIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Concurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
+ Annotatable getConcurrencyAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getLoginAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Customer",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
+ Annotatable getCustomerAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java
index 8ce0c46..8949e2a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface OrderCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order> {
+public interface OrderCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
index 4d61e6d..c92cd52 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
@@ -1,252 +1,225 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
+import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
@KeyRef(OrderLineKey.class)
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "OrderLine",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface OrderLine
- extends Annotatable,java.io.Serializable {
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderLineStream",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.io.InputStream getOrderLineStream();
-
- void setOrderLineStream(java.io.InputStream _orderLineStream);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getOrderId();
-
- void setOrderId(java.lang.Integer _orderId);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductId();
-
- void setProductId(java.lang.Integer _productId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getQuantity();
-
- void setQuantity(java.lang.Integer _quantity);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getConcurrencyToken();
-
- void setConcurrencyToken(java.lang.String _concurrencyToken);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Order",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Order",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order getOrder();
-
- void setOrder(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Product",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product getProduct();
-
- void setProduct(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
-
-
- Operations operations();
-
- interface Operations {
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "RetrieveProduct",
- type = OperationType.ACTION,
- returnType = "Edm.Int32")
- java.lang.Integer retrieveProduct(
- );
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderLineStream",
- type = "Edm.Stream")
- Annotatable getOrderLineStreamAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
- type = "Edm.Int32")
- Annotatable getOrderIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
- type = "Edm.Int32")
- Annotatable getProductIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Quantity",
- type = "Edm.Int32")
- Annotatable getQuantityAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
- type = "Edm.String")
- Annotatable getConcurrencyTokenAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Order",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
- Annotatable getOrderAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
- Annotatable getProductAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface OrderLine
+ extends Annotatable, java.io.Serializable {
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderLineStream",
+ type = "Edm.Stream",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.io.InputStream getOrderLineStream();
+
+ void setOrderLineStream(java.io.InputStream _orderLineStream);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getOrderId();
+
+ void setOrderId(java.lang.Integer _orderId);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductId();
+
+ void setProductId(java.lang.Integer _productId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getQuantity();
+
+ void setQuantity(java.lang.Integer _quantity);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getConcurrencyToken();
+
+ void setConcurrencyToken(java.lang.String _concurrencyToken);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Order",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Order",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order
+ getOrder();
+
+ void
+ setOrder(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Product",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product
+ getProduct();
+
+ void
+ setProduct(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+
+ Operations operations();
+
+ interface Operations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "RetrieveProduct",
+ type = OperationType.ACTION,
+ returnType = "Edm.Int32")
+ java.lang.Integer retrieveProduct(
+ );
+
+ }
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderLineStream",
+ type = "Edm.Stream")
+ Annotatable getOrderLineStreamAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
+ type = "Edm.Int32")
+ Annotatable getOrderIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Quantity",
+ type = "Edm.Int32")
+ Annotatable getQuantityAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
+ type = "Edm.String")
+ Annotatable getConcurrencyTokenAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Order",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
+ Annotatable getOrderAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getProductAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java
index 3ae9edb..6228817 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface OrderLineCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine> {
+public interface OrderLineCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java
index 88ffd50..44391a4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java
@@ -1,74 +1,50 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.AbstractEntityKey;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class OrderLineKey extends AbstractEntityKey {
- private java.lang.Integer _orderId;
+ private static final long serialVersionUID = 1L;
+ private java.lang.Integer _orderId;
- @CompoundKeyElement(name = "OrderId", position = 0)
- public java.lang.Integer getOrderId() {
- return _orderId;
- }
+ @CompoundKeyElement(name = "OrderId", position = 0)
+ public java.lang.Integer getOrderId() {
+ return _orderId;
+ }
- public void setOrderId(java.lang.Integer _orderId) {
- this._orderId = _orderId;
- }
+ public void setOrderId(final java.lang.Integer _orderId) {
+ this._orderId = _orderId;
+ }
- private java.lang.Integer _productId;
+ private java.lang.Integer _productId;
- @CompoundKeyElement(name = "ProductId", position = 1)
- public java.lang.Integer getProductId() {
- return _productId;
- }
+ @CompoundKeyElement(name = "ProductId", position = 1)
+ public java.lang.Integer getProductId() {
+ return _productId;
+ }
- public void setProductId(java.lang.Integer _productId) {
- this._productId = _productId;
- }
+ public void setProductId(final java.lang.Integer _productId) {
+ this._productId = _productId;
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java
index 7665a5a..7644c98 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java
@@ -1,227 +1,192 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "PageView",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface PageView
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageViewId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPageViewId();
-
- void setPageViewId(java.lang.Integer _pageViewId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Username",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getUsername();
-
- void setUsername(java.lang.String _username);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Viewed",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getViewed();
-
- void setViewed(java.util.Calendar _viewed);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TimeSpentOnPage",
- type = "Edm.Time",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.math.BigDecimal getTimeSpentOnPage();
-
- void setTimeSpentOnPage(java.math.BigDecimal _timeSpentOnPage);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageUrl",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getPageUrl();
-
- void setPageUrl(java.lang.String _pageUrl);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login getLogin();
-
- void setLogin(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PageViewId",
- type = "Edm.Int32")
- Annotatable getPageViewIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Username",
- type = "Edm.String")
- Annotatable getUsernameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Viewed",
- type = "Edm.DateTimeOffset")
- Annotatable getViewedAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TimeSpentOnPage",
- type = "Edm.Time")
- Annotatable getTimeSpentOnPageAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PageUrl",
- type = "Edm.String")
- Annotatable getPageUrlAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
- Annotatable getLoginAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface PageView
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageViewId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPageViewId();
+
+ void setPageViewId(java.lang.Integer _pageViewId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Username",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getUsername();
+
+ void setUsername(java.lang.String _username);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Viewed",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getViewed();
+
+ void setViewed(java.util.Calendar _viewed);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TimeSpentOnPage",
+ type = "Edm.Time",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.math.BigDecimal getTimeSpentOnPage();
+
+ void setTimeSpentOnPage(java.math.BigDecimal _timeSpentOnPage);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageUrl",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getPageUrl();
+
+ void setPageUrl(java.lang.String _pageUrl);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Login",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login
+ getLogin();
+
+ void
+ setLogin(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PageViewId",
+ type = "Edm.Int32")
+ Annotatable getPageViewIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Username",
+ type = "Edm.String")
+ Annotatable getUsernameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Viewed",
+ type = "Edm.DateTimeOffset")
+ Annotatable getViewedAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TimeSpentOnPage",
+ type = "Edm.Time")
+ Annotatable getTimeSpentOnPageAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PageUrl",
+ type = "Edm.String")
+ Annotatable getPageUrlAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getLoginAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java
index 7c5459f..e68e038 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface PageViewCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView> {
+public interface PageViewCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Person.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Person.java
index 170ebf9..1445a6d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Person.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Person.java
@@ -1,156 +1,126 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Person",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Person
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPersonId();
-
- void setPersonId(java.lang.Integer _personId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonMetadata",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "PersonMetadata",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection getPersonMetadata();
-
- void setPersonMetadata(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
-
-
- Operations operations();
-
- interface Operations {
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "UpdatePersonInfo",
- type = OperationType.ACTION)
- void updatePersonInfo(
- );
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
- type = "Edm.Int32")
- Annotatable getPersonIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonMetadata",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata")
- Annotatable getPersonMetadataAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Person
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPersonId();
+
+ void setPersonId(java.lang.Integer _personId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonMetadata",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "PersonMetadata",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection
+ getPersonMetadata();
+
+ void
+ setPersonMetadata(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
+
+ Operations operations();
+
+ interface Operations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "UpdatePersonInfo",
+ type = OperationType.ACTION)
+ void updatePersonInfo(
+ );
+
+ }
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
+ type = "Edm.Int32")
+ Annotatable getPersonIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonMetadata",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata")
+ Annotatable getPersonMetadataAnnotations();
+ }
}
[31/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32.java
index a7019b2..47629a8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32.java
@@ -1,105 +1,72 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmInt32",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface EdmInt32
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getId();
-
- void setId(java.lang.Integer _id);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Int32")
- Annotatable getIdAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface EdmInt32
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getId();
+
+ void setId(java.lang.Integer _id);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32Collection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32Collection.java
index 6b169d8..38167d1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32Collection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32Collection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface EdmInt32Collection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt32> {
+public interface EdmInt32Collection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt32> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64.java
index 6bbcf6f..c11a5b8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64.java
@@ -1,105 +1,72 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmInt64",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface EdmInt64
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Int64",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Long getId();
-
- void setId(java.lang.Long _id);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Int64")
- Annotatable getIdAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface EdmInt64
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Int64",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Long getId();
+
+ void setId(java.lang.Long _id);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int64")
+ Annotatable getIdAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64Collection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64Collection.java
index d2c712b..1b0e034 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64Collection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64Collection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface EdmInt64Collection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt64> {
+public interface EdmInt64Collection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt64> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingle.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingle.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingle.java
index 21db291..a848104 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingle.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingle.java
@@ -1,105 +1,72 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmSingle",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface EdmSingle
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Single",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Float getId();
-
- void setId(java.lang.Float _id);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Single")
- Annotatable getIdAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface EdmSingle
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Single",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Float getId();
+
+ void setId(java.lang.Float _id);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Single")
+ Annotatable getIdAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingleCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingleCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingleCollection.java
index b82b87f..7d29dbf 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingleCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingleCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface EdmSingleCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmSingle> {
+public interface EdmSingleCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmSingle> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmString.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmString.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmString.java
index 8f6b390..91d4868 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmString.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmString.java
@@ -1,105 +1,72 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmString",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface EdmString
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getId();
-
- void setId(java.lang.String _id);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.String")
- Annotatable getIdAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface EdmString
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getId();
+
+ void setId(java.lang.String _id);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.String")
+ Annotatable getIdAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmStringCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmStringCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmStringCollection.java
index f114c75..54f041e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmStringCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmStringCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface EdmStringCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmString> {
+public interface EdmStringCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmString> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTime.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTime.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTime.java
index 3f4784c..8337363 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTime.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTime.java
@@ -1,105 +1,72 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmTime",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface EdmTime
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Time",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.math.BigDecimal getId();
-
- void setId(java.math.BigDecimal _id);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Time")
- Annotatable getIdAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface EdmTime
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Time",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.math.BigDecimal getId();
+
+ void setId(java.math.BigDecimal _id);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Time")
+ Annotatable getIdAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTimeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTimeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTimeCollection.java
index 2b4604c..0e72663 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTimeCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTimeCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface EdmTimeCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmTime> {
+public interface EdmTimeCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmTime> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/Folder.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/Folder.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/Folder.java
index 25a5a42..a121fcd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/Folder.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/Folder.java
@@ -1,146 +1,114 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Folder",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Folder
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getId();
-
- void setId(java.lang.Integer _id);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Parent",
- type = "Microsoft.Test.OData.Services.PrimitiveKeysService.Folder",
- targetSchema = "Microsoft.Test.OData.Services.PrimitiveKeysService",
- targetContainer = "TestContext",
- targetEntitySet = "Folders",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.Folder getParent();
-
- void setParent(org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.Folder _parent);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Int32")
- Annotatable getIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Parent",
- type = "Microsoft.Test.OData.Services.PrimitiveKeysService.Folder")
- Annotatable getParentAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Folder
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getId();
+
+ void setId(java.lang.Integer _id);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Parent",
+ type = "Microsoft.Test.OData.Services.PrimitiveKeysService.Folder",
+ targetSchema = "Microsoft.Test.OData.Services.PrimitiveKeysService",
+ targetContainer = "TestContext",
+ targetEntitySet = "Folders",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.Folder
+ getParent();
+
+ void
+ setParent(
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.Folder _parent);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Parent",
+ type = "Microsoft.Test.OData.Services.PrimitiveKeysService.Folder")
+ Annotatable getParentAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/FolderCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/FolderCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/FolderCollection.java
index 02e7e31..49dd56c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/FolderCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/FolderCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface FolderCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.Folder> {
+public interface FolderCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.Folder> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/package-info.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/package-info.java
index 3eb10b0..cd5802c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/package-info.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/package-info.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
index 1b891d7..0d0c2f2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,35 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "AllGeoCollectionTypesSet")
+public interface AllGeoCollectionTypesSet
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypesCollection> {
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes
+ newAllSpatialCollectionTypes();
-@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "AllGeoCollectionTypesSet")
-public interface AllGeoCollectionTypesSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypesCollection> {
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypesCollection
+ newAllSpatialCollectionTypesCollection();
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes_Simple
+ newAllSpatialCollectionTypes_Simple();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes newAllSpatialCollectionTypes();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypesCollection newAllSpatialCollectionTypesCollection();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes_Simple newAllSpatialCollectionTypes_Simple();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes_SimpleCollection newAllSpatialCollectionTypes_SimpleCollection();
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes_SimpleCollection
+ newAllSpatialCollectionTypes_SimpleCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
index 2007975..8629968 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "AllGeoTypesSet")
-public interface AllGeoTypesSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection> {
+public interface AllGeoTypesSet
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection> {
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes
+ newAllSpatialTypes();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes newAllSpatialTypes();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection newAllSpatialTypesCollection();
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection
+ newAllSpatialTypesCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java
index f067d1e..6beee03 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,14 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Car")
-public interface Car
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection> {
+public interface Car
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection> {
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car newCar();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car newCar();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection newCarCollection();
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection
+ newCarCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java
index c0022a4..e3f0cea 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Computer")
-public interface Computer
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerCollection> {
+public interface Computer
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerCollection> {
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer
+ newComputer();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer newComputer();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerCollection newComputerCollection();
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerCollection
+ newComputerCollection();
}
[03/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java
index 748d5ed..ff69f43 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -73,10 +73,10 @@ public class ConformanceTestITCase extends AbstractTestITCase {
@Test
public void item1() {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company");
+ appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company");
final ODataEntityRequest<ODataEntity> req =
- client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
+ client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
assertEquals("4.0", req.getHeader("OData-MaxVersion"));
assertEquals("4.0", req.getHeader(HeaderName.odataMaxVersion.toString()));
@@ -90,36 +90,36 @@ public class ConformanceTestITCase extends AbstractTestITCase {
@Test
public void item2() {
final ODataEntity order =
- new ODataEntityImpl(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order"));
+ new ODataEntityImpl(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order"));
final ODataProperty orderId = getClient().getObjectFactory().newPrimitiveProperty("OrderID",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(2000));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(2000));
order.getProperties().add(orderId);
Calendar dateTime = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
dateTime.set(2011, 2, 4, 16, 3, 57);
final ODataProperty orderDate = getClient().getObjectFactory().newPrimitiveProperty("OrderDate",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(dateTime).build());
order.getProperties().add(orderDate);
final ODataProperty shelfLife = getClient().getObjectFactory().newPrimitiveProperty("ShelfLife",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
setType(EdmPrimitiveTypeKind.Duration).setValue(new BigDecimal("0.0000001")).build());
order.getProperties().add(shelfLife);
final ODataCollectionValue<ODataValue> orderShelfLifesValue = getClient().getObjectFactory().
- newCollectionValue("Collection(Duration)");
+ newCollectionValue("Collection(Duration)");
orderShelfLifesValue.add(getClient().getObjectFactory().newPrimitiveValueBuilder().
- setType(EdmPrimitiveTypeKind.Duration).setValue(new BigDecimal("0.0000001")).build());
+ setType(EdmPrimitiveTypeKind.Duration).setValue(new BigDecimal("0.0000001")).build());
orderShelfLifesValue.add(getClient().getObjectFactory().newPrimitiveValueBuilder().
- setType(EdmPrimitiveTypeKind.Duration).setValue(new BigDecimal("0.0000002")).build());
+ setType(EdmPrimitiveTypeKind.Duration).setValue(new BigDecimal("0.0000002")).build());
final ODataProperty orderShelfLifes = getClient().getObjectFactory().
- newCollectionProperty("OrderShelfLifes", orderShelfLifesValue);
+ newCollectionProperty("OrderShelfLifes", orderShelfLifesValue);
order.getProperties().add(orderShelfLifes);
final ODataEntityCreateRequest<ODataEntity> req = getClient().getCUDRequestFactory().getEntityCreateRequest(
- getClient().newURIBuilder(testStaticServiceRootURL).
+ getClient().newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Orders").build(), order);
req.setFormat(ODataFormat.JSON_FULL_METADATA);
@@ -129,22 +129,22 @@ public class ConformanceTestITCase extends AbstractTestITCase {
// check for Content-Type
assertEquals(
- ODataFormat.JSON_FULL_METADATA.getContentType(ODataServiceVersion.V40).toContentTypeString(),
- req.getHeader("Content-Type"));
+ ODataFormat.JSON_FULL_METADATA.getContentType(ODataServiceVersion.V40).toContentTypeString(),
+ req.getHeader("Content-Type"));
assertEquals(
- ODataFormat.JSON_FULL_METADATA.getContentType(ODataServiceVersion.V40).toContentTypeString(),
- req.getHeader(HeaderName.contentType.toString()));
+ ODataFormat.JSON_FULL_METADATA.getContentType(ODataServiceVersion.V40).toContentTypeString(),
+ req.getHeader(HeaderName.contentType.toString()));
assertEquals(
- ODataFormat.JSON_FULL_METADATA.getContentType(ODataServiceVersion.V40).toContentTypeString(),
- req.getContentType());
+ ODataFormat.JSON_FULL_METADATA.getContentType(ODataServiceVersion.V40).toContentTypeString(),
+ req.getContentType());
final ODataEntity created = req.execute().getBody();
assertNotNull(created);
final URI deleteURI = created.getEditLink() == null
- ? getClient().newURIBuilder(testStaticServiceRootURL).
+ ? getClient().newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Orders").appendKeySegment(2000).build()
- : created.getEditLink();
+ : created.getEditLink();
final ODataDeleteRequest deleteReq = getClient().getCUDRequestFactory().getDeleteRequest(deleteURI);
final ODataDeleteResponse deleteRes = deleteReq.execute();
assertEquals(204, deleteRes.getStatusCode());
@@ -156,10 +156,10 @@ public class ConformanceTestITCase extends AbstractTestITCase {
@Test
public void item4() {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("redirect").
- appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company");
+ appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company");
final ODataEntityRequest<ODataEntity> req =
- client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
+ client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
assertEquals("4.0", req.getHeader("OData-MaxVersion"));
assertEquals("4.0", req.getHeader(HeaderName.odataMaxVersion.toString()));
@@ -181,7 +181,7 @@ public class ConformanceTestITCase extends AbstractTestITCase {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("People");
ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
- getEntitySetRequest(uriBuilder.build());
+ getEntitySetRequest(uriBuilder.build());
req.setFormat(ODataFormat.JSON_FULL_METADATA);
req.setPrefer(client.newPreferences().maxPageSize(5));
@@ -215,29 +215,29 @@ public class ConformanceTestITCase extends AbstractTestITCase {
final Integer id = 2000;
ODataEntity rowIndex = getClient().getObjectFactory().newEntity(
- new FullQualifiedName("Microsoft.Test.OData.Services.OpenTypesServiceV4.RowIndex"));
+ new FullQualifiedName("Microsoft.Test.OData.Services.OpenTypesServiceV4.RowIndex"));
getClient().getBinder().add(rowIndex,
- getClient().getObjectFactory().newPrimitiveProperty("Id",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
+ getClient().getObjectFactory().newPrimitiveProperty("Id",
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
// add property not in metadata
getClient().getBinder().add(rowIndex,
- getClient().getObjectFactory().newPrimitiveProperty("aString",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("string")));
+ getClient().getObjectFactory().newPrimitiveProperty("aString",
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("string")));
// add navigation property not in metadata
rowIndex.addLink(client.getObjectFactory().newEntityNavigationLink(
- "Row", URI.create(testOpenTypeServiceRootURL + "/Row(71f7d0dc-ede4-45eb-b421-555a2aa1e58f)")));
+ "Row", URI.create(testOpenTypeServiceRootURL + "/Row(71f7d0dc-ede4-45eb-b421-555a2aa1e58f)")));
final ODataEntityCreateRequest<ODataEntity> createReq = getClient().getCUDRequestFactory().
- getEntityCreateRequest(getClient().newURIBuilder(testOpenTypeServiceRootURL).
- appendEntitySetSegment("RowIndex").build(), rowIndex);
+ getEntityCreateRequest(getClient().newURIBuilder(testOpenTypeServiceRootURL).
+ appendEntitySetSegment("RowIndex").build(), rowIndex);
final ODataEntityCreateResponse<ODataEntity> createRes = createReq.execute();
assertEquals(201, createRes.getStatusCode());
final URIBuilder builder = getClient().newURIBuilder(testOpenTypeServiceRootURL).
- appendEntitySetSegment("RowIndex").appendKeySegment(id);
+ appendEntitySetSegment("RowIndex").appendKeySegment(id);
rowIndex = read(ODataFormat.JSON_FULL_METADATA, builder.build());
assertNotNull(rowIndex);
@@ -246,7 +246,7 @@ public class ConformanceTestITCase extends AbstractTestITCase {
assertNotNull(rowIndex.getNavigationLink("Row"));
final ODataDeleteResponse deleteRes = getClient().getCUDRequestFactory().
- getDeleteRequest(rowIndex.getEditLink()).execute();
+ getDeleteRequest(rowIndex.getEditLink()).execute();
assertEquals(204, deleteRes.getStatusCode());
}
@@ -256,18 +256,18 @@ public class ConformanceTestITCase extends AbstractTestITCase {
@Test
public void item7() {
final URI uri = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Customers").appendKeySegment(1).build();
+ appendEntitySetSegment("Customers").appendKeySegment(1).build();
final ODataEntity patch = client.getObjectFactory().newEntity(
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
patch.setEditLink(uri);
final String newname = "New Name (" + System.currentTimeMillis() + ")";
patch.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("FirstName",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildString(newname)));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildString(newname)));
final ODataEntityUpdateRequest<ODataEntity> req =
- getClient().getCUDRequestFactory().getEntityUpdateRequest(UpdateType.PATCH, patch);
+ getClient().getCUDRequestFactory().getEntityUpdateRequest(UpdateType.PATCH, patch);
final ODataEntityUpdateResponse<ODataEntity> res = req.execute();
assertEquals(204, res.getStatusCode());
@@ -287,7 +287,7 @@ public class ConformanceTestITCase extends AbstractTestITCase {
client.getConfiguration().setHttpClientFactory(new BasicAuthHttpClientFactory("odatajclient", "odatajclient"));
final CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testAuthServiceRootURL).
- appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company");
+ appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company");
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setFormat(ODataFormat.JSON_FULL_METADATA);
@@ -303,8 +303,8 @@ public class ConformanceTestITCase extends AbstractTestITCase {
@Test
public void item9() {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Orders").appendKeySegment(8).appendNavigationSegment("CustomerForOrder").
- appendRefSegment();
+ appendEntitySetSegment("Orders").appendKeySegment(8).appendNavigationSegment("CustomerForOrder").
+ appendRefSegment();
ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setFormat(ODataFormat.JSON_FULL_METADATA);
@@ -317,7 +317,7 @@ public class ConformanceTestITCase extends AbstractTestITCase {
assertTrue(entity.getId().toASCIIString().endsWith("/StaticService/V40/Static.svc/Customers(PersonID=1)"));
final URI referenceURI = client.newURIBuilder(testStaticServiceRootURL).
- appendEntityIdSegment(entity.getId().toASCIIString()).build();
+ appendEntityIdSegment(entity.getId().toASCIIString()).build();
req = client.getRetrieveRequestFactory().getEntityRequest(referenceURI);
req.setFormat(ODataFormat.JSON_FULL_METADATA);
@@ -333,7 +333,7 @@ public class ConformanceTestITCase extends AbstractTestITCase {
@Test
public void item10() {
final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().getEntitySetRequest(
- client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customers").build());
+ client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customers").build());
req.setPrefer(client.newPreferences().trackChanges());
final ODataEntitySet customers = req.execute().getBody();
@@ -379,14 +379,14 @@ public class ConformanceTestITCase extends AbstractTestITCase {
@Test
public void item11() {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("async").appendEntitySetSegment("Orders");
+ appendEntitySetSegment("async").appendEntitySetSegment("Orders");
final ODataEntitySetRequest<ODataEntitySet> req =
- client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
+ client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
req.setFormat(ODataFormat.JSON_FULL_METADATA);
final AsyncRequestWrapper<ODataRetrieveResponse<ODataEntitySet>> async =
- client.getAsyncRequestFactory().<ODataRetrieveResponse<ODataEntitySet>>getAsyncRequestWrapper(req);
+ client.getAsyncRequestFactory().<ODataRetrieveResponse<ODataEntitySet>> getAsyncRequestWrapper(req);
async.callback(URI.create("http://client.service.it/callback/endpoint"));
final AsyncResponseWrapper<ODataRetrieveResponse<ODataEntitySet>> responseWrapper = async.execute();
@@ -406,10 +406,10 @@ public class ConformanceTestITCase extends AbstractTestITCase {
@Test
public void item12() {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company");
+ appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company");
final ODataEntityRequest<ODataEntity> req =
- client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
+ client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setFormat(ODataFormat.JSON);
assertEquals("application/json;odata.metadata=minimal", req.getHeader("Accept"));
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java
index 6c76793..836fa6e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -34,9 +34,9 @@ public class DeltaTestITCase extends AbstractTestITCase {
private void parse(final ODataFormat format) {
final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().getEntitySetRequest(
- client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customers").build());
+ client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customers").build());
req.setPrefer(client.newPreferences().trackChanges());
-
+
final ODataEntitySet customers = req.execute().getBody();
assertNotNull(customers);
assertNotNull(customers.getDeltaLink());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java
index 76e6937..98324d0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -45,10 +45,10 @@ public class DerivedTypeTestITCase extends AbstractTestITCase {
private void read(final ODataFormat format) {
// 1. entity set
URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("People").
- appendDerivedEntityTypeSegment("Microsoft.Test.OData.Services.ODataWCFService.Customer");
+ appendEntitySetSegment("People").
+ appendDerivedEntityTypeSegment("Microsoft.Test.OData.Services.ODataWCFService.Customer");
ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
- getEntitySetRequest(uriBuilder.build());
+ getEntitySetRequest(uriBuilder.build());
req.setFormat(format);
for (ODataEntity customer : req.execute().getBody().getEntities()) {
@@ -57,9 +57,9 @@ public class DerivedTypeTestITCase extends AbstractTestITCase {
// 2. contained entity set
uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Accounts").appendKeySegment(101).
- appendNavigationSegment("MyPaymentInstruments").
- appendDerivedEntityTypeSegment("Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI");
+ appendEntitySetSegment("Accounts").appendKeySegment(101).
+ appendNavigationSegment("MyPaymentInstruments").
+ appendDerivedEntityTypeSegment("Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI");
req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
req.setFormat(format);
@@ -80,60 +80,60 @@ public class DerivedTypeTestITCase extends AbstractTestITCase {
private void createDelete(final ODataFormat format) {
final ODataEntity customer = client.getObjectFactory().
- newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
+ newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
customer.getProperties().add(client.getObjectFactory().newPrimitiveProperty("PersonID",
- client.getObjectFactory().newPrimitiveValueBuilder().buildInt32(976)));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildInt32(976)));
customer.getProperties().add(client.getObjectFactory().newPrimitiveProperty("FirstName",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("Test")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("Test")));
customer.getProperties().add(client.getObjectFactory().newPrimitiveProperty("LastName",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("Test")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("Test")));
final ODataComplexValue<ODataProperty> homeAddress =
- client.getObjectFactory().newComplexValue("Microsoft.Test.OData.Services.ODataWCFService.CompanyAddress");
+ client.getObjectFactory().newComplexValue("Microsoft.Test.OData.Services.ODataWCFService.CompanyAddress");
homeAddress.add(client.getObjectFactory().newPrimitiveProperty("Street",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("V.le Gabriele D'Annunzio")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("V.le Gabriele D'Annunzio")));
homeAddress.add(client.getObjectFactory().newPrimitiveProperty("City",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("Pescara")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("Pescara")));
homeAddress.add(client.getObjectFactory().newPrimitiveProperty("PostalCode",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("65127")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("65127")));
homeAddress.add(client.getObjectFactory().newPrimitiveProperty("CompanyName",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("Tirasa")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("Tirasa")));
customer.getProperties().add(client.getObjectFactory().newComplexProperty("HomeAddress", homeAddress));
customer.getProperties().add(client.getObjectFactory().newCollectionProperty("Numbers",
- client.getObjectFactory().newCollectionValue("Edm.String")));
+ client.getObjectFactory().newCollectionValue("Edm.String")));
customer.getProperties().add(client.getObjectFactory().newCollectionProperty("Emails",
- client.getObjectFactory().newCollectionValue("Edm.String")));
+ client.getObjectFactory().newCollectionValue("Edm.String")));
customer.getProperties().add(client.getObjectFactory().newPrimitiveProperty("City",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("Pescara")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("Pescara")));
Calendar dateTime = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
dateTime.set(1977, 8, 8, 0, 0, 0);
customer.getProperties().add(client.getObjectFactory().newPrimitiveProperty("Birthday",
- client.getObjectFactory().newPrimitiveValueBuilder().
+ client.getObjectFactory().newPrimitiveValueBuilder().
setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(dateTime).build()));
customer.getProperties().add(client.getObjectFactory().newPrimitiveProperty("TimeBetweenLastTwoOrders",
- client.getObjectFactory().newPrimitiveValueBuilder().
+ client.getObjectFactory().newPrimitiveValueBuilder().
setType(EdmPrimitiveTypeKind.Duration).setValue(new BigDecimal("0.0000002")).build()));
final ODataEntityCreateRequest<ODataEntity> createReq = client.getCUDRequestFactory().
- getEntityCreateRequest(
- client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("People").build(),
- customer);
+ getEntityCreateRequest(
+ client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("People").build(),
+ customer);
createReq.setFormat(format);
final ODataEntityCreateResponse<ODataEntity> createRes = createReq.execute();
assertEquals(201, createRes.getStatusCode());
final ODataEntityRequest<ODataEntity> fetchReq = client.getRetrieveRequestFactory().
- getEntityRequest(client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("People").appendKeySegment(976).build());
+ getEntityRequest(client.newURIBuilder(testStaticServiceRootURL).
+ appendEntitySetSegment("People").appendKeySegment(976).build());
fetchReq.setFormat(format);
final ODataEntity actual = fetchReq.execute().getBody();
assertEquals("Microsoft.Test.OData.Services.ODataWCFService.Customer", actual.getTypeName().toString());
assertEquals("Microsoft.Test.OData.Services.ODataWCFService.CompanyAddress",
- ((ODataValuable) actual.getProperty("HomeAddress")).getValue().getTypeName());
+ ((ODataValuable) actual.getProperty("HomeAddress")).getValue().getTypeName());
final ODataDeleteRequest deleteReq = client.getCUDRequestFactory().getDeleteRequest(actual.getEditLink());
assertEquals(204, deleteReq.execute().getStatusCode());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java
index a6a8721..2b6c901 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -52,7 +52,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
private void onContained(final ODataFormat format) {
final URI uri = getClient().newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Accounts").
- appendKeySegment(101).appendNavigationSegment("MyPaymentInstruments").build();
+ appendKeySegment(101).appendNavigationSegment("MyPaymentInstruments").build();
// 1. read contained collection before any operation
ODataEntitySet instruments = getClient().getRetrieveRequestFactory().getEntitySetRequest(uri).execute().getBody();
@@ -61,22 +61,22 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
// 2. instantiate an ODataEntity of the same type as the collection above
final ODataEntity instrument = getClient().getObjectFactory().
- newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument"));
+ newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument"));
int id = RandomUtils.nextInt(101999, 105000);
instrument.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("PaymentInstrumentID",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
instrument.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("FriendlyName",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("New one")));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("New one")));
instrument.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("CreatedDate",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(Calendar.getInstance()).build()));
// 3. create it as contained entity
final ODataEntityCreateRequest<ODataEntity> req = getClient().getCUDRequestFactory().
- getEntityCreateRequest(uri, instrument);
+ getEntityCreateRequest(uri, instrument);
req.setFormat(format);
-
+
final ODataEntityCreateResponse<ODataEntity> res = req.execute();
assertEquals(201, res.getStatusCode());
@@ -88,7 +88,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
// 5. remove the contained entity created above
final ODataDeleteResponse deleteRes = getClient().getCUDRequestFactory().
- getDeleteRequest(getClient().newURIBuilder(uri.toASCIIString()).appendKeySegment(id).build()).execute();
+ getDeleteRequest(getClient().newURIBuilder(uri.toASCIIString()).appendKeySegment(id).build()).execute();
assertEquals(204, deleteRes.getStatusCode());
// 6. verify that the contained collection effectively reduced
@@ -109,72 +109,72 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
}
private void deepInsert(final ODataFormat format, final int productId, final int productDetailId)
- throws EdmPrimitiveTypeException {
+ throws EdmPrimitiveTypeException {
final ODataEntity product = getClient().getObjectFactory().
- newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Product"));
+ newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Product"));
product.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("ProductID",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(productId)));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(productId)));
product.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("Name",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("Latte")));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("Latte")));
product.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("QuantityPerUnit",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("100g Bag")));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("100g Bag")));
product.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("UnitPrice",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildSingle(3.24f)));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildSingle(3.24f)));
product.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("QuantityInStock",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(100)));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(100)));
product.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("Discontinued",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildBoolean(false)));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildBoolean(false)));
product.getProperties().add(getClient().getObjectFactory().newEnumProperty("UserAccess",
- getClient().getObjectFactory().
+ getClient().getObjectFactory().
newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", "Execute")));
product.getProperties().add(getClient().getObjectFactory().newEnumProperty("SkinColor",
- getClient().getObjectFactory().
+ getClient().getObjectFactory().
newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.Color", "Blue")));
product.getProperties().add(getClient().getObjectFactory().newCollectionProperty("CoverColors",
- getClient().getObjectFactory().
+ getClient().getObjectFactory().
newCollectionValue("Microsoft.Test.OData.Services.ODataWCFService.Color")));
product.getProperty("CoverColors").getCollectionValue().add(getClient().getObjectFactory().
- newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.Color", "Green"));
+ newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.Color", "Green"));
product.getProperty("CoverColors").getCollectionValue().add(getClient().getObjectFactory().
- newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.Color", "Red"));
+ newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.Color", "Red"));
final ODataEntity detail = getClient().getObjectFactory().
- newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.ProductDetail"));
+ newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.ProductDetail"));
detail.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("ProductID",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(productId)));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(productId)));
detail.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("ProductDetailID",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(productDetailId)));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(productDetailId)));
detail.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("ProductName",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("LatteHQ")));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("LatteHQ")));
detail.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("Description",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("High-Quality Milk")));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("High-Quality Milk")));
final ODataEntitySet details = getClient().getObjectFactory().newEntitySet();
details.getEntities().add(detail);
final ODataInlineEntitySet inlineDetails = getClient().getObjectFactory().
- newDeepInsertEntitySet("Details", details);
+ newDeepInsertEntitySet("Details", details);
product.addLink(inlineDetails);
final ODataEntityCreateRequest<ODataEntity> req = getClient().getCUDRequestFactory().getEntityCreateRequest(
- getClient().newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Products").build(), product);
+ getClient().newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Products").build(), product);
req.setFormat(format);
final ODataEntityCreateResponse<ODataEntity> res = req.execute();
assertEquals(201, res.getStatusCode());
final ODataEntity createdProduct = res.getBody();
assertEquals(productId,
- createdProduct.getProperty("ProductID").getPrimitiveValue().toCastValue(Integer.class), 0);
+ createdProduct.getProperty("ProductID").getPrimitiveValue().toCastValue(Integer.class), 0);
final ODataLink createdLink = createdProduct.getNavigationLink("Details");
assertNotNull(createdLink);
final ODataEntitySet createdProductDetails =
- getClient().getRetrieveRequestFactory().getEntitySetRequest(createdLink.getLink()).execute().getBody();
+ getClient().getRetrieveRequestFactory().getEntitySetRequest(createdLink.getLink()).execute().getBody();
assertNotNull(createdProductDetails);
assertEquals(productDetailId, createdProductDetails.getEntities().iterator().next().
- getProperty("ProductDetailID").getPrimitiveValue().toCastValue(Integer.class), 0);
+ getProperty("ProductDetailID").getPrimitiveValue().toCastValue(Integer.class), 0);
}
@Test
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java
index 4937d7a..b999d63 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -56,10 +56,10 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
private void withInlineEntity(final ODataClient client, final ODataFormat format) {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company");
+ appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company");
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().
- getEntityRequest(uriBuilder.build());
+ getEntityRequest(uriBuilder.build());
req.setFormat(format);
final ODataRetrieveResponse<ODataEntity> res = req.execute();
@@ -91,15 +91,15 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
assertEquals(5, properties.size());
assertTrue(properties.get(0).getName().equals("CompanyID")
- || properties.get(1).getName().equals("CompanyID")
- || properties.get(2).getName().equals("CompanyID")
- || properties.get(3).getName().equals("CompanyID")
- || properties.get(4).getName().equals("CompanyID"));
+ || properties.get(1).getName().equals("CompanyID")
+ || properties.get(2).getName().equals("CompanyID")
+ || properties.get(3).getName().equals("CompanyID")
+ || properties.get(4).getName().equals("CompanyID"));
assertTrue(properties.get(0).getValue().toString().equals("0")
- || properties.get(1).getValue().toString().equals("0")
- || properties.get(2).getValue().toString().equals("0")
- || properties.get(3).getValue().toString().equals("0")
- || properties.get(4).getValue().toString().equals("0"));
+ || properties.get(1).getValue().toString().equals("0")
+ || properties.get(2).getValue().toString().equals("0")
+ || properties.get(3).getValue().toString().equals("0")
+ || properties.get(4).getValue().toString().equals("0"));
found = true;
}
@@ -126,10 +126,10 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
private void withInlineEntitySet(final ODataClient client, final ODataFormat format) {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Customers").appendKeySegment(1).expand("Orders");
+ appendEntitySetSegment("Customers").appendKeySegment(1).expand("Orders");
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().
- getEntityRequest(uriBuilder.build());
+ getEntityRequest(uriBuilder.build());
req.setFormat(format);
final ODataRetrieveResponse<ODataEntity> res = req.execute();
@@ -169,7 +169,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
private void rawRequest(final ODataFormat format) {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("People").appendKeySegment(5);
+ appendEntitySetSegment("People").appendKeySegment(5);
final ODataRawRequest req = client.getRetrieveRequestFactory().getRawRequest(uriBuilder.build());
req.setFormat(format.getContentType(client.getServiceVersion()).toContentTypeString());
@@ -201,7 +201,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
multiKey.put("ProductDetailID", 1);
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("ProductDetails").appendKeySegment(multiKey);
+ appendEntitySetSegment("ProductDetails").appendKeySegment(multiKey);
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setFormat(format);
@@ -210,7 +210,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
final ODataEntity entity = res.getBody();
assertNotNull(entity);
assertEquals(Integer.valueOf(1),
- entity.getProperty("ProductDetailID").getPrimitiveValue().toCastValue(Integer.class));
+ entity.getProperty("ProductDetailID").getPrimitiveValue().toCastValue(Integer.class));
}
@Test
@@ -225,7 +225,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
private void checkForETag(final ODataClient client, final ODataFormat format) {
final URIBuilder uriBuilder =
- client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Orders").appendKeySegment(8);
+ client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Orders").appendKeySegment(8);
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setFormat(format);
@@ -274,8 +274,8 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
private void reference(final ODataFormat format) {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Orders").appendKeySegment(8).appendNavigationSegment("CustomerForOrder").
- appendRefSegment();
+ appendEntitySetSegment("Orders").appendKeySegment(8).appendNavigationSegment("CustomerForOrder").
+ appendRefSegment();
ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setFormat(format);
@@ -288,7 +288,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
assertTrue(entity.getId().toASCIIString().endsWith("/StaticService/V40/Static.svc/Customers(PersonID=1)"));
final URI referenceURI = client.newURIBuilder(testStaticServiceRootURL).
- appendEntityIdSegment(entity.getId().toASCIIString()).build();
+ appendEntityIdSegment(entity.getId().toASCIIString()).build();
req = client.getRetrieveRequestFactory().getEntityRequest(referenceURI);
req.setFormat(format);
@@ -310,8 +310,8 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
private void contained(final ODataClient client, final ODataFormat format) throws EdmPrimitiveTypeException {
final URI uri = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Accounts").appendKeySegment(101).
- appendNavigationSegment("MyPaymentInstruments").appendKeySegment(101902).build();
+ appendEntitySetSegment("Accounts").appendKeySegment(101).
+ appendNavigationSegment("MyPaymentInstruments").appendKeySegment(101902).build();
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uri);
req.setFormat(format);
@@ -319,7 +319,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
assertNotNull(contained);
assertEquals("Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument", contained.getTypeName().toString());
assertEquals(101902,
- contained.getProperty("PaymentInstrumentID").getPrimitiveValue().toCastValue(Integer.class), 0);
+ contained.getProperty("PaymentInstrumentID").getPrimitiveValue().toCastValue(Integer.class), 0);
assertEquals("Edm.DateTimeOffset", contained.getProperty("CreatedDate").getPrimitiveValue().getTypeName());
}
@@ -340,7 +340,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
private void entitySetNavigationLink(final ODataClient client, final ODataFormat format) {
final URI uri = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Accounts").appendKeySegment(101).build();
+ appendEntitySetSegment("Accounts").appendKeySegment(101).build();
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uri);
req.setFormat(format);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java
index 0b87fbe..9de562e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -71,7 +71,7 @@ public class EntitySetTestITCase extends AbstractTestITCase {
private void readWithInlineCount(final ODataClient client, final ODataFormat format) {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("People").count(true);
+ appendEntitySetSegment("People").count(true);
final ODataRawRequest req = client.getRetrieveRequestFactory().getRawRequest(uriBuilder.build());
req.setFormat(format.getContentType(client.getServiceVersion()).toContentTypeString());
@@ -83,7 +83,7 @@ public class EntitySetTestITCase extends AbstractTestITCase {
assertEquals(5, entitySet.getPayload().getCount());
assertEquals("Microsoft.Test.OData.Services.ODataWCFService.Address",
- entitySet.getPayload().getEntities().get(2).getProperty("HomeAddress").getComplexValue().getTypeName());
+ entitySet.getPayload().getEntities().get(2).getProperty("HomeAddress").getComplexValue().getTypeName());
}
@Test
@@ -105,7 +105,7 @@ public class EntitySetTestITCase extends AbstractTestITCase {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("People");
final ODataEntitySetIteratorRequest<ODataEntitySet, ODataEntity> req =
- client.getRetrieveRequestFactory().getEntitySetIteratorRequest(uriBuilder.build());
+ client.getRetrieveRequestFactory().getEntitySetIteratorRequest(uriBuilder.build());
req.setFormat(format);
final ODataRetrieveResponse<ODataEntitySetIterator<ODataEntitySet, ODataEntity>> res = req.execute();
@@ -147,7 +147,7 @@ public class EntitySetTestITCase extends AbstractTestITCase {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("People");
final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
- getEntitySetRequest(uriBuilder.build());
+ getEntitySetRequest(uriBuilder.build());
req.setFormat(format);
req.setPrefer(client.newPreferences().maxPageSize(5));
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/EntityUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/EntityUpdateTestITCase.java
index 34fa574..9a5ce99 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/EntityUpdateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/EntityUpdateTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -42,22 +42,22 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
private void upsert(final UpdateType updateType, final ODataFormat format) {
final ODataEntity order = getClient().getObjectFactory().
- newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order"));
+ newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order"));
order.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("OrderID",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(9)));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(9)));
order.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("OrderDate",
- getClient().getObjectFactory().newPrimitiveValueBuilder()
+ getClient().getObjectFactory().newPrimitiveValueBuilder()
.setType(EdmPrimitiveTypeKind.DateTimeOffset).setValue(
Calendar.getInstance(TimeZone.getTimeZone("GMT"))).build()));
order.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("ShelfLife",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
+ getClient().getObjectFactory().newPrimitiveValueBuilder().
setType(EdmPrimitiveTypeKind.Duration).setValue(new BigDecimal("0.0000002")).build()));
final URI upsertURI = getClient().newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Orders").appendKeySegment(9).build();
+ appendEntitySetSegment("Orders").appendKeySegment(9).build();
final ODataEntityUpdateRequest<ODataEntity> req = getClient().getCUDRequestFactory().
- getEntityUpdateRequest(upsertURI, updateType, order);
+ getEntityUpdateRequest(upsertURI, updateType, order);
req.setFormat(format);
req.execute();
@@ -66,9 +66,9 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
assertNotNull(read);
assertEquals(order.getProperty("OrderID"), read.getProperty("OrderID"));
assertEquals(order.getProperty("OrderDate").getPrimitiveValue().toString(),
- read.getProperty("OrderDate").getPrimitiveValue().toString());
+ read.getProperty("OrderDate").getPrimitiveValue().toString());
assertEquals(order.getProperty("ShelfLife").getPrimitiveValue().toString(),
- read.getProperty("ShelfLife").getPrimitiveValue().toString());
+ read.getProperty("ShelfLife").getPrimitiveValue().toString());
} finally {
getClient().getCUDRequestFactory().getDeleteRequest(upsertURI).execute();
}
@@ -89,15 +89,15 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
private void onContained(final ODataFormat format) {
final String newName = UUID.randomUUID().toString();
final ODataEntity changes = getClient().getObjectFactory().newEntity(
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument"));
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument"));
changes.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("FriendlyName",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildString(newName)));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildString(newName)));
final URI uri = getClient().newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Accounts").appendKeySegment(101).
- appendNavigationSegment("MyPaymentInstruments").appendKeySegment(101901).build();
+ appendEntitySetSegment("Accounts").appendKeySegment(101).
+ appendNavigationSegment("MyPaymentInstruments").appendKeySegment(101901).build();
final ODataEntityUpdateRequest<ODataEntity> req = getClient().getCUDRequestFactory().
- getEntityUpdateRequest(uri, UpdateType.PATCH, changes);
+ getEntityUpdateRequest(uri, UpdateType.PATCH, changes);
req.setFormat(format);
final ODataEntityUpdateResponse<ODataEntity> res = req.execute();
@@ -120,16 +120,16 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
private void bindOperation(final ODataFormat format) throws EdmPrimitiveTypeException {
final ODataEntity changes = getClient().getObjectFactory().newEntity(
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
final ODataLink parent = getClient().getObjectFactory().newEntityNavigationLink("Parent",
- getClient().newURIBuilder(testStaticServiceRootURL).
+ getClient().newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("People").appendKeySegment(1).build());
changes.getNavigationLinks().add(parent);
final URI uri = getClient().newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("People").appendKeySegment(5).build();
+ appendEntitySetSegment("People").appendKeySegment(5).build();
final ODataEntityUpdateRequest<ODataEntity> req = getClient().getCUDRequestFactory().
- getEntityUpdateRequest(uri, UpdateType.PATCH, changes);
+ getEntityUpdateRequest(uri, UpdateType.PATCH, changes);
req.setFormat(format);
final ODataEntityUpdateResponse<ODataEntity> res = req.execute();
@@ -141,7 +141,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
assertNotNull(updatedLink);
final ODataEntity updatedEntity = getClient().getRetrieveRequestFactory().getEntityRequest(updatedLink.getLink()).
- execute().getBody();
+ execute().getBody();
assertNotNull(updatedEntity);
assertEquals(1, updatedEntity.getProperty("PersonID").getPrimitiveValue().toCastValue(Integer.class), 0);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java
index 54f6f74..1a742a2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -35,8 +35,8 @@ public class ErrorResponseTestITCase extends AbstractTestITCase {
@Test
public void jsonError() {
final URI readURI = getClient().newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Customers").appendKeySegment(32).
- build();
+ appendEntitySetSegment("Customers").appendKeySegment(32).
+ build();
try {
read(ODataFormat.JSON, readURI);
@@ -54,9 +54,9 @@ public class ErrorResponseTestITCase extends AbstractTestITCase {
final Map<String, String> innerErr = err.getInnerError();
assertEquals("innerError dictionary size should be correct", 2, innerErr.size());
assertEquals("innerError['context'] should be correct",
- "{\"key1\":\"for debug deployment only\"}", innerErr.get("context"));
+ "{\"key1\":\"for debug deployment only\"}", innerErr.get("context"));
assertEquals("innerError['trace'] should be correct",
- "[\"callmethod1 etc\",\"callmethod2 etc\"]", innerErr.get("trace"));
+ "[\"callmethod1 etc\",\"callmethod2 etc\"]", innerErr.get("trace"));
}
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/FilterFactoryTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/FilterFactoryTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/FilterFactoryTestITCase.java
index 737f355..82956e4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/FilterFactoryTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/FilterFactoryTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -43,13 +43,13 @@ public class FilterFactoryTestITCase extends AbstractTestITCase {
@Test
public void crossjoin() {
final URIFilter filter = getFilterFactory().eq(
- getFilterArgFactory().property("Orders/OrderID"), getFilterArgFactory().property("Customers/Order"));
+ getFilterArgFactory().property("Orders/OrderID"), getFilterArgFactory().property("Customers/Order"));
final URIBuilder uriBuilder =
- client.newURIBuilder(testStaticServiceRootURL).appendCrossjoinSegment("Customers", "Orders").filter(filter);
+ client.newURIBuilder(testStaticServiceRootURL).appendCrossjoinSegment("Customers", "Orders").filter(filter);
final ODataEntitySetRequest<ODataEntitySet> req =
- client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
+ client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
req.setFormat(ODataFormat.JSON_FULL_METADATA);
final ODataEntitySet feed = req.execute().getBody();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/JSONFormatConformanceTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/JSONFormatConformanceTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/JSONFormatConformanceTestITCase.java
index 04651b3..172a5f9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/JSONFormatConformanceTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/JSONFormatConformanceTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -62,8 +62,8 @@ public class JSONFormatConformanceTestITCase extends AbstractTestITCase {
@Test
public void item1() throws EdmPrimitiveTypeException {
final URI uri = edmClient.newURIBuilder().
- appendEntitySetSegment("Accounts").appendKeySegment(102).
- appendNavigationSegment("MyPaymentInstruments").appendKeySegment(102902).build();
+ appendEntitySetSegment("Accounts").appendKeySegment(102).
+ appendNavigationSegment("MyPaymentInstruments").appendKeySegment(102902).build();
final ODataEntityRequest<ODataEntity> req = edmClient.getRetrieveRequestFactory().getEntityRequest(uri);
// request format (via Accept header) is set to minimal by default
@@ -89,7 +89,7 @@ public class JSONFormatConformanceTestITCase extends AbstractTestITCase {
@Test
public void item2() {
final URI uri = edmClient.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Accounts").appendKeySegment(102).build();
+ appendEntitySetSegment("Accounts").appendKeySegment(102).build();
final ODataEntityRequest<ODataEntity> req = edmClient.getRetrieveRequestFactory().getEntityRequest(uri);
req.setFormat(ODataFormat.JSON_FULL_METADATA);
@@ -119,34 +119,34 @@ public class JSONFormatConformanceTestITCase extends AbstractTestITCase {
@Test
public void item3() throws Exception {
final String fromSection71 = "{"
- + "\"NullValue\": null,"
- + "\"TrueValue\": true,"
- + "\"FalseValue\": false,"
- + "\"BinaryValue@odata.type\": \"Binary\","
- + "\"BinaryValue\": \"T0RhdGE\","
- + "\"IntegerValue\": -128,"
- + "\"DoubleValue\": 3.1415926535897931,"
- + "\"SingleValue@odata.type\": \"Single\","
- + "\"SingleValue\": \"INF\","
- + "\"DecimalValue@odata.type\": \"Decimal\","
- + "\"DecimalValue\": 34.95,"
- + "\"StringValue\": \"Say \\\"Hello\\\",\\nthen go\","
- + "\"DateValue@odata.type\": \"Date\","
- + "\"DateValue\": \"2012-12-03\","
- + "\"DateTimeOffsetValue@odata.type\": \"DateTimeOffset\","
- + "\"DateTimeOffsetValue\": \"2012-12-03T07:16:23Z\","
- + "\"DurationValue@odata.type\": \"Duration\","
- + "\"DurationValue\": \"P12DT23H59M59.999999999999S\","
- + "\"TimeOfDayValue@odata.type\": \"TimeOfDay\","
- + "\"TimeOfDayValue\": \"07:59:59.999\","
- + "\"GuidValue@odata.type\": \"Guid\","
- + "\"GuidValue\": \"01234567-89ab-cdef-0123-456789abcdef\","
- + "\"Int64Value@odata.type\": \"Int64\","
- + "\"Int64Value\": 0,"
- + "\"ColorEnumValue@odata.type\": \"Test.Color\","
- + "\"ColorEnumValue\": \"Yellow\","
- + "\"GeographyPoint\": {\"type\": \"Point\",\"coordinates\":[142.1,64.1]}"
- + "}";
+ + "\"NullValue\": null,"
+ + "\"TrueValue\": true,"
+ + "\"FalseValue\": false,"
+ + "\"BinaryValue@odata.type\": \"Binary\","
+ + "\"BinaryValue\": \"T0RhdGE\","
+ + "\"IntegerValue\": -128,"
+ + "\"DoubleValue\": 3.1415926535897931,"
+ + "\"SingleValue@odata.type\": \"Single\","
+ + "\"SingleValue\": \"INF\","
+ + "\"DecimalValue@odata.type\": \"Decimal\","
+ + "\"DecimalValue\": 34.95,"
+ + "\"StringValue\": \"Say \\\"Hello\\\",\\nthen go\","
+ + "\"DateValue@odata.type\": \"Date\","
+ + "\"DateValue\": \"2012-12-03\","
+ + "\"DateTimeOffsetValue@odata.type\": \"DateTimeOffset\","
+ + "\"DateTimeOffsetValue\": \"2012-12-03T07:16:23Z\","
+ + "\"DurationValue@odata.type\": \"Duration\","
+ + "\"DurationValue\": \"P12DT23H59M59.999999999999S\","
+ + "\"TimeOfDayValue@odata.type\": \"TimeOfDay\","
+ + "\"TimeOfDayValue\": \"07:59:59.999\","
+ + "\"GuidValue@odata.type\": \"Guid\","
+ + "\"GuidValue\": \"01234567-89ab-cdef-0123-456789abcdef\","
+ + "\"Int64Value@odata.type\": \"Int64\","
+ + "\"Int64Value\": 0,"
+ + "\"ColorEnumValue@odata.type\": \"Test.Color\","
+ + "\"ColorEnumValue\": \"Yellow\","
+ + "\"GeographyPoint\": {\"type\": \"Point\",\"coordinates\":[142.1,64.1]}"
+ + "}";
final ODataEntity entity = client.getReader().readEntity(IOUtils.toInputStream(fromSection71), ODataFormat.JSON);
@@ -165,29 +165,29 @@ public class JSONFormatConformanceTestITCase extends AbstractTestITCase {
assertEquals(EdmPrimitiveTypeKind.Double, entity.getProperty("DoubleValue").getPrimitiveValue().getTypeKind());
assertEquals(3.1415926535897931,
- entity.getProperty("DoubleValue").getPrimitiveValue().toCastValue(Double.class), 0);
+ entity.getProperty("DoubleValue").getPrimitiveValue().toCastValue(Double.class), 0);
assertEquals(EdmPrimitiveTypeKind.Single, entity.getProperty("SingleValue").getPrimitiveValue().getTypeKind());
assertEquals(Float.POSITIVE_INFINITY,
- entity.getProperty("SingleValue").getPrimitiveValue().toCastValue(Float.class), 0);
+ entity.getProperty("SingleValue").getPrimitiveValue().toCastValue(Float.class), 0);
assertEquals(EdmPrimitiveTypeKind.Decimal, entity.getProperty("DecimalValue").getPrimitiveValue().getTypeKind());
assertEquals(BigDecimal.valueOf(34.95),
- entity.getProperty("DecimalValue").getPrimitiveValue().toCastValue(BigDecimal.class));
+ entity.getProperty("DecimalValue").getPrimitiveValue().toCastValue(BigDecimal.class));
assertEquals(EdmPrimitiveTypeKind.String, entity.getProperty("StringValue").getPrimitiveValue().getTypeKind());
assertEquals("Say \"Hello\",\nthen go",
- entity.getProperty("StringValue").getPrimitiveValue().toCastValue(String.class));
+ entity.getProperty("StringValue").getPrimitiveValue().toCastValue(String.class));
assertEquals(EdmPrimitiveTypeKind.Date, entity.getProperty("DateValue").getPrimitiveValue().getTypeKind());
assertEquals(EdmPrimitiveTypeKind.DateTimeOffset,
- entity.getProperty("DateTimeOffsetValue").getPrimitiveValue().getTypeKind());
+ entity.getProperty("DateTimeOffsetValue").getPrimitiveValue().getTypeKind());
assertEquals(EdmPrimitiveTypeKind.Duration, entity.getProperty("DurationValue").getPrimitiveValue().getTypeKind());
assertEquals(EdmPrimitiveTypeKind.TimeOfDay,
- entity.getProperty("TimeOfDayValue").getPrimitiveValue().getTypeKind());
+ entity.getProperty("TimeOfDayValue").getPrimitiveValue().getTypeKind());
assertEquals(EdmPrimitiveTypeKind.Guid, entity.getProperty("GuidValue").getPrimitiveValue().getTypeKind());
@@ -196,7 +196,7 @@ public class JSONFormatConformanceTestITCase extends AbstractTestITCase {
assertTrue(entity.getProperty("ColorEnumValue").hasEnumValue());
assertEquals(EdmPrimitiveTypeKind.GeographyPoint,
- entity.getProperty("GeographyPoint").getPrimitiveValue().getTypeKind());
+ entity.getProperty("GeographyPoint").getPrimitiveValue().getTypeKind());
}
/**
@@ -205,21 +205,21 @@ public class JSONFormatConformanceTestITCase extends AbstractTestITCase {
@Test
public void item4() throws Exception {
final String fromSection45_1 = "{"
- + "\"@odata.context\": \"http://host/service/$metadata#Customers/$entity\","
- + "\"@odata.metadataEtag\": \"W/\\\"A1FF3E230954908F\\\"\","
- + "\"@odata.etag\": \"W/\\\"A1FF3E230954908G\\\"\","
- + "\"@odata.type\": \"#Model.VipCustomer\","
- + "\"@odata.id\": \"http://host/service/Employees(PersonID=3)\","
- + "\"@odata.editLink\": \"People(976)\","
- + "\"@odata.mediaEditLink\": \"Employees(1)/$value\","
- + "\"@odata.mediaContentType\": \"image/jpeg\","
- + "\"@odata.mediaEtag\": \"W/\\\"A1FF3E230954908H\\\"\","
- + "\"Parent@odata.navigationLink\": \"People(976)/Parent\","
- + "\"Parent@odata.associationLink\": \"People(976)/Parent\""
- + "}";
+ + "\"@odata.context\": \"http://host/service/$metadata#Customers/$entity\","
+ + "\"@odata.metadataEtag\": \"W/\\\"A1FF3E230954908F\\\"\","
+ + "\"@odata.etag\": \"W/\\\"A1FF3E230954908G\\\"\","
+ + "\"@odata.type\": \"#Model.VipCustomer\","
+ + "\"@odata.id\": \"http://host/service/Employees(PersonID=3)\","
+ + "\"@odata.editLink\": \"People(976)\","
+ + "\"@odata.mediaEditLink\": \"Employees(1)/$value\","
+ + "\"@odata.mediaContentType\": \"image/jpeg\","
+ + "\"@odata.mediaEtag\": \"W/\\\"A1FF3E230954908H\\\"\","
+ + "\"Parent@odata.navigationLink\": \"People(976)/Parent\","
+ + "\"Parent@odata.associationLink\": \"People(976)/Parent\""
+ + "}";
final ResWrap<Entity> entity =
- client.getDeserializer(ODataFormat.JSON).toEntity(IOUtils.toInputStream(fromSection45_1));
+ client.getDeserializer(ODataFormat.JSON).toEntity(IOUtils.toInputStream(fromSection45_1));
assertEquals("http://host/service/$metadata#Customers/$entity", entity.getContextURL().getURI().toASCIIString());
assertEquals("W/\"A1FF3E230954908F\"", entity.getMetadataETag());
@@ -234,14 +234,14 @@ public class JSONFormatConformanceTestITCase extends AbstractTestITCase {
assertEquals("People(976)/Parent", entity.getPayload().getAssociationLink("Parent").getHref());
final String fromSection45_2 = "{"
- + " \"@odata.count\": 5,"
- + " \"value\": [],"
- + " \"@odata.nextLink\": \"Customers?$expand=Orders&$skipToken=5\","
- + " \"@odata.deltaLink\": \"Customers?$expand=Orders&$deltatoken=8015\""
- + "}";
+ + " \"@odata.count\": 5,"
+ + " \"value\": [],"
+ + " \"@odata.nextLink\": \"Customers?$expand=Orders&$skipToken=5\","
+ + " \"@odata.deltaLink\": \"Customers?$expand=Orders&$deltatoken=8015\""
+ + "}";
final ResWrap<EntitySet> entitySet =
- client.getDeserializer(ODataFormat.JSON).toEntitySet(IOUtils.toInputStream(fromSection45_2));
+ client.getDeserializer(ODataFormat.JSON).toEntitySet(IOUtils.toInputStream(fromSection45_2));
assertEquals(5, entitySet.getPayload().getCount(), 0);
assertEquals("Customers?$expand=Orders&$skipToken=5", entitySet.getPayload().getNext().toASCIIString());
@@ -250,28 +250,28 @@ public class JSONFormatConformanceTestITCase extends AbstractTestITCase {
/**
* MUST be prepared to receive any annotations, including custom annotations and <tt>odata</tt> annotations not
- * defined in the <tt>OData-Version</tt> header of the payload (section 20).
+ * defined in the <tt>OData-Version</tt> header of the payload (section 20).
*/
@Test
public void item5() throws Exception {
final String sample = "{"
- + " \"@odata.context\": \"http://host/service/$metadata#Customers\","
- + " \"@odata.notdefined\": 11,"
- + " \"@com.contoso.customer.setkind\": \"VIPs\","
- + " \"value\": ["
- + " {"
- + " \"@com.contoso.display.highlight\": true,"
- + " \"ID\": \"ALFKI\","
- + " \"CompanyName@com.contoso.display.style\": { \"title\": true, \"order\": 1 },"
- + " \"CompanyName\": \"Alfreds Futterkiste\","
- + " \"Orders@com.contoso.display.style\": { \"order\": 2 },"
- + " \"Orders@odata.navigationLink\": \"People(976)/Orders\""
- + " }"
- + " ]"
- + "}";
+ + " \"@odata.context\": \"http://host/service/$metadata#Customers\","
+ + " \"@odata.notdefined\": 11,"
+ + " \"@com.contoso.customer.setkind\": \"VIPs\","
+ + " \"value\": ["
+ + " {"
+ + " \"@com.contoso.display.highlight\": true,"
+ + " \"ID\": \"ALFKI\","
+ + " \"CompanyName@com.contoso.display.style\": { \"title\": true, \"order\": 1 },"
+ + " \"CompanyName\": \"Alfreds Futterkiste\","
+ + " \"Orders@com.contoso.display.style\": { \"order\": 2 },"
+ + " \"Orders@odata.navigationLink\": \"People(976)/Orders\""
+ + " }"
+ + " ]"
+ + "}";
final ODataEntitySet entitySet = client.getReader().
- readEntitySet(IOUtils.toInputStream(sample), ODataFormat.JSON);
+ readEntitySet(IOUtils.toInputStream(sample), ODataFormat.JSON);
assertEquals(2, entitySet.getAnnotations().size());
@@ -314,8 +314,8 @@ public class JSONFormatConformanceTestITCase extends AbstractTestITCase {
@Test
public void item6() throws EdmPrimitiveTypeException {
final URI uri = edmClient.newURIBuilder().
- appendEntitySetSegment("Accounts").appendKeySegment(102).
- appendNavigationSegment("MyPaymentInstruments").appendKeySegment(102902).build();
+ appendEntitySetSegment("Accounts").appendKeySegment(102).
+ appendNavigationSegment("MyPaymentInstruments").appendKeySegment(102902).build();
final ODataEntityRequest<ODataEntity> req = edmClient.getRetrieveRequestFactory().getEntityRequest(uri);
// request format (via Accept header) does not contain odata.streaming=true
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java
index 612619f..91da2c5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -52,7 +52,7 @@ public class KeyAsSegmentTestITCase extends AbstractTestITCase {
private void read(final ODataFormat format) {
final URIBuilder uriBuilder = client.newURIBuilder(testKeyAsSegmentServiceRootURL).
- appendEntitySetSegment("Accounts").appendKeySegment(101);
+ appendEntitySetSegment("Accounts").appendKeySegment(101);
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setFormat(format);
@@ -90,15 +90,15 @@ public class KeyAsSegmentTestITCase extends AbstractTestITCase {
private void update(final ODataFormat format) {
final ODataEntity changes = getClient().getObjectFactory().newEntity(
- new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
+ new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
final ODataProperty middleName = getClient().getObjectFactory().newPrimitiveProperty("MiddleName",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("middle"));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("middle"));
changes.getProperties().add(middleName);
final URI uri = getClient().newURIBuilder(testKeyAsSegmentServiceRootURL).
- appendEntitySetSegment("People").appendKeySegment(5).build();
+ appendEntitySetSegment("People").appendKeySegment(5).build();
final ODataEntityUpdateRequest<ODataEntity> req = getClient().getCUDRequestFactory().
- getEntityUpdateRequest(uri, UpdateType.PATCH, changes);
+ getEntityUpdateRequest(uri, UpdateType.PATCH, changes);
req.setFormat(format);
final ODataEntityUpdateResponse<ODataEntity> res = req.execute();
[18/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalMediaEntityTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalMediaEntityTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalMediaEntityTestITCase.java
index 2f23551..53d1c89 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalMediaEntityTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalMediaEntityTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java
index 035b7a3..82e05d6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java
@@ -1,33 +1,34 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.UUID;
+
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.ext.proxy.EntityContainerFactory;
@@ -54,7 +55,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
public static void initContainer() {
otcontainerFactory = EntityContainerFactory.getV4(testOpenTypeServiceRootURL);
otcontainerFactory.getClient().getConfiguration().
- setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
+ setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
otcontainer = otcontainerFactory.getEntityContainer(DefaultContainer.class);
assertNotNull(otcontainer);
}
@@ -62,11 +63,11 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
@Test
public void checkOpenTypeEntityTypesExist() {
assertTrue(otcontainer.getRow().newRow().getClass().getInterfaces()[0].
- getAnnotation(EntityType.class).openType());
+ getAnnotation(EntityType.class).openType());
assertTrue(otcontainer.getRowIndex().newRowIndex().getClass().getInterfaces()[0].
- getAnnotation(EntityType.class).openType());
+ getAnnotation(EntityType.class).openType());
assertTrue(otcontainer.getRow().newIndexedRow().getClass().getInterfaces()[0].
- getAnnotation(EntityType.class).openType());
+ getAnnotation(EntityType.class).openType());
otcontainerFactory.getContext().detachAll();
}
@@ -138,7 +139,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
assertEquals("Fabio", AccountInfo.class.cast(rowIndex.getAdditionalProperty("info")).getFirstName());
assertEquals("Martelli", AccountInfo.class.cast(rowIndex.getAdditionalProperty("info")).getLastName());
assertEquals("fabio.martelli@tirasa.net", AccountInfo.class.cast(rowIndex.getAdditionalProperty("info")).
- getAdditionalProperty("email"));
+ getAdditionalProperty("email"));
otcontainerFactory.getContext().detachAll();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OperationImportInvokeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OperationImportInvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OperationImportInvokeTestITCase.java
index 7231ddc..c75acd2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OperationImportInvokeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OperationImportInvokeTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -23,12 +23,14 @@ import static org.junit.Assert.assertTrue;
import java.util.Arrays;
import java.util.Collection;
+
+//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.
- ProductCollection;
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection;
+//CHECKSTYLE:ON (Maven checkstyle)
import org.junit.Test;
public class OperationImportInvokeTestITCase extends AbstractTestITCase {
@@ -90,7 +92,7 @@ public class OperationImportInvokeTestITCase extends AbstractTestITCase {
@Test
public void bossEmails() {
final Collection<String> result = container.operations().resetBossEmail(Arrays.asList(
- new String[] {"first@olingo.apache.org", "second@olingo.apache.org"}));
+ new String[] { "first@olingo.apache.org", "second@olingo.apache.org" }));
assertEquals(2, result.size());
final Collection<String> result2 = container.operations().getBossEmails(0, 100);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/PropertyTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/PropertyTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/PropertyTestITCase.java
index 0446809..3c39b68 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/PropertyTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/PropertyTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/SingletonTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/SingletonTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/SingletonTestITCase.java
index ae1ef53..91b32f3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/SingletonTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/SingletonTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/UnauthorizedEntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/UnauthorizedEntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/UnauthorizedEntityCreateTestITCase.java
index 188a491..daf9ac5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/UnauthorizedEntityCreateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/UnauthorizedEntityCreateTestITCase.java
@@ -1,29 +1,28 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4;
import org.apache.olingo.client.api.http.HttpClientException;
+import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.ext.proxy.EntityContainerFactory;
-
-import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
import org.junit.Test;
@@ -38,7 +37,7 @@ public class UnauthorizedEntityCreateTestITCase extends AbstractTestITCase {
ecf = EntityContainerFactory.getV4(testAuthServiceRootURL);
ecf.getClient().getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
ecf.getClient().getConfiguration().
- setHttpClientFactory(new BasicAuthHttpClientFactory("not_auth", "not_auth"));
+ setHttpClientFactory(new BasicAuthHttpClientFactory("not_auth", "not_auth"));
}
return ecf;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Advertisements.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Advertisements.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Advertisements.java
index 4b6c17e..542e819 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Advertisements.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Advertisements.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,13 @@
package org.apache.olingo.fit.proxy.v4.demo.odatademo;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Advertisements")
-public interface Advertisements
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement, java.util.UUID, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection> {
+public interface Advertisements
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement, java.util.UUID, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection> {
+
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement newAdvertisement();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement newAdvertisement();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection newAdvertisementCollection();
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection newAdvertisementCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Categories.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Categories.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Categories.java
index 8fea038..dba12dd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Categories.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Categories.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,13 @@
package org.apache.olingo.fit.proxy.v4.demo.odatademo;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Categories")
-public interface Categories
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Category, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection> {
+public interface Categories
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Category, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection> {
+
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Category newCategory();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Category newCategory();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection newCategoryCollection();
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection newCategoryCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java
index 920e022..afe0549 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java
@@ -1,83 +1,66 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.demo.odatademo;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.PersistenceManager;
import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+import org.apache.olingo.ext.proxy.api.PersistenceManager;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
@org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "DemoService",
- namespace = "ODataDemo",
- isDefaultEntityContainer = true)
+ namespace = "ODataDemo",
+ isDefaultEntityContainer = true)
public interface DemoService extends PersistenceManager {
- Products getProducts();
- Advertisements getAdvertisements();
- Persons getPersons();
- Categories getCategories();
- PersonDetails getPersonDetails();
- Suppliers getSuppliers();
- ProductDetails getProductDetails();
+ Products getProducts();
+
+ Advertisements getAdvertisements();
+
+ Persons getPersons();
+
+ Categories getCategories();
+
+ PersonDetails getPersonDetails();
+ Suppliers getSuppliers();
+ ProductDetails getProductDetails();
Operations operations();
public interface Operations {
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "IncreaseSalaries",
- type = OperationType.ACTION)
- void increaseSalaries(
- @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "percentage", type = "Edm.Int32", nullable = false) java.lang.Integer percentage
- );
-
- }
-
- ComplexFactory complexFactory();
-
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
- type = "ODataDemo.Address")
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address newAddress();
-
- }
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "IncreaseSalaries",
+ type = OperationType.ACTION)
+ void increaseSalaries(
+ @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "percentage", type = "Edm.Int32",
+ nullable = false) java.lang.Integer percentage
+ );
+
+ }
+
+ ComplexFactory complexFactory();
+
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
+ type = "ODataDemo.Address")
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address newAddress();
+
}
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java
index 0e9ed6f..449ced3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,13 @@
package org.apache.olingo.fit.proxy.v4.demo.odatademo;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "PersonDetails")
-public interface PersonDetails
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetailCollection> {
+public interface PersonDetails
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetailCollection> {
+
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail newPersonDetail();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail newPersonDetail();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetailCollection newPersonDetailCollection();
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetailCollection newPersonDetailCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java
index 0e7a48a..0feac2d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,37 +20,21 @@
package org.apache.olingo.fit.proxy.v4.demo.odatademo;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Persons")
-public interface Persons
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonCollection> {
-
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person newPerson();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonCollection newPersonCollection();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Customer newCustomer();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CustomerCollection newCustomerCollection();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Employee newEmployee();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.EmployeeCollection newEmployeeCollection();
+public interface Persons
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonCollection> {
+
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person newPerson();
+
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonCollection newPersonCollection();
+
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Customer newCustomer();
+
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CustomerCollection newCustomerCollection();
+
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Employee newEmployee();
+
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.EmployeeCollection newEmployeeCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java
index fa876c7..eafbaf3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,13 @@
package org.apache.olingo.fit.proxy.v4.demo.odatademo;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductDetails")
-public interface ProductDetails
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetailCollection> {
+public interface ProductDetails
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetailCollection> {
+
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail newProductDetail();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail newProductDetail();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetailCollection newProductDetailCollection();
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetailCollection newProductDetailCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java
index 554f169..088f24c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,35 +20,17 @@
package org.apache.olingo.fit.proxy.v4.demo.odatademo;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Products")
+public interface Products
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection> {
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product newProduct();
-@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Products")
-public interface Products
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection> {
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection newProductCollection();
+
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct newFeaturedProduct();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product newProduct();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection newProductCollection();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct newFeaturedProduct();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProductCollection newFeaturedProductCollection();
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProductCollection newFeaturedProductCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java
index 48bd7ec..15daec9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,13 @@
package org.apache.olingo.fit.proxy.v4.demo.odatademo;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Suppliers")
-public interface Suppliers
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.SupplierCollection> {
+public interface Suppliers
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.SupplierCollection> {
+
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier newSupplier();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier newSupplier();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.SupplierCollection newSupplierCollection();
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.SupplierCollection newSupplierCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/package-info.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/package-info.java
index 1d277f0..4d8ffea 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/package-info.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/package-info.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Address.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Address.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Address.java
index 3c23d57..d6b54b5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Address.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Address.java
@@ -1,178 +1,136 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.demo.odatademo.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Address",
- isOpenType = false,
- isAbstract = false)
-public interface Address
+ isOpenType = false,
+ isAbstract = false)
+public interface Address
extends java.io.Serializable {
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.String getStreet();
-
- void setStreet(java.lang.String _street);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.String getCity();
-
- void setCity(java.lang.String _city);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "State",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.String getState();
-
- void setState(java.lang.String _state);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ZipCode",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.String getZipCode();
-
- void setZipCode(java.lang.String _zipCode);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Country",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.String getCountry();
-
- void setCountry(java.lang.String _country);
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Street",
- type = "Edm.String")
- Annotatable getStreetAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "City",
- type = "Edm.String")
- Annotatable getCityAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "State",
- type = "Edm.String")
- Annotatable getStateAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ZipCode",
- type = "Edm.String")
- Annotatable getZipCodeAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Country",
- type = "Edm.String")
- Annotatable getCountryAnnotations();
-
-
- }
-
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getStreet();
+
+ void setStreet(java.lang.String _street);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getCity();
+
+ void setCity(java.lang.String _city);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "State",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getState();
+
+ void setState(java.lang.String _state);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ZipCode",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getZipCode();
+
+ void setZipCode(java.lang.String _zipCode);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Country",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getCountry();
+
+ void setCountry(java.lang.String _country);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Street",
+ type = "Edm.String")
+ Annotatable getStreetAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "City",
+ type = "Edm.String")
+ Annotatable getCityAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "State",
+ type = "Edm.String")
+ Annotatable getStateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ZipCode",
+ type = "Edm.String")
+ Annotatable getZipCodeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Country",
+ type = "Edm.String")
+ Annotatable getCountryAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Advertisement.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Advertisement.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Advertisement.java
index 4c5e91f..e519285 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Advertisement.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Advertisement.java
@@ -1,176 +1,141 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.demo.odatademo.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Advertisement",
- openType = false,
- hasStream = true,
- isAbstract = false)
-public interface Advertisement
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
- type = "Edm.Guid",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.UUID getID();
-
- void setID(java.util.UUID _iD);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AirDate",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getAirDate();
-
- void setAirDate(java.util.Calendar _airDate);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "FeaturedProduct",
- type = "ODataDemo.FeaturedProduct",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "Products",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct getFeaturedProduct();
-
- void setFeaturedProduct(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct _featuredProduct);
-
- void setStream(java.io.InputStream stream);
-
- java.io.InputStream getStream();
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
- type = "Edm.Guid")
- Annotatable getIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "AirDate",
- type = "Edm.DateTimeOffset")
- Annotatable getAirDateAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "FeaturedProduct",
- type = "ODataDemo.FeaturedProduct")
- Annotatable getFeaturedProductAnnotations();
- }
+ openType = false,
+ hasStream = true,
+ isAbstract = false)
+public interface Advertisement
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
+ type = "Edm.Guid",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.UUID getID();
+
+ void setID(java.util.UUID _iD);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AirDate",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getAirDate();
+
+ void setAirDate(java.util.Calendar _airDate);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "FeaturedProduct",
+ type = "ODataDemo.FeaturedProduct",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "Products",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct getFeaturedProduct();
+
+ void setFeaturedProduct(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct _featuredProduct);
+
+ void setStream(java.io.InputStream stream);
+
+ java.io.InputStream getStream();
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
+ type = "Edm.Guid")
+ Annotatable getIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "AirDate",
+ type = "Edm.DateTimeOffset")
+ Annotatable getAirDateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "FeaturedProduct",
+ type = "ODataDemo.FeaturedProduct")
+ Annotatable getFeaturedProductAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java
index cb5c6ad..8177b24 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java
@@ -1,50 +1,31 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.demo.odatademo.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface AdvertisementCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement> {
+public interface AdvertisementCollection extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Category.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Category.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Category.java
index afe06c2..81690a0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Category.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Category.java
@@ -1,146 +1,112 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.demo.odatademo.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Category",
- openType = true,
- hasStream = false,
- isAbstract = false)
-public interface Category
- extends Annotatable,AbstractOpenType {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getID();
-
- void setID(java.lang.Integer _iD);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Products",
- type = "ODataDemo.Product",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "Products",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection getProducts();
-
- void setProducts(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection _products);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
- type = "Edm.Int32")
- Annotatable getIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Products",
- type = "ODataDemo.Product")
- Annotatable getProductsAnnotations();
- }
+ openType = true,
+ hasStream = false,
+ isAbstract = false)
+public interface Category
+ extends Annotatable, AbstractOpenType {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getID();
+
+ void setID(java.lang.Integer _iD);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Products",
+ type = "ODataDemo.Product",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "Products",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection getProducts();
+
+ void setProducts(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection _products);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
+ type = "Edm.Int32")
+ Annotatable getIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Products",
+ type = "ODataDemo.Product")
+ Annotatable getProductsAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java
index cb532b0..5d1f50c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java
@@ -1,50 +1,31 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.demo.odatademo.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface CategoryCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Category> {
+public interface CategoryCollection extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Category> {
Object getAnnotation(Class<? extends AbstractTerm> term);
[35/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
index f422b25..0ee0bc8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
@@ -1,282 +1,270 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ProductPageView",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.PageView")
-public interface ProductPageView
- extends Annotatable,org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageViewId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPageViewId();
-
- void setPageViewId(java.lang.Integer _pageViewId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Username",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getUsername();
-
- void setUsername(java.lang.String _username);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Viewed",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getViewed();
-
- void setViewed(java.util.Calendar _viewed);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TimeSpentOnPage",
- type = "Edm.Time",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.math.BigDecimal getTimeSpentOnPage();
-
- void setTimeSpentOnPage(java.math.BigDecimal _timeSpentOnPage);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageUrl",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getPageUrl();
-
- void setPageUrl(java.lang.String _pageUrl);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductId();
-
- void setProductId(java.lang.Integer _productId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getConcurrencyToken();
-
- void setConcurrencyToken(java.lang.String _concurrencyToken);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login getLogin();
-
- void setLogin(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView.ComplexFactory{
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PageViewId",
- type = "Edm.Int32")
- Annotatable getPageViewIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Username",
- type = "Edm.String")
- Annotatable getUsernameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Viewed",
- type = "Edm.DateTimeOffset")
- Annotatable getViewedAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TimeSpentOnPage",
- type = "Edm.Time")
- Annotatable getTimeSpentOnPageAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PageUrl",
- type = "Edm.String")
- Annotatable getPageUrlAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
- type = "Edm.Int32")
- Annotatable getProductIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
- type = "Edm.String")
- Annotatable getConcurrencyTokenAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
- Annotatable getLoginAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.PageView")
+public interface ProductPageView
+ extends Annotatable,
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView {
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageViewId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPageViewId();
+
+ @Override
+ void setPageViewId(java.lang.Integer _pageViewId);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Username",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getUsername();
+
+ @Override
+ void setUsername(java.lang.String _username);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Viewed",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getViewed();
+
+ @Override
+ void setViewed(java.util.Calendar _viewed);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TimeSpentOnPage",
+ type = "Edm.Time",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.math.BigDecimal getTimeSpentOnPage();
+
+ @Override
+ void setTimeSpentOnPage(java.math.BigDecimal _timeSpentOnPage);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageUrl",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getPageUrl();
+
+ @Override
+ void setPageUrl(java.lang.String _pageUrl);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductId();
+
+ void setProductId(java.lang.Integer _productId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getConcurrencyToken();
+
+ void setConcurrencyToken(java.lang.String _concurrencyToken);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Login",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login
+ getLogin();
+
+ @Override
+ void
+ setLogin(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory
+ extends
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView.ComplexFactory {}
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations
+ extends
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PageViewId",
+ type = "Edm.Int32")
+ Annotatable getPageViewIdAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Username",
+ type = "Edm.String")
+ Annotatable getUsernameAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Viewed",
+ type = "Edm.DateTimeOffset")
+ Annotatable getViewedAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TimeSpentOnPage",
+ type = "Edm.Time")
+ Annotatable getTimeSpentOnPageAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PageUrl",
+ type = "Edm.String")
+ Annotatable getPageUrlAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
+ type = "Edm.String")
+ Annotatable getConcurrencyTokenAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getLoginAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java
index fe70955..d65b0c1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface ProductPageViewCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPageView> {
+public interface ProductPageViewCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPageView> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java
index 00c81ee..05cea6a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java
@@ -1,159 +1,127 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
@KeyRef(ProductPhotoKey.class)
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ProductPhoto",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface ProductPhoto
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductId();
-
- void setProductId(java.lang.Integer _productId);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PhotoId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPhotoId();
-
- void setPhotoId(java.lang.Integer _photoId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Photo",
- type = "Edm.Binary",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- byte[] getPhoto();
-
- void setPhoto(byte[] _photo);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
- type = "Edm.Int32")
- Annotatable getProductIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PhotoId",
- type = "Edm.Int32")
- Annotatable getPhotoIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Photo",
- type = "Edm.Binary")
- Annotatable getPhotoAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface ProductPhoto
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductId();
+
+ void setProductId(java.lang.Integer _productId);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PhotoId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPhotoId();
+
+ void setPhotoId(java.lang.Integer _photoId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Photo",
+ type = "Edm.Binary",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ byte[] getPhoto();
+
+ void setPhoto(byte[] _photo);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PhotoId",
+ type = "Edm.Int32")
+ Annotatable getPhotoIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Photo",
+ type = "Edm.Binary")
+ Annotatable getPhotoAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java
index 8015f2d..2ec5e2a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface ProductPhotoCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto> {
+public interface ProductPhotoCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java
index b778fc5..e17372a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java
@@ -1,74 +1,50 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.AbstractEntityKey;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class ProductPhotoKey extends AbstractEntityKey {
- private java.lang.Integer _photoId;
+ private static final long serialVersionUID = 1L;
+ private java.lang.Integer _photoId;
- @CompoundKeyElement(name = "PhotoId", position = 0)
- public java.lang.Integer getPhotoId() {
- return _photoId;
- }
+ @CompoundKeyElement(name = "PhotoId", position = 0)
+ public java.lang.Integer getPhotoId() {
+ return _photoId;
+ }
- public void setPhotoId(java.lang.Integer _photoId) {
- this._photoId = _photoId;
- }
+ public void setPhotoId(final java.lang.Integer _photoId) {
+ this._photoId = _photoId;
+ }
- private java.lang.Integer _productId;
+ private java.lang.Integer _productId;
- @CompoundKeyElement(name = "ProductId", position = 1)
- public java.lang.Integer getProductId() {
- return _productId;
- }
+ @CompoundKeyElement(name = "ProductId", position = 1)
+ public java.lang.Integer getProductId() {
+ return _productId;
+ }
- public void setProductId(java.lang.Integer _productId) {
- this._productId = _productId;
- }
+ public void setProductId(final java.lang.Integer _productId) {
+ this._productId = _productId;
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java
index a598d43..2c8b132 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java
@@ -1,200 +1,170 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
@KeyRef(ProductReviewKey.class)
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ProductReview",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface ProductReview
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductId();
-
- void setProductId(java.lang.Integer _productId);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReviewId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getReviewId();
-
- void setReviewId(java.lang.Integer _reviewId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Review",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getReview();
-
- void setReview(java.lang.String _review);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "RevisionId",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getRevisionId();
-
- void setRevisionId(java.lang.String _revisionId);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Product",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product getProduct();
-
- void setProduct(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
- type = "Edm.Int32")
- Annotatable getProductIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ReviewId",
- type = "Edm.Int32")
- Annotatable getReviewIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Review",
- type = "Edm.String")
- Annotatable getReviewAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "RevisionId",
- type = "Edm.String")
- Annotatable getRevisionIdAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
- Annotatable getProductAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface ProductReview
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductId();
+
+ void setProductId(java.lang.Integer _productId);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReviewId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getReviewId();
+
+ void setReviewId(java.lang.Integer _reviewId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Review",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getReview();
+
+ void setReview(java.lang.String _review);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "RevisionId",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getRevisionId();
+
+ void setRevisionId(java.lang.String _revisionId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Product",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product
+ getProduct();
+
+ void
+ setProduct(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ReviewId",
+ type = "Edm.Int32")
+ Annotatable getReviewIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Review",
+ type = "Edm.String")
+ Annotatable getReviewAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "RevisionId",
+ type = "Edm.String")
+ Annotatable getRevisionIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getProductAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java
index 5280441..67ea739 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface ProductReviewCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview> {
+public interface ProductReviewCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java
index f62a5b1..1996edd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java
@@ -1,85 +1,61 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.AbstractEntityKey;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class ProductReviewKey extends AbstractEntityKey {
- private java.lang.Integer _productId;
+ private static final long serialVersionUID = 1L;
+ private java.lang.Integer _productId;
- @CompoundKeyElement(name = "ProductId", position = 0)
- public java.lang.Integer getProductId() {
- return _productId;
- }
+ @CompoundKeyElement(name = "ProductId", position = 0)
+ public java.lang.Integer getProductId() {
+ return _productId;
+ }
- public void setProductId(java.lang.Integer _productId) {
- this._productId = _productId;
- }
+ public void setProductId(final java.lang.Integer _productId) {
+ this._productId = _productId;
+ }
- private java.lang.Integer _reviewId;
+ private java.lang.Integer _reviewId;
- @CompoundKeyElement(name = "ReviewId", position = 1)
- public java.lang.Integer getReviewId() {
- return _reviewId;
- }
+ @CompoundKeyElement(name = "ReviewId", position = 1)
+ public java.lang.Integer getReviewId() {
+ return _reviewId;
+ }
- public void setReviewId(java.lang.Integer _reviewId) {
- this._reviewId = _reviewId;
- }
+ public void setReviewId(final java.lang.Integer _reviewId) {
+ this._reviewId = _reviewId;
+ }
- private java.lang.String _revisionId;
+ private java.lang.String _revisionId;
- @CompoundKeyElement(name = "RevisionId", position = 2)
- public java.lang.String getRevisionId() {
- return _revisionId;
- }
+ @CompoundKeyElement(name = "RevisionId", position = 2)
+ public java.lang.String getRevisionId() {
+ return _revisionId;
+ }
- public void setRevisionId(java.lang.String _revisionId) {
- this._revisionId = _revisionId;
- }
+ public void setRevisionId(final java.lang.String _revisionId) {
+ this._revisionId = _revisionId;
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java
index 7de79ca..64a10bd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java
@@ -1,146 +1,114 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "RSAToken",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface RSAToken
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Serial",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getSerial();
-
- void setSerial(java.lang.String _serial);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Issued",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getIssued();
-
- void setIssued(java.util.Calendar _issued);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login getLogin();
-
- void setLogin(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Serial",
- type = "Edm.String")
- Annotatable getSerialAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Issued",
- type = "Edm.DateTime")
- Annotatable getIssuedAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
- Annotatable getLoginAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface RSAToken
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Serial",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getSerial();
+
+ void setSerial(java.lang.String _serial);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Issued",
+ type = "Edm.DateTime",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getIssued();
+
+ void setIssued(java.util.Calendar _issued);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Login",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login
+ getLogin();
+
+ void
+ setLogin(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Serial",
+ type = "Edm.String")
+ Annotatable getSerialAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Issued",
+ type = "Edm.DateTime")
+ Annotatable getIssuedAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getLoginAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java
index 0639322..c561d0b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface RSATokenCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken> {
+public interface RSATokenCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken> {
Object getAnnotation(Class<? extends AbstractTerm> term);
[39/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
index 8eacb63..dea41d8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
@@ -1,200 +1,166 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "LastLogin",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface LastLogin
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Username",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getUsername();
-
- void setUsername(java.lang.String _username);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LoggedIn",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getLoggedIn();
-
- void setLoggedIn(java.util.Calendar _loggedIn);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LoggedOut",
- type = "Edm.DateTime",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getLoggedOut();
-
- void setLoggedOut(java.util.Calendar _loggedOut);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Duration",
- type = "Edm.Time",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.math.BigDecimal getDuration();
-
- void setDuration(java.math.BigDecimal _duration);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login getLogin();
-
- void setLogin(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Username",
- type = "Edm.String")
- Annotatable getUsernameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LoggedIn",
- type = "Edm.DateTime")
- Annotatable getLoggedInAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LoggedOut",
- type = "Edm.DateTime")
- Annotatable getLoggedOutAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Duration",
- type = "Edm.Time")
- Annotatable getDurationAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
- Annotatable getLoginAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface LastLogin
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Username",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getUsername();
+
+ void setUsername(java.lang.String _username);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LoggedIn",
+ type = "Edm.DateTime",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getLoggedIn();
+
+ void setLoggedIn(java.util.Calendar _loggedIn);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LoggedOut",
+ type = "Edm.DateTime",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getLoggedOut();
+
+ void setLoggedOut(java.util.Calendar _loggedOut);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Duration",
+ type = "Edm.Time",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.math.BigDecimal getDuration();
+
+ void setDuration(java.math.BigDecimal _duration);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Login",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login
+ getLogin();
+
+ void
+ setLogin(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Username",
+ type = "Edm.String")
+ Annotatable getUsernameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LoggedIn",
+ type = "Edm.DateTime")
+ Annotatable getLoggedInAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LoggedOut",
+ type = "Edm.DateTime")
+ Annotatable getLoggedOutAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Duration",
+ type = "Edm.Time")
+ Annotatable getDurationAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getLoginAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
index ee12998..19541ae 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface LastLoginCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin> {
+public interface LastLoginCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/License.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/License.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/License.java
index be634c1..1e4ec05 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/License.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/License.java
@@ -1,227 +1,192 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "License",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface License
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LicenseNumber",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getLicenseNumber();
-
- void setLicenseNumber(java.lang.String _licenseNumber);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LicenseClass",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getLicenseClass();
-
- void setLicenseClass(java.lang.String _licenseClass);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Restrictions",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getRestrictions();
-
- void setRestrictions(java.lang.String _restrictions);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ExpirationDate",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getExpirationDate();
-
- void setExpirationDate(java.util.Calendar _expirationDate);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Driver",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Driver",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Driver",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Driver getDriver();
-
- void setDriver(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Driver _driver);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LicenseNumber",
- type = "Edm.String")
- Annotatable getLicenseNumberAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LicenseClass",
- type = "Edm.String")
- Annotatable getLicenseClassAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Restrictions",
- type = "Edm.String")
- Annotatable getRestrictionsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ExpirationDate",
- type = "Edm.DateTime")
- Annotatable getExpirationDateAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Driver",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Driver")
- Annotatable getDriverAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface License
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LicenseNumber",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getLicenseNumber();
+
+ void setLicenseNumber(java.lang.String _licenseNumber);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LicenseClass",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getLicenseClass();
+
+ void setLicenseClass(java.lang.String _licenseClass);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Restrictions",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getRestrictions();
+
+ void setRestrictions(java.lang.String _restrictions);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ExpirationDate",
+ type = "Edm.DateTime",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getExpirationDate();
+
+ void setExpirationDate(java.util.Calendar _expirationDate);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Driver",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Driver",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Driver",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Driver
+ getDriver();
+
+ void
+ setDriver(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Driver _driver);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LicenseNumber",
+ type = "Edm.String")
+ Annotatable getLicenseNumberAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LicenseClass",
+ type = "Edm.String")
+ Annotatable getLicenseClassAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Restrictions",
+ type = "Edm.String")
+ Annotatable getRestrictionsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ExpirationDate",
+ type = "Edm.DateTime")
+ Annotatable getExpirationDateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Driver",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Driver")
+ Annotatable getDriverAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
index 38a0efa..e8405c4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface LicenseCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.License> {
+public interface LicenseCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.License> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Login.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
index 4b7bb7f..7f8d7a0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
@@ -1,202 +1,182 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Login",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Login
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Username",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getUsername();
-
- void setUsername(java.lang.String _username);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getCustomerId();
-
- void setCustomerId(java.lang.Integer _customerId);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Customer",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Customer",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer getCustomer();
-
- void setCustomer(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer _customer);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "LastLogin",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.LastLogin",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "LastLogin",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin getLastLogin();
-
- void setLastLogin(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin _lastLogin);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "SentMessages",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Message",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Message",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection getSentMessages();
-
- void setSentMessages(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection _sentMessages);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ReceivedMessages",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Message",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Message",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection getReceivedMessages();
-
- void setReceivedMessages(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection _receivedMessages);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Orders",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Order",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection getOrders();
-
- void setOrders(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection _orders);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Username",
- type = "Edm.String")
- Annotatable getUsernameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerId",
- type = "Edm.Int32")
- Annotatable getCustomerIdAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Customer",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
- Annotatable getCustomerAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "LastLogin",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.LastLogin")
- Annotatable getLastLoginAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "SentMessages",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Message")
- Annotatable getSentMessagesAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ReceivedMessages",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Message")
- Annotatable getReceivedMessagesAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Orders",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
- Annotatable getOrdersAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Login
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Username",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getUsername();
+
+ void setUsername(java.lang.String _username);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getCustomerId();
+
+ void setCustomerId(java.lang.Integer _customerId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Customer",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Customer",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer
+ getCustomer();
+
+ void
+ setCustomer(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer _customer);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "LastLogin",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.LastLogin",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "LastLogin",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin
+ getLastLogin();
+
+ void
+ setLastLogin(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin _lastLogin);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "SentMessages",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Message",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Message",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection
+ getSentMessages();
+
+ void
+ setSentMessages(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection _sentMessages);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ReceivedMessages",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Message",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Message",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection
+ getReceivedMessages();
+
+ void
+ setReceivedMessages(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection _receivedMessages);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Orders",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Order",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection
+ getOrders();
+
+ void
+ setOrders(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection _orders);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Username",
+ type = "Edm.String")
+ Annotatable getUsernameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerId",
+ type = "Edm.Int32")
+ Annotatable getCustomerIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Customer",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
+ Annotatable getCustomerAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "LastLogin",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.LastLogin")
+ Annotatable getLastLoginAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "SentMessages",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Message")
+ Annotatable getSentMessagesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ReceivedMessages",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Message")
+ Annotatable getReceivedMessagesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Orders",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
+ Annotatable getOrdersAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java
index eed0927..f32f31f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface LoginCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login> {
+public interface LoginCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login> {
Object getAnnotation(Class<? extends AbstractTerm> term);
[32/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinaryCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinaryCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinaryCollection.java
index b3031aa..f6cc44e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinaryCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinaryCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface EdmBinaryCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBinary> {
+public interface EdmBinaryCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBinary> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBoolean.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBoolean.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBoolean.java
index b08b447..5622cd4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBoolean.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBoolean.java
@@ -1,105 +1,72 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmBoolean",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface EdmBoolean
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Boolean",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Boolean getId();
-
- void setId(java.lang.Boolean _id);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Boolean")
- Annotatable getIdAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface EdmBoolean
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Boolean",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Boolean getId();
+
+ void setId(java.lang.Boolean _id);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Boolean")
+ Annotatable getIdAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBooleanCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBooleanCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBooleanCollection.java
index c900191..9f61c72 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBooleanCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBooleanCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface EdmBooleanCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBoolean> {
+public interface EdmBooleanCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBoolean> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByte.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByte.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByte.java
index 2eb7acf..e3511b5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByte.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByte.java
@@ -1,105 +1,72 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmByte",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface EdmByte
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Byte",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Short getId();
-
- void setId(java.lang.Short _id);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Byte")
- Annotatable getIdAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface EdmByte
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Byte",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Short getId();
+
+ void setId(java.lang.Short _id);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Byte")
+ Annotatable getIdAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByteCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByteCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByteCollection.java
index c69e742..c3d7696 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByteCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByteCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface EdmByteCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmByte> {
+public interface EdmByteCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmByte> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTime.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTime.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTime.java
index dc5994f..48f8153 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTime.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTime.java
@@ -1,105 +1,72 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmDateTime",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface EdmDateTime
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getId();
-
- void setId(java.util.Calendar _id);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.DateTime")
- Annotatable getIdAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface EdmDateTime
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.DateTime",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getId();
+
+ void setId(java.util.Calendar _id);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.DateTime")
+ Annotatable getIdAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeCollection.java
index 8faa93a..be603ff 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface EdmDateTimeCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTime> {
+public interface EdmDateTimeCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTime> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffset.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffset.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffset.java
index e04f876..1db5703 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffset.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffset.java
@@ -1,105 +1,72 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmDateTimeOffset",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface EdmDateTimeOffset
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getId();
-
- void setId(java.util.Calendar _id);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.DateTimeOffset")
- Annotatable getIdAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface EdmDateTimeOffset
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getId();
+
+ void setId(java.util.Calendar _id);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.DateTimeOffset")
+ Annotatable getIdAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffsetCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffsetCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffsetCollection.java
index 65ca0a5..951c0d9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffsetCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffsetCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface EdmDateTimeOffsetCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeOffset> {
+public interface EdmDateTimeOffsetCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeOffset> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimal.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimal.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimal.java
index a5c77eb..87e999d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimal.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimal.java
@@ -1,105 +1,72 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmDecimal",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface EdmDecimal
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Decimal",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.math.BigDecimal getId();
-
- void setId(java.math.BigDecimal _id);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Decimal")
- Annotatable getIdAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface EdmDecimal
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Decimal",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.math.BigDecimal getId();
+
+ void setId(java.math.BigDecimal _id);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Decimal")
+ Annotatable getIdAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimalCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimalCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimalCollection.java
index 35eecd2..044ab4e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimalCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimalCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface EdmDecimalCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDecimal> {
+public interface EdmDecimalCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDecimal> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDouble.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDouble.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDouble.java
index 672ba9d..9efda05 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDouble.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDouble.java
@@ -1,105 +1,72 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmDouble",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface EdmDouble
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Double",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Double getId();
-
- void setId(java.lang.Double _id);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Double")
- Annotatable getIdAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface EdmDouble
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Double",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Double getId();
+
+ void setId(java.lang.Double _id);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Double")
+ Annotatable getIdAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDoubleCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDoubleCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDoubleCollection.java
index 1f6d7d3..8342c8a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDoubleCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDoubleCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface EdmDoubleCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDouble> {
+public interface EdmDoubleCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDouble> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuid.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuid.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuid.java
index e434aa5..9eed898 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuid.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuid.java
@@ -1,105 +1,72 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmGuid",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface EdmGuid
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Guid",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.UUID getId();
-
- void setId(java.util.UUID _id);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Guid")
- Annotatable getIdAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface EdmGuid
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Guid",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.UUID getId();
+
+ void setId(java.util.UUID _id);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Guid")
+ Annotatable getIdAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuidCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuidCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuidCollection.java
index e98e32e..31c11df 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuidCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuidCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface EdmGuidCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmGuid> {
+public interface EdmGuidCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmGuid> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16.java
index 9252ed4..c55a383 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16.java
@@ -1,105 +1,72 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmInt16",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface EdmInt16
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Int16",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Short getId();
-
- void setId(java.lang.Short _id);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Int16")
- Annotatable getIdAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface EdmInt16
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Int16",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Short getId();
+
+ void setId(java.lang.Short _id);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int16")
+ Annotatable getIdAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16Collection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16Collection.java
index 82c20f9..271e2ed 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16Collection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16Collection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface EdmInt16Collection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt16> {
+public interface EdmInt16Collection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt16> {
Object getAnnotation(Class<? extends AbstractTerm> term);
[17/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java
index 9702144..3bcc859 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java
@@ -1,174 +1,149 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.demo.odatademo.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Customer",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "ODataDemo.Person")
-public interface Customer
- extends Annotatable,org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getID();
-
- void setID(java.lang.Integer _iD);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TotalExpense",
- type = "Edm.Decimal",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.math.BigDecimal getTotalExpense();
-
- void setTotalExpense(java.math.BigDecimal _totalExpense);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonDetail",
- type = "ODataDemo.PersonDetail",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "PersonDetails",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail();
-
- void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.ComplexFactory{
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
- type = "Edm.Int32")
- Annotatable getIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TotalExpense",
- type = "Edm.Decimal")
- Annotatable getTotalExpenseAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonDetail",
- type = "ODataDemo.PersonDetail")
- Annotatable getPersonDetailAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "ODataDemo.Person")
+public interface Customer
+ extends Annotatable, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person {
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getID();
+
+ @Override
+ void setID(java.lang.Integer _iD);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ @Override
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TotalExpense",
+ type = "Edm.Decimal",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.math.BigDecimal getTotalExpense();
+
+ void setTotalExpense(java.math.BigDecimal _totalExpense);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonDetail",
+ type = "ODataDemo.PersonDetail",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "PersonDetails",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail();
+
+ @Override
+ void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail);
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.ComplexFactory {}
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
+ type = "Edm.Int32")
+ Annotatable getIDAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TotalExpense",
+ type = "Edm.Decimal")
+ Annotatable getTotalExpenseAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonDetail",
+ type = "ODataDemo.PersonDetail")
+ Annotatable getPersonDetailAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java
index ea397c8..6b00082 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java
@@ -1,50 +1,31 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.demo.odatademo.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface CustomerCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Customer> {
+public interface CustomerCollection extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Customer> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java
index 86b9167..cf98f31 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java
@@ -1,228 +1,201 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.demo.odatademo.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Employee",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "ODataDemo.Person")
-public interface Employee
- extends Annotatable,org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getID();
-
- void setID(java.lang.Integer _iD);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "EmployeeID",
- type = "Edm.Int64",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Long getEmployeeID();
-
- void setEmployeeID(java.lang.Long _employeeID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HireDate",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getHireDate();
-
- void setHireDate(java.util.Calendar _hireDate);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Salary",
- type = "Edm.Single",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Float getSalary();
-
- void setSalary(java.lang.Float _salary);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonDetail",
- type = "ODataDemo.PersonDetail",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "PersonDetails",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail();
-
- void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.ComplexFactory{
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
- type = "Edm.Int32")
- Annotatable getIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "EmployeeID",
- type = "Edm.Int64")
- Annotatable getEmployeeIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HireDate",
- type = "Edm.DateTimeOffset")
- Annotatable getHireDateAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Salary",
- type = "Edm.Single")
- Annotatable getSalaryAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonDetail",
- type = "ODataDemo.PersonDetail")
- Annotatable getPersonDetailAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "ODataDemo.Person")
+public interface Employee
+ extends Annotatable, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person {
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getID();
+
+ @Override
+ void setID(java.lang.Integer _iD);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ @Override
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "EmployeeID",
+ type = "Edm.Int64",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Long getEmployeeID();
+
+ void setEmployeeID(java.lang.Long _employeeID);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HireDate",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getHireDate();
+
+ void setHireDate(java.util.Calendar _hireDate);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Salary",
+ type = "Edm.Single",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Float getSalary();
+
+ void setSalary(java.lang.Float _salary);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonDetail",
+ type = "ODataDemo.PersonDetail",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "PersonDetails",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail();
+
+ @Override
+ void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail);
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.ComplexFactory {}
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
+ type = "Edm.Int32")
+ Annotatable getIDAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "EmployeeID",
+ type = "Edm.Int64")
+ Annotatable getEmployeeIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HireDate",
+ type = "Edm.DateTimeOffset")
+ Annotatable getHireDateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Salary",
+ type = "Edm.Single")
+ Annotatable getSalaryAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonDetail",
+ type = "ODataDemo.PersonDetail")
+ Annotatable getPersonDetailAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollection.java
index f619ee5..0d5bea0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollection.java
@@ -1,50 +1,31 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.demo.odatademo.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface EmployeeCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Employee> {
+public interface EmployeeCollection extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Employee> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java
index 65c94fe..3279c32 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java
@@ -1,330 +1,323 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.demo.odatademo.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "FeaturedProduct",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "ODataDemo.Product")
-public interface FeaturedProduct
- extends Annotatable,org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getID();
-
- void setID(java.lang.Integer _iD);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getDescription();
-
- void setDescription(java.lang.String _description);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReleaseDate",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getReleaseDate();
-
- void setReleaseDate(java.util.Calendar _releaseDate);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DiscontinuedDate",
- type = "Edm.DateTimeOffset",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getDiscontinuedDate();
-
- void setDiscontinuedDate(java.util.Calendar _discontinuedDate);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Rating",
- type = "Edm.Int16",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Short getRating();
-
- void setRating(java.lang.Short _rating);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Price",
- type = "Edm.Double",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Double getPrice();
-
- void setPrice(java.lang.Double _price);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Categories",
- type = "ODataDemo.Category",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "Categories",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection getCategories();
-
- void setCategories(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection _categories);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Supplier",
- type = "ODataDemo.Supplier",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "Suppliers",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier getSupplier();
-
- void setSupplier(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier _supplier);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ProductDetail",
- type = "ODataDemo.ProductDetail",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "ProductDetails",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail getProductDetail();
-
- void setProductDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail _productDetail);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Advertisement",
- type = "ODataDemo.Advertisement",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "Advertisements",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement getAdvertisement();
-
- void setAdvertisement(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement _advertisement);
-
-
- @Override
- Operations operations();
-
- interface Operations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product.Operations{
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product.ComplexFactory{
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
- type = "Edm.Int32")
- Annotatable getIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
- type = "Edm.String")
- Annotatable getDescriptionAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ReleaseDate",
- type = "Edm.DateTimeOffset")
- Annotatable getReleaseDateAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DiscontinuedDate",
- type = "Edm.DateTimeOffset")
- Annotatable getDiscontinuedDateAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Rating",
- type = "Edm.Int16")
- Annotatable getRatingAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Price",
- type = "Edm.Double")
- Annotatable getPriceAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Categories",
- type = "ODataDemo.Category")
- Annotatable getCategoriesAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Supplier",
- type = "ODataDemo.Supplier")
- Annotatable getSupplierAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ProductDetail",
- type = "ODataDemo.ProductDetail")
- Annotatable getProductDetailAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Advertisement",
- type = "ODataDemo.Advertisement")
- Annotatable getAdvertisementAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "ODataDemo.Product")
+public interface FeaturedProduct
+ extends Annotatable, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product {
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getID();
+
+ @Override
+ void setID(java.lang.Integer _iD);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ @Override
+ void setName(java.lang.String _name);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getDescription();
+
+ @Override
+ void setDescription(java.lang.String _description);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReleaseDate",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getReleaseDate();
+
+ @Override
+ void setReleaseDate(java.util.Calendar _releaseDate);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DiscontinuedDate",
+ type = "Edm.DateTimeOffset",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getDiscontinuedDate();
+
+ @Override
+ void setDiscontinuedDate(java.util.Calendar _discontinuedDate);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Rating",
+ type = "Edm.Int16",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Short getRating();
+
+ @Override
+ void setRating(java.lang.Short _rating);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Price",
+ type = "Edm.Double",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Double getPrice();
+
+ @Override
+ void setPrice(java.lang.Double _price);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Categories",
+ type = "ODataDemo.Category",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "Categories",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection getCategories();
+
+ @Override
+ void setCategories(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection _categories);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Supplier",
+ type = "ODataDemo.Supplier",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "Suppliers",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier getSupplier();
+
+ @Override
+ void setSupplier(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier _supplier);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ProductDetail",
+ type = "ODataDemo.ProductDetail",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "ProductDetails",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail getProductDetail();
+
+ @Override
+ void setProductDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail _productDetail);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Advertisement",
+ type = "ODataDemo.Advertisement",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "Advertisements",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement getAdvertisement();
+
+ void setAdvertisement(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement _advertisement);
+
+ @Override
+ Operations operations();
+
+ interface Operations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product.Operations {
+
+ }
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product.ComplexFactory {}
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
+ type = "Edm.Int32")
+ Annotatable getIDAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
+ type = "Edm.String")
+ Annotatable getDescriptionAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ReleaseDate",
+ type = "Edm.DateTimeOffset")
+ Annotatable getReleaseDateAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DiscontinuedDate",
+ type = "Edm.DateTimeOffset")
+ Annotatable getDiscontinuedDateAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Rating",
+ type = "Edm.Int16")
+ Annotatable getRatingAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Price",
+ type = "Edm.Double")
+ Annotatable getPriceAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Categories",
+ type = "ODataDemo.Category")
+ Annotatable getCategoriesAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Supplier",
+ type = "ODataDemo.Supplier")
+ Annotatable getSupplierAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ProductDetail",
+ type = "ODataDemo.ProductDetail")
+ Annotatable getProductDetailAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Advertisement",
+ type = "ODataDemo.Advertisement")
+ Annotatable getAdvertisementAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollection.java
index e3c0a70..80751fc 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollection.java
@@ -1,50 +1,31 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.demo.odatademo.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface FeaturedProductCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct> {
+public interface FeaturedProductCollection extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Person.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Person.java
index 45ed75c..bc811e7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Person.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Person.java
@@ -1,146 +1,111 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.demo.odatademo.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Person",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Person
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getID();
-
- void setID(java.lang.Integer _iD);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonDetail",
- type = "ODataDemo.PersonDetail",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "PersonDetails",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail();
-
- void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
- type = "Edm.Int32")
- Annotatable getIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonDetail",
- type = "ODataDemo.PersonDetail")
- Annotatable getPersonDetailAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Person
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getID();
+
+ void setID(java.lang.Integer _iD);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonDetail",
+ type = "ODataDemo.PersonDetail",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "PersonDetails",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail();
+
+ void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
+ type = "Edm.Int32")
+ Annotatable getIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonDetail",
+ type = "ODataDemo.PersonDetail")
+ Annotatable getPersonDetailAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollection.java
index c397f29..dd331e2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollection.java
@@ -1,50 +1,31 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.demo.odatademo.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface PersonCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person> {
+public interface PersonCollection extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person> {
Object getAnnotation(Class<? extends AbstractTerm> term);
[47/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/utils/Commons.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/Commons.java b/fit/src/main/java/org/apache/olingo/fit/utils/Commons.java
index 16d984c..40d33f7 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/Commons.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/Commons.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -60,14 +60,14 @@ public abstract class Commons {
protected static final Logger LOG = LoggerFactory.getLogger(Commons.class);
private static final EnumMap<ODataServiceVersion, Metadata> METADATA =
- new EnumMap<ODataServiceVersion, Metadata>(ODataServiceVersion.class);
+ new EnumMap<ODataServiceVersion, Metadata>(ODataServiceVersion.class);
protected static final Pattern MULTIKEY_PATTERN = Pattern.compile("(.*=.*,?)+");
protected static final Map<String, Integer> SEQUENCE = new HashMap<String, Integer>();
protected static final Map<String, Pair<String, EdmPrimitiveTypeKind>> MEDIA_CONTENT =
- new HashMap<String, Pair<String, EdmPrimitiveTypeKind>>();
+ new HashMap<String, Pair<String, EdmPrimitiveTypeKind>>();
static {
SEQUENCE.put("Customer", 1000);
@@ -89,12 +89,12 @@ public abstract class Commons {
SEQUENCE.put("People", 1000);
MEDIA_CONTENT.put("CustomerInfo",
- new ImmutablePair<String, EdmPrimitiveTypeKind>("CustomerInfoId", EdmPrimitiveTypeKind.Int32));
+ new ImmutablePair<String, EdmPrimitiveTypeKind>("CustomerInfoId", EdmPrimitiveTypeKind.Int32));
MEDIA_CONTENT.put("Car",
- new ImmutablePair<String, EdmPrimitiveTypeKind>("VIN", EdmPrimitiveTypeKind.Int32));
+ new ImmutablePair<String, EdmPrimitiveTypeKind>("VIN", EdmPrimitiveTypeKind.Int32));
MEDIA_CONTENT.put("Car/Photo", null);
MEDIA_CONTENT.put("Advertisements",
- new ImmutablePair<String, EdmPrimitiveTypeKind>("ID", EdmPrimitiveTypeKind.Guid));
+ new ImmutablePair<String, EdmPrimitiveTypeKind>("ID", EdmPrimitiveTypeKind.Guid));
}
public static Metadata getMetadata(final ODataServiceVersion version) {
@@ -119,7 +119,7 @@ public abstract class Commons {
public static String getEntityBasePath(final String entitySetName, final String entityKey) {
// expected singleton in case of null key
return entitySetName + File.separatorChar
- + (StringUtils.isNotBlank(entityKey) ? getEntityKey(entityKey) + File.separatorChar : "");
+ + (StringUtils.isNotBlank(entityKey) ? getEntityKey(entityKey) + File.separatorChar : "");
}
public static String getLinksURI(final String entitySetName, final String entityId, final String linkName)
@@ -134,12 +134,12 @@ public abstract class Commons {
}
public static String getLinksPath(
- final ODataServiceVersion version, final String basePath, final String linkName, final Accept accept)
- throws IOException {
+ final ODataServiceVersion version, final String basePath, final String linkName, final Accept accept)
+ throws IOException {
try {
return FSManager.instance(version)
- .getAbsolutePath(basePath + Constants.get(version, ConstantKey.LINKS_FILE_PATH)
- + File.separatorChar + linkName, accept);
+ .getAbsolutePath(basePath + Constants.get(version, ConstantKey.LINKS_FILE_PATH)
+ + File.separatorChar + linkName, accept);
} catch (Exception e) {
throw new IOException(e);
}
@@ -163,7 +163,7 @@ public abstract class Commons {
}
public static InputStream getLinksAsATOM(final ODataServiceVersion version,
- final Map.Entry<String, Collection<String>> link) throws IOException {
+ final Map.Entry<String, Collection<String>> link) throws IOException {
final StringBuilder builder = new StringBuilder();
builder.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
@@ -185,13 +185,13 @@ public abstract class Commons {
}
public static InputStream getLinksAsJSON(final ODataServiceVersion version,
- final String entitySetName, final Map.Entry<String, Collection<String>> link)
- throws IOException {
+ final String entitySetName, final Map.Entry<String, Collection<String>> link)
+ throws IOException {
final ObjectNode links = new ObjectNode(JsonNodeFactory.instance);
links.put(
- Constants.get(version, ConstantKey.JSON_ODATAMETADATA_NAME),
- Constants.get(version, ConstantKey.ODATA_METADATA_PREFIX) + entitySetName + "/$links/" + link.getKey());
+ Constants.get(version, ConstantKey.JSON_ODATAMETADATA_NAME),
+ Constants.get(version, ConstantKey.ODATA_METADATA_PREFIX) + entitySetName + "/$links/" + link.getKey());
final ArrayNode uris = new ArrayNode(JsonNodeFactory.instance);
@@ -222,9 +222,9 @@ public abstract class Commons {
IOUtils.closeQuietly(is);
final ObjectMapper mapper = new ObjectMapper(
- new JsonFactory().configure(JsonParser.Feature.ALLOW_NUMERIC_LEADING_ZEROS, true));
+ new JsonFactory().configure(JsonParser.Feature.ALLOW_NUMERIC_LEADING_ZEROS, true));
final JsonNode node =
- changeFormat((ObjectNode) mapper.readTree(new ByteArrayInputStream(bos.toByteArray())), version, target);
+ changeFormat((ObjectNode) mapper.readTree(new ByteArrayInputStream(bos.toByteArray())), version, target);
return IOUtils.toInputStream(node.toString(), Constants.ENCODING);
} catch (Exception e) {
@@ -239,40 +239,40 @@ public abstract class Commons {
public static JsonNode changeFormat(final ObjectNode node, final ODataServiceVersion version, final Accept target) {
final List<String> toBeRemoved = new ArrayList<String>();
switch (target) {
- case JSON_NOMETA:
- // nometa + minimal
- toBeRemoved.add(Constants.get(version, ConstantKey.JSON_ODATAMETADATA_NAME));
-
- case JSON:
- // minimal
- toBeRemoved.add(Constants.get(version, ConstantKey.JSON_EDITLINK_NAME));
- toBeRemoved.add(Constants.get(version, ConstantKey.JSON_ID_NAME));
- toBeRemoved.add(Constants.get(version, ConstantKey.JSON_TYPE_NAME));
-
- final Iterator<Map.Entry<String, JsonNode>> fields = node.fields();
- while (fields.hasNext()) {
- final Map.Entry<String, JsonNode> field = fields.next();
- if (field.getKey().endsWith(Constants.get(version, ConstantKey.JSON_MEDIA_SUFFIX))
- || field.getKey().endsWith(Constants.get(version, ConstantKey.JSON_NAVIGATION_SUFFIX))
- || field.getKey().endsWith(Constants.get(version, ConstantKey.JSON_TYPE_SUFFIX))) {
- toBeRemoved.add(field.getKey());
- } else if (field.getValue().isObject()) {
- changeFormat((ObjectNode) field.getValue(), version, target);
- } else if (field.getValue().isArray()) {
- for (final Iterator<JsonNode> subItor = field.getValue().elements(); subItor.hasNext();) {
- final JsonNode subNode = subItor.next();
- if (subNode.isObject()) {
- changeFormat((ObjectNode) subNode, version, target);
- }
+ case JSON_NOMETA:
+ // nometa + minimal
+ toBeRemoved.add(Constants.get(version, ConstantKey.JSON_ODATAMETADATA_NAME));
+
+ case JSON:
+ // minimal
+ toBeRemoved.add(Constants.get(version, ConstantKey.JSON_EDITLINK_NAME));
+ toBeRemoved.add(Constants.get(version, ConstantKey.JSON_ID_NAME));
+ toBeRemoved.add(Constants.get(version, ConstantKey.JSON_TYPE_NAME));
+
+ final Iterator<Map.Entry<String, JsonNode>> fields = node.fields();
+ while (fields.hasNext()) {
+ final Map.Entry<String, JsonNode> field = fields.next();
+ if (field.getKey().endsWith(Constants.get(version, ConstantKey.JSON_MEDIA_SUFFIX))
+ || field.getKey().endsWith(Constants.get(version, ConstantKey.JSON_NAVIGATION_SUFFIX))
+ || field.getKey().endsWith(Constants.get(version, ConstantKey.JSON_TYPE_SUFFIX))) {
+ toBeRemoved.add(field.getKey());
+ } else if (field.getValue().isObject()) {
+ changeFormat((ObjectNode) field.getValue(), version, target);
+ } else if (field.getValue().isArray()) {
+ for (final Iterator<JsonNode> subItor = field.getValue().elements(); subItor.hasNext();) {
+ final JsonNode subNode = subItor.next();
+ if (subNode.isObject()) {
+ changeFormat((ObjectNode) subNode, version, target);
}
}
}
- case JSON_FULLMETA:
- //ignore: no changes
- break;
+ }
+ case JSON_FULLMETA:
+ // ignore: no changes
+ break;
- default:
- throw new UnsupportedOperationException(target.name());
+ default:
+ throw new UnsupportedOperationException(target.name());
}
node.remove(toBeRemoved);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/utils/ConstantKey.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/ConstantKey.java b/fit/src/main/java/org/apache/olingo/fit/utils/ConstantKey.java
index 7ff1bd4..9b9a20d 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/ConstantKey.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/ConstantKey.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/utils/Constants.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/Constants.java b/fit/src/main/java/org/apache/olingo/fit/utils/Constants.java
index ad060ba..b697881 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/Constants.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/Constants.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -23,6 +23,7 @@ import java.nio.charset.CharsetDecoder;
import java.nio.charset.CodingErrorAction;
import java.util.EnumMap;
import java.util.Map;
+
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
public class Constants {
@@ -34,7 +35,7 @@ public class Constants {
/**
* CR/LF.
*/
- public static final byte[] CRLF = {13, 10};
+ public static final byte[] CRLF = { 13, 10 };
public static final Charset ENCODING = Charset.forName("UTF-8");
@@ -59,8 +60,8 @@ public class Constants {
v4constants.put(ConstantKey.ATOM_LINK_REL, "http://docs.oasis-open.org/odata/ns/related/");
v4constants.put(ConstantKey.ODATA_SERVICE_VERSION, "OData-Version");
v4constants.put(ConstantKey.DEFAULT_SERVICE_URL, "http://localhost:9080/stub/StaticService/V40/Static.svc/");
- v4constants.put(ConstantKey.ODATA_METADATA_PREFIX,
- "http://localhost:9080/stub/StaticService/V40/Static.svc/$metadata#");
+ v4constants.put(ConstantKey.ODATA_METADATA_PREFIX,
+ "http://localhost:9080/stub/StaticService/V40/Static.svc/$metadata#");
v4constants.put(ConstantKey.ODATA_METADATA_ENTITY_SUFFIX, "/$entity");
// -----------------------------
@@ -71,7 +72,7 @@ public class Constants {
constants.put(ConstantKey.DEFAULT_SERVICE_URL, "http://localhost:9080/stub/StaticService/V30/Static.svc/");
constants.put(ConstantKey.ODATA_COUNT_NAME, "odata.count");
constants.put(ConstantKey.ODATA_METADATA_PREFIX,
- "http://localhost:9080/stub/StaticService/V30/Static.svc/$metadata#");
+ "http://localhost:9080/stub/StaticService/V30/Static.svc/$metadata#");
constants.put(ConstantKey.ODATA_METADATA_ENTITY_SUFFIX, "/@Element");
constants.put(ConstantKey.ATOM_DEF_TYPE, "Edm.String");
constants.put(ConstantKey.ATOM_PROPERTY_PREFIX, "d:");
@@ -124,6 +125,6 @@ public class Constants {
public static String get(final ODataServiceVersion version, final ConstantKey key) {
return (version == null || version.compareTo(ODataServiceVersion.V30) <= 0 || !v4constants.containsKey(key)
- ? constants : v4constants).get(key);
+ ? constants : v4constants).get(key);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java b/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java
index 2b63501..805db47 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/utils/InjectableSerializerProvider.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/InjectableSerializerProvider.java b/fit/src/main/java/org/apache/olingo/fit/utils/InjectableSerializerProvider.java
index 69b3bb1..a8587c5 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/InjectableSerializerProvider.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/InjectableSerializerProvider.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -28,14 +28,14 @@ public class InjectableSerializerProvider extends DefaultSerializerProvider {
private static final long serialVersionUID = 3432260063063739646L;
public InjectableSerializerProvider(
- final SerializerProvider src, final SerializationConfig config, final SerializerFactory factory) {
+ final SerializerProvider src, final SerializationConfig config, final SerializerFactory factory) {
super(src, config, factory);
}
@Override
public InjectableSerializerProvider createInstance(
- final SerializationConfig config, final SerializerFactory factory) {
+ final SerializationConfig config, final SerializerFactory factory) {
return this;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/utils/JSONUtilities.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/JSONUtilities.java b/fit/src/main/java/org/apache/olingo/fit/utils/JSONUtilities.java
index fcfa552..7580ce7 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/JSONUtilities.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/JSONUtilities.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -56,13 +56,13 @@ public class JSONUtilities extends AbstractUtilities {
mapper = new ObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL);
mapper.setInjectableValues(new InjectableValues.Std()
- .addValue(Boolean.class, Boolean.TRUE)
- .addValue(ODataServiceVersion.class, version));
+ .addValue(Boolean.class, Boolean.TRUE)
+ .addValue(ODataServiceVersion.class, version));
mapper.setSerializerProvider(new InjectableSerializerProvider(mapper.getSerializerProvider(),
- mapper.getSerializationConfig()
+ mapper.getSerializationConfig()
.withAttribute(ODataServiceVersion.class, version)
.withAttribute(Boolean.class, Boolean.TRUE),
- mapper.getSerializerFactory()));
+ mapper.getSerializerFactory()));
}
@Override
@@ -72,22 +72,22 @@ public class JSONUtilities extends AbstractUtilities {
@Override
protected InputStream addLinks(
- final String entitySetName, final String entitykey, final InputStream is, final Set<String> links)
- throws IOException {
+ final String entitySetName, final String entitykey, final InputStream is, final Set<String> links)
+ throws IOException {
final ObjectNode srcNode = (ObjectNode) mapper.readTree(is);
IOUtils.closeQuietly(is);
for (String link : links) {
srcNode.set(link + Constants.get(version, ConstantKey.JSON_NAVIGATION_SUFFIX),
- new TextNode(Commons.getLinksURI(entitySetName, entitykey, link)));
+ new TextNode(Commons.getLinksURI(entitySetName, entitykey, link)));
}
return IOUtils.toInputStream(srcNode.toString(), Constants.ENCODING);
}
@Override
- protected Set<String> retrieveAllLinkNames(InputStream is) throws IOException {
+ protected Set<String> retrieveAllLinkNames(final InputStream is) throws IOException {
final ObjectNode srcNode = (ObjectNode) mapper.readTree(is);
IOUtils.closeQuietly(is);
@@ -99,9 +99,9 @@ public class JSONUtilities extends AbstractUtilities {
final String field = fieldIter.next();
if (field.endsWith(Constants.get(version, ConstantKey.JSON_NAVIGATION_BIND_SUFFIX))
- || field.endsWith(Constants.get(version, ConstantKey.JSON_NAVIGATION_SUFFIX))
- || field.endsWith(Constants.get(version, ConstantKey.JSON_MEDIA_SUFFIX))
- || field.endsWith(Constants.get(version, ConstantKey.JSON_EDITLINK_NAME))) {
+ || field.endsWith(Constants.get(version, ConstantKey.JSON_NAVIGATION_SUFFIX))
+ || field.endsWith(Constants.get(version, ConstantKey.JSON_MEDIA_SUFFIX))
+ || field.endsWith(Constants.get(version, ConstantKey.JSON_EDITLINK_NAME))) {
if (field.indexOf('@') > 0) {
links.add(field.substring(0, field.indexOf('@')));
} else {
@@ -115,7 +115,7 @@ public class JSONUtilities extends AbstractUtilities {
@Override
protected NavigationLinks retrieveNavigationInfo(final String entitySetName, final InputStream is)
- throws IOException {
+ throws IOException {
final ObjectNode srcNode = (ObjectNode) mapper.readTree(is);
IOUtils.closeQuietly(is);
@@ -152,8 +152,8 @@ public class JSONUtilities extends AbstractUtilities {
@Override
protected InputStream normalizeLinks(
- final String entitySetName, final String entityKey, final InputStream is, final NavigationLinks links)
- throws IOException {
+ final String entitySetName, final String entityKey, final InputStream is, final NavigationLinks links)
+ throws IOException {
final ObjectNode srcNode = (ObjectNode) mapper.readTree(is);
@@ -162,16 +162,16 @@ public class JSONUtilities extends AbstractUtilities {
// normalize link
srcNode.remove(linkTitle + Constants.get(version, ConstantKey.JSON_NAVIGATION_BIND_SUFFIX));
srcNode.set(
- linkTitle + Constants.get(version, ConstantKey.JSON_NAVIGATION_SUFFIX),
- new TextNode(String.format("%s(%s)/%s", entitySetName, entityKey, linkTitle)));
+ linkTitle + Constants.get(version, ConstantKey.JSON_NAVIGATION_SUFFIX),
+ new TextNode(String.format("%s(%s)/%s", entitySetName, entityKey, linkTitle)));
}
for (String linkTitle : links.getInlineNames()) {
// normalize link if exist; declare a new one if missing
srcNode.remove(linkTitle + Constants.get(version, ConstantKey.JSON_NAVIGATION_BIND_SUFFIX));
srcNode.set(
- linkTitle + Constants.get(version, ConstantKey.JSON_NAVIGATION_SUFFIX),
- new TextNode(String.format("%s(%s)/%s", entitySetName, entityKey, linkTitle)));
+ linkTitle + Constants.get(version, ConstantKey.JSON_NAVIGATION_SUFFIX),
+ new TextNode(String.format("%s(%s)/%s", entitySetName, entityKey, linkTitle)));
// remove inline
srcNode.remove(linkTitle);
@@ -182,8 +182,8 @@ public class JSONUtilities extends AbstractUtilities {
}
srcNode.set(
- Constants.get(version, ConstantKey.JSON_EDITLINK_NAME), new TextNode(
- Constants.get(version, ConstantKey.DEFAULT_SERVICE_URL) + entitySetName + "(" + entityKey + ")"));
+ Constants.get(version, ConstantKey.JSON_EDITLINK_NAME), new TextNode(
+ Constants.get(version, ConstantKey.DEFAULT_SERVICE_URL) + entitySetName + "(" + entityKey + ")"));
return IOUtils.toInputStream(srcNode.toString(), Constants.ENCODING);
}
@@ -258,8 +258,8 @@ public class JSONUtilities extends AbstractUtilities {
@Override
public InputStream readEntities(
- final List<String> links, final String linkName, final String next, final boolean forceFeed)
- throws IOException {
+ final List<String> links, final String linkName, final String next, final boolean forceFeed)
+ throws IOException {
if (links.isEmpty()) {
throw new NotFoundException();
@@ -277,7 +277,7 @@ public class JSONUtilities extends AbstractUtilities {
try {
final Map.Entry<String, String> uriMap = Commons.parseEntityURI(link);
final Map.Entry<String, InputStream> entity =
- readEntity(uriMap.getKey(), uriMap.getValue(), Accept.JSON_FULLMETA);
+ readEntity(uriMap.getKey(), uriMap.getValue(), Accept.JSON_FULLMETA);
if (bos.size() > 1) {
bos.write(",".getBytes());
@@ -295,7 +295,7 @@ public class JSONUtilities extends AbstractUtilities {
}
node.set(Constants.get(version, ConstantKey.JSON_VALUE_NAME),
- mapper.readTree(new ByteArrayInputStream(bos.toByteArray())));
+ mapper.readTree(new ByteArrayInputStream(bos.toByteArray())));
if (StringUtils.isNotBlank(next)) {
node.set(Constants.get(version, ConstantKey.JSON_NEXTLINK_NAME), new TextNode(next));
@@ -306,8 +306,8 @@ public class JSONUtilities extends AbstractUtilities {
@Override
protected InputStream replaceLink(
- final InputStream toBeChanged, final String linkName, final InputStream replacement)
- throws IOException {
+ final InputStream toBeChanged, final String linkName, final InputStream replacement)
+ throws IOException {
final ObjectNode toBeChangedNode = (ObjectNode) mapper.readTree(toBeChanged);
final ObjectNode replacementNode = (ObjectNode) mapper.readTree(replacement);
@@ -343,7 +343,7 @@ public class JSONUtilities extends AbstractUtilities {
@Override
public Map.Entry<String, List<String>> extractLinkURIs(
- final String entitySetName, final String entityId, final String linkName) throws Exception {
+ final String entitySetName, final String entityId, final String linkName) throws Exception {
final LinkInfo links = readLinks(entitySetName, entityId, linkName, Accept.JSON_FULLMETA);
return extractLinkURIs(links.getLinks());
}
@@ -376,7 +376,7 @@ public class JSONUtilities extends AbstractUtilities {
@Override
public InputStream addEditLink(
- final InputStream content, final String title, final String href) throws IOException {
+ final InputStream content, final String title, final String href) throws IOException {
final ObjectNode srcNode = (ObjectNode) mapper.readTree(content);
IOUtils.closeQuietly(content);
@@ -387,7 +387,7 @@ public class JSONUtilities extends AbstractUtilities {
@Override
public InputStream addOperation(final InputStream content, final String name, final String metaAnchor,
- final String href) throws IOException {
+ final String href) throws IOException {
final ObjectNode srcNode = (ObjectNode) mapper.readTree(content);
IOUtils.closeQuietly(content);
@@ -402,8 +402,8 @@ public class JSONUtilities extends AbstractUtilities {
@Override
public InputStream replaceProperty(
- final InputStream src, final InputStream replacement, final List<String> path, final boolean justValue)
- throws IOException {
+ final InputStream src, final InputStream replacement, final List<String> path, final boolean justValue)
+ throws IOException {
final ObjectNode srcNode = (ObjectNode) mapper.readTree(src);
IOUtils.closeQuietly(src);
@@ -427,8 +427,8 @@ public class JSONUtilities extends AbstractUtilities {
}
}
- ((ObjectNode) node).set(path.get(path.size() - 1), replacementNode);
-
+ ((ObjectNode) node).set(path.get(path.size() - 1), replacementNode);
+
return IOUtils.toInputStream(srcNode.toString(), Constants.ENCODING);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/utils/LinkInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/LinkInfo.java b/fit/src/main/java/org/apache/olingo/fit/utils/LinkInfo.java
index c922e3b..1f8abf4 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/LinkInfo.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/LinkInfo.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -36,7 +36,7 @@ public class LinkInfo {
return feed;
}
- public void setFeed(boolean feed) {
+ public void setFeed(final boolean feed) {
this.feed = feed;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/utils/MetadataLinkInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/MetadataLinkInfo.java b/fit/src/main/java/org/apache/olingo/fit/utils/MetadataLinkInfo.java
index f18b8b8..c30a8f3 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/MetadataLinkInfo.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/MetadataLinkInfo.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+
import javax.ws.rs.NotFoundException;
public class MetadataLinkInfo {
@@ -47,7 +48,7 @@ public class MetadataLinkInfo {
}
public void addLink(
- final String entitySetName, final String linkName, final String targetName, final boolean isFeed) {
+ final String entitySetName, final String linkName, final String targetName, final boolean isFeed) {
final EntitySet entitySet;
if (entitySets.containsKey(entitySetName)) {
entitySet = entitySets.get(entitySetName);
@@ -111,14 +112,6 @@ public class MetadataLinkInfo {
links.add(new NavigationLink(linkName, targetName, isFeed));
}
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
public Set<NavigationLink> getLinks() {
return links;
}
@@ -141,19 +134,11 @@ public class MetadataLinkInfo {
}
}
- public void setLinks(final Set<NavigationLink> links) {
- this.links = links;
- }
-
- public EntitySet(boolean singleton) {
- this.singleton = singleton;
- }
-
public boolean isSingleton() {
return singleton;
}
- public void setSingleton(boolean singleton) {
+ public void setSingleton(final boolean singleton) {
this.singleton = singleton;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/utils/NavigationLinks.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/NavigationLinks.java b/fit/src/main/java/org/apache/olingo/fit/utils/NavigationLinks.java
index 1c50e37..e2d948a 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/NavigationLinks.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/NavigationLinks.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -25,6 +25,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import org.apache.commons.io.IOUtils;
public class NavigationLinks {
@@ -34,7 +35,7 @@ public class NavigationLinks {
private final Map<String, List<String>> links = new HashMap<String, List<String>>();
public NavigationLinks addInlines(final String name, final InputStream inline) {
- return addInlines(name, Collections.<InputStream>singletonList(inline));
+ return addInlines(name, Collections.<InputStream> singletonList(inline));
}
public NavigationLinks addInlines(final String name, final List<InputStream> inline) {
@@ -52,7 +53,7 @@ public class NavigationLinks {
}
public NavigationLinks addLinks(final String name, final String uri) {
- return addLinks(name, Collections.<String>singletonList(uri));
+ return addLinks(name, Collections.<String> singletonList(uri));
}
public NavigationLinks addLinks(final String name, final List<String> uris) {
@@ -70,19 +71,19 @@ public class NavigationLinks {
}
public Set<String> getInlineNames() {
- return Collections.<String>unmodifiableSet(inlines.keySet());
+ return Collections.<String> unmodifiableSet(inlines.keySet());
}
public Set<String> getLinkNames() {
- return Collections.<String>unmodifiableSet(links.keySet());
+ return Collections.<String> unmodifiableSet(links.keySet());
}
public List<InputStream> getInlines(final String name) {
- return Collections.<InputStream>unmodifiableList(inlines.get(name));
+ return Collections.<InputStream> unmodifiableList(inlines.get(name));
}
public List<String> getLinks(final String name) {
- return Collections.<String>unmodifiableList(links.get(name));
+ return Collections.<String> unmodifiableList(links.get(name));
}
public Iterable<Map.Entry<String, List<InputStream>>> getInlines() {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/utils/ResolvingReferencesInterceptor.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/ResolvingReferencesInterceptor.java b/fit/src/main/java/org/apache/olingo/fit/utils/ResolvingReferencesInterceptor.java
index 4adac8a..794e449 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/ResolvingReferencesInterceptor.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/ResolvingReferencesInterceptor.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.utils;
import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URLDecoder;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
@@ -40,7 +41,7 @@ public class ResolvingReferencesInterceptor extends AbstractPhaseInterceptor<Mes
try {
if (path.endsWith("$entity") && StringUtils.isNotBlank(query)
- && URLDecoder.decode(query, "UTF-8").contains("$id=")) {
+ && URLDecoder.decode(query, "UTF-8").contains("$id=")) {
final String id = URLDecoder.decode(query, "UTF-8");
final String newURL = id.substring(id.indexOf("$id=") + 4);
@@ -51,7 +52,6 @@ public class ResolvingReferencesInterceptor extends AbstractPhaseInterceptor<Mes
message.put(Message.PATH_INFO, uri.getPath());
}
- } catch (UnsupportedEncodingException ignore) {
- }
+ } catch (UnsupportedEncodingException ignore) {}
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/utils/XHTTPMethodInterceptor.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/XHTTPMethodInterceptor.java b/fit/src/main/java/org/apache/olingo/fit/utils/XHTTPMethodInterceptor.java
index bbcc489..238e155 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/XHTTPMethodInterceptor.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/XHTTPMethodInterceptor.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,6 +20,7 @@ package org.apache.olingo.fit.utils;
import java.util.List;
import java.util.Map;
+
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
@@ -38,7 +39,7 @@ public class XHTTPMethodInterceptor extends AbstractPhaseInterceptor<Message> {
if (headers.containsKey(Constants.get(ConstantKey.XHTTP_HEADER_NAME))) {
message.put(Message.HTTP_REQUEST_METHOD, headers.get(Constants.get(ConstantKey.XHTTP_HEADER_NAME))
- .iterator().next());
+ .iterator().next());
}
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/utils/XMLElement.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/XMLElement.java b/fit/src/main/java/org/apache/olingo/fit/utils/XMLElement.java
index c8a0ee8..1bc1b4e 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/XMLElement.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/XMLElement.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -52,7 +52,7 @@ public class XMLElement {
return start;
}
- public void setStart(StartElement start) {
+ public void setStart(final StartElement start) {
this.start = start;
}
@@ -60,7 +60,7 @@ public class XMLElement {
return end;
}
- public void setEnd(EndElement end) {
+ public void setEnd(final EndElement end) {
this.end = end;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/utils/XMLEventReaderWrapper.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/XMLEventReaderWrapper.java b/fit/src/main/java/org/apache/olingo/fit/utils/XMLEventReaderWrapper.java
index 1774f0c..b3de7ee 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/XMLEventReaderWrapper.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/XMLEventReaderWrapper.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -50,23 +50,23 @@ public class XMLEventReaderWrapper implements XMLEventReader {
throws IOException, XMLStreamException {
final StringBuilder startBuilder = new StringBuilder();
startBuilder.append("<").append(CONTENT).
- append(" xmlns:m").append("=\"").append(Constants.get(version, ConstantKey.METADATA_NS)).append("\"").
- append(" xmlns:d").append("=\"").append(Constants.get(version, ConstantKey.DATASERVICES_NS)).append("\"").
- append(" xmlns:georss").append("=\"").append(Constants.get(version, ConstantKey.GEORSS_NS)).append("\"").
- append(" xmlns:gml").append("=\"").append(Constants.get(version, ConstantKey.GML_NS)).append("\"").
- append(">");
+ append(" xmlns:m").append("=\"").append(Constants.get(version, ConstantKey.METADATA_NS)).append("\"").
+ append(" xmlns:d").append("=\"").append(Constants.get(version, ConstantKey.DATASERVICES_NS)).append("\"").
+ append(" xmlns:georss").append("=\"").append(Constants.get(version, ConstantKey.GEORSS_NS)).append("\"").
+ append(" xmlns:gml").append("=\"").append(Constants.get(version, ConstantKey.GML_NS)).append("\"").
+ append(">");
CONTENT_STAG = startBuilder.toString();
final XMLInputFactory factory = XMLInputFactory.newInstance();
final InputStreamReader reader = new InputStreamReader(
- new ByteArrayInputStream((CONTENT_STAG
+ new ByteArrayInputStream((CONTENT_STAG
+ IOUtils.toString(stream, ENCODING).replaceAll("^<\\?xml.*\\?>", "")
+ XMLEventReaderWrapper.CONTENT_ETAG).getBytes(ENCODING)),
- Constants.DECODER);
+ Constants.DECODER);
- this.wrapped = factory.createXMLEventReader(reader);
+ wrapped = factory.createXMLEventReader(reader);
init();
}
@@ -76,11 +76,11 @@ public class XMLEventReaderWrapper implements XMLEventReader {
try {
do {
- this.nextGivenEvent = this.wrapped.nextEvent();
+ nextGivenEvent = wrapped.nextEvent();
- } while (this.nextGivenEvent.isStartDocument()
- || (this.nextGivenEvent.isStartElement()
- && CONTENT.equals(this.nextGivenEvent.asStartElement().getName().getLocalPart())));
+ } while (nextGivenEvent.isStartDocument()
+ || (nextGivenEvent.isStartElement()
+ && CONTENT.equals(nextGivenEvent.asStartElement().getName().getLocalPart())));
} catch (Exception ignore) {
// ignore
@@ -148,7 +148,7 @@ public class XMLEventReaderWrapper implements XMLEventReader {
private boolean isValidEvent(final XMLEvent event) {
// discard content end element tag ...
return event != null
- && (!event.isEndElement()
- || !CONTENT.equals(event.asEndElement().getName().getLocalPart()));
+ && (!event.isEndElement()
+ || !CONTENT.equals(event.asEndElement().getName().getLocalPart()));
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/utils/XMLUtilities.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/XMLUtilities.java b/fit/src/main/java/org/apache/olingo/fit/utils/XMLUtilities.java
index f5ba1c1..7745d3f 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/XMLUtilities.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/XMLUtilities.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -37,6 +37,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import javax.ws.rs.NotFoundException;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLEventFactory;
@@ -49,6 +50,7 @@ import javax.xml.stream.XMLStreamException;
import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.StartElement;
import javax.xml.stream.events.XMLEvent;
+
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.vfs2.FileObject;
@@ -99,11 +101,11 @@ public class XMLUtilities extends AbstractUtilities {
}
private void skipElement(
- final StartElement start,
- final XMLEventReader reader,
- final XMLEventWriter writer,
- final boolean excludeStart)
- throws Exception {
+ final StartElement start,
+ final XMLEventReader reader,
+ final XMLEventWriter writer,
+ final boolean excludeStart)
+ throws Exception {
if (!excludeStart) {
writeEvent(start, writer);
@@ -131,8 +133,8 @@ public class XMLUtilities extends AbstractUtilities {
*/
@Override
protected InputStream addLinks(
- final String entitySetName, final String entitykey, final InputStream is, final Set<String> links)
- throws Exception {
+ final String entitySetName, final String entitykey, final InputStream is, final Set<String> links)
+ throws Exception {
// -----------------------------------------
// 0. Build reader and writer
@@ -144,7 +146,7 @@ public class XMLUtilities extends AbstractUtilities {
final XMLEventWriter writer = getEventWriter(bos);
// -----------------------------------------
final Map.Entry<Integer, XMLElement> entry =
- extractElement(reader, writer, Collections.singletonList("entry"), 0, 1, 1);
+ extractElement(reader, writer, Collections.singletonList("entry"), 0, 1, 1);
writer.add(entry.getValue().getStart());
@@ -155,16 +157,16 @@ public class XMLUtilities extends AbstractUtilities {
final Set<Attribute> attributes = new HashSet<Attribute>();
attributes.add(eventFactory.createAttribute(new QName("title"), link));
attributes.add(eventFactory.createAttribute(new QName("href"),
- Commons.getLinksURI(entitySetName, entitykey, link)));
+ Commons.getLinksURI(entitySetName, entitykey, link)));
attributes.add(eventFactory.createAttribute(new QName("rel"),
- Constants.get(version, ConstantKey.ATOM_LINK_REL) + link));
+ Constants.get(version, ConstantKey.ATOM_LINK_REL) + link));
attributes.add(eventFactory.createAttribute(new QName("type"),
- navigationProperties.get(link).isEntitySet()
+ navigationProperties.get(link).isEntitySet()
? Constants.get(version, ConstantKey.ATOM_LINK_FEED)
: Constants.get(version, ConstantKey.ATOM_LINK_ENTRY)));
writer.add(eventFactory.createStartElement(
- new QName(Constants.get(version, ConstantKey.LINK)), attributes.iterator(), null));
+ new QName(Constants.get(version, ConstantKey.LINK)), attributes.iterator(), null));
writer.add(eventFactory.createEndElement(new QName(Constants.get(version, ConstantKey.LINK)), null));
}
@@ -195,8 +197,8 @@ public class XMLUtilities extends AbstractUtilities {
while (true) {
final Map.Entry<Integer, XMLElement> linkInfo =
- extractElement(reader, null,
- Collections.<String>singletonList(Constants.get(version, ConstantKey.LINK)), startDepth, 2, 2);
+ extractElement(reader, null,
+ Collections.<String> singletonList(Constants.get(version, ConstantKey.LINK)), startDepth, 2, 2);
startDepth = linkInfo.getKey();
@@ -217,8 +219,8 @@ public class XMLUtilities extends AbstractUtilities {
*/
@Override
protected NavigationLinks retrieveNavigationInfo(
- final String entitySetName, final InputStream is)
- throws Exception {
+ final String entitySetName, final InputStream is)
+ throws Exception {
final NavigationLinks links = new NavigationLinks();
@@ -234,8 +236,8 @@ public class XMLUtilities extends AbstractUtilities {
while (true) {
// a. search for link with type attribute equals to "application/atom+xml;type=entry/feed"
final Map.Entry<Integer, XMLElement> linkInfo = extractElement(
- reader, null, Collections.<String>singletonList(Constants.get(version, ConstantKey.LINK)),
- filter, true, startDepth, 2, 2);
+ reader, null, Collections.<String> singletonList(Constants.get(version, ConstantKey.LINK)),
+ filter, true, startDepth, 2, 2);
final XMLElement link = linkInfo.getValue();
startDepth = linkInfo.getKey();
@@ -246,15 +248,15 @@ public class XMLUtilities extends AbstractUtilities {
try {
final XMLElement inlineElement =
- extractElement(link.getContentReader(version), null,
- Collections.<String>singletonList(Constants.get(version, ConstantKey.INLINE)), 0, -1, -1).
+ extractElement(link.getContentReader(version), null,
+ Collections.<String> singletonList(Constants.get(version, ConstantKey.INLINE)), 0, -1, -1).
getValue();
final XMLEventReader inlineReader = inlineElement.getContentReader(version);
try {
while (true) {
final XMLElement entry =
- extractElement(inlineReader, null, Collections.<String>singletonList("entry"), 0, -1, -1).
+ extractElement(inlineReader, null, Collections.<String> singletonList("entry"), 0, -1, -1).
getValue();
links.addInlines(title, entry.toStream());
}
@@ -284,8 +286,8 @@ public class XMLUtilities extends AbstractUtilities {
*/
@Override
protected InputStream normalizeLinks(
- final String entitySetName, final String entityKey, final InputStream is, final NavigationLinks links)
- throws Exception {
+ final String entitySetName, final String entityKey, final InputStream is, final NavigationLinks links)
+ throws Exception {
// -----------------------------------------
// 0. Build reader and writer
@@ -315,9 +317,9 @@ public class XMLUtilities extends AbstractUtilities {
while (true) {
// a. search for link with type attribute equals to "application/atom+xml;type=entry/feed"
linkInfo = extractElement(
- reader, writer,
- Collections.<String>singletonList(Constants.get(version, ConstantKey.LINK)), filter, true,
- linkInfo == null ? 0 : linkInfo.getKey(), 2, 2);
+ reader, writer,
+ Collections.<String> singletonList(Constants.get(version, ConstantKey.LINK)), filter, true,
+ linkInfo == null ? 0 : linkInfo.getKey(), 2, 2);
final XMLElement link = linkInfo.getValue();
final String title = link.getStart().getAttributeByName(new QName("title")).getValue();
@@ -326,13 +328,13 @@ public class XMLUtilities extends AbstractUtilities {
added.add(title);
final String normalizedLink = String.format(
- "<link href=\"%s(%s)/%s\" rel=\"%s\" title=\"%s\" type=\"%s\"/>",
- entitySetName,
- entityKey,
- title,
- link.getStart().getAttributeByName(new QName("rel")).getValue(),
- title,
- link.getStart().getAttributeByName(new QName("type")).getValue());
+ "<link href=\"%s(%s)/%s\" rel=\"%s\" title=\"%s\" type=\"%s\"/>",
+ entitySetName,
+ entityKey,
+ title,
+ link.getStart().getAttributeByName(new QName("rel")).getValue(),
+ title,
+ link.getStart().getAttributeByName(new QName("type")).getValue());
addAtomElement(IOUtils.toInputStream(normalizedLink, Constants.ENCODING), writer);
}
@@ -349,26 +351,26 @@ public class XMLUtilities extends AbstractUtilities {
// 2. Add edit link if missing
// -----------------------------------------
final InputStream content = addEditLink(
- new ByteArrayInputStream(tmpBos.toByteArray()),
- entitySetName,
- Constants.get(version, ConstantKey.DEFAULT_SERVICE_URL) + entitySetName + "(" + entityKey + ")");
+ new ByteArrayInputStream(tmpBos.toByteArray()),
+ entitySetName,
+ Constants.get(version, ConstantKey.DEFAULT_SERVICE_URL) + entitySetName + "(" + entityKey + ")");
// -----------------------------------------
// -----------------------------------------
// 3. Add content element if missing
// -----------------------------------------
return addAtomContent(
- content,
- entitySetName,
- Constants.get(version, ConstantKey.DEFAULT_SERVICE_URL) + entitySetName + "(" + entityKey + ")");
+ content,
+ entitySetName,
+ Constants.get(version, ConstantKey.DEFAULT_SERVICE_URL) + entitySetName + "(" + entityKey + ")");
// -----------------------------------------
}
public XMLElement getXmlElement(
- final StartElement start,
- final XMLEventReader reader)
- throws Exception {
+ final StartElement start,
+ final XMLEventReader reader)
+ throws Exception {
final XMLElement res = new XMLElement();
res.setStart(start);
@@ -404,9 +406,9 @@ public class XMLUtilities extends AbstractUtilities {
}
private void addAtomElement(
- final InputStream content,
- final XMLEventWriter writer)
- throws Exception {
+ final InputStream content,
+ final XMLEventWriter writer)
+ throws Exception {
final XMLEventReader reader = getEventReader(content);
final XMLEventFactory eventFactory = XMLEventFactory.newInstance();
@@ -419,8 +421,8 @@ public class XMLUtilities extends AbstractUtilities {
final XMLEvent event = reader.nextEvent();
if (event.getEventType() != XMLStreamConstants.START_DOCUMENT
- && event.getEventType() != XMLStreamConstants.END_DOCUMENT
- && event.getEventType() != XMLStreamConstants.COMMENT) {
+ && event.getEventType() != XMLStreamConstants.END_DOCUMENT
+ && event.getEventType() != XMLStreamConstants.COMMENT) {
writer.add(event);
}
}
@@ -433,8 +435,8 @@ public class XMLUtilities extends AbstractUtilities {
@Override
public InputStream addEditLink(
- final InputStream content, final String title, final String href)
- throws Exception {
+ final InputStream content, final String title, final String href)
+ throws Exception {
final ByteArrayOutputStream copy = new ByteArrayOutputStream();
IOUtils.copy(content, copy);
@@ -449,8 +451,8 @@ public class XMLUtilities extends AbstractUtilities {
try {
// check edit link existence
- extractElement(reader, writer, Collections.<String>singletonList(Constants.get(version, ConstantKey.LINK)),
- Collections.<Map.Entry<String, String>>singletonList(
+ extractElement(reader, writer, Collections.<String> singletonList(Constants.get(version, ConstantKey.LINK)),
+ Collections.<Map.Entry<String, String>> singletonList(
new AbstractMap.SimpleEntry<String, String>("rel", "edit")), false, 0, -1, -1);
addAtomElement(IOUtils.toInputStream(editLinkElement, Constants.ENCODING), writer);
@@ -464,7 +466,7 @@ public class XMLUtilities extends AbstractUtilities {
writer = getEventWriter(bos);
final XMLElement entryElement =
- extractElement(reader, writer, Collections.<String>singletonList("entry"), 0, 1, 1).getValue();
+ extractElement(reader, writer, Collections.<String> singletonList("entry"), 0, 1, 1).getValue();
writer.add(entryElement.getStart());
@@ -486,22 +488,22 @@ public class XMLUtilities extends AbstractUtilities {
@Override
public InputStream addOperation(final InputStream content, final String name, final String metaAnchor,
- final String href) throws Exception {
+ final String href) throws Exception {
final ByteArrayOutputStream copy = new ByteArrayOutputStream();
IOUtils.copy(content, copy);
IOUtils.closeQuietly(content);
final String action = String.format("<m:action metadata=\"%s%s\" title=\"%s\" target=\"%s\"/>",
- Constants.get(version, ConstantKey.DEFAULT_SERVICE_URL), metaAnchor, name, href);
+ Constants.get(version, ConstantKey.DEFAULT_SERVICE_URL), metaAnchor, name, href);
final String newContent = new String(copy.toByteArray(), "UTF-8").replaceAll("\\<content ", action + "\\<content ");
return IOUtils.toInputStream(newContent, "UTF-8");
}
private InputStream addAtomContent(
- final InputStream content, final String title, final String href)
- throws Exception {
+ final InputStream content, final String title, final String href)
+ throws Exception {
final ByteArrayOutputStream copy = new ByteArrayOutputStream();
IOUtils.copy(content, copy);
@@ -516,7 +518,7 @@ public class XMLUtilities extends AbstractUtilities {
try {
// check edit link existence
XMLElement contentElement =
- extractElement(reader, writer, Collections.<String>singletonList("content"), 0, 2, 2).getValue();
+ extractElement(reader, writer, Collections.<String> singletonList("content"), 0, 2, 2).getValue();
writer.add(contentElement.getStart());
writer.add(contentElement.getContentReader(version));
writer.add(contentElement.getEnd());
@@ -530,33 +532,33 @@ public class XMLUtilities extends AbstractUtilities {
if (isMediaContent(title)) {
final XMLElement entryElement =
- extractElement(reader, writer, Collections.<String>singletonList("entry"), 0, 1, 1).getValue();
+ extractElement(reader, writer, Collections.<String> singletonList("entry"), 0, 1, 1).getValue();
writer.add(entryElement.getStart());
writer.add(entryElement.getContentReader(version));
addAtomElement(
- IOUtils.toInputStream(String.format("<content type=\"*/*\" src=\"%s/$value\" />", href)),
- writer);
+ IOUtils.toInputStream(String.format("<content type=\"*/*\" src=\"%s/$value\" />", href)),
+ writer);
writer.add(entryElement.getEnd());
} else {
try {
final XMLElement entryElement =
- extractElement(reader, writer, Collections.<String>singletonList(
+ extractElement(reader, writer, Collections.<String> singletonList(
Constants.get(version, ConstantKey.PROPERTIES)), 0, 2, 3).getValue();
addAtomElement(
- IOUtils.toInputStream("<content type=\"application/xml\">"),
- writer);
+ IOUtils.toInputStream("<content type=\"application/xml\">"),
+ writer);
writer.add(entryElement.getStart());
writer.add(entryElement.getContentReader(version));
writer.add(entryElement.getEnd());
addAtomElement(
- IOUtils.toInputStream("</content>"),
- writer);
+ IOUtils.toInputStream("</content>"),
+ writer);
} catch (Exception nf) {
reader.close();
reader = getEventReader(new ByteArrayInputStream(copy.toByteArray()));
@@ -565,13 +567,13 @@ public class XMLUtilities extends AbstractUtilities {
writer = getEventWriter(bos);
final XMLElement entryElement =
- extractElement(reader, writer, Collections.<String>singletonList("entry"), 0, 1, 1).getValue();
+ extractElement(reader, writer, Collections.<String> singletonList("entry"), 0, 1, 1).getValue();
writer.add(entryElement.getStart());
writer.add(entryElement.getContentReader(version));
addAtomElement(
- IOUtils.toInputStream("<content type=\"application/xml\"/>"),
- writer);
+ IOUtils.toInputStream("<content type=\"application/xml\"/>"),
+ writer);
writer.add(entryElement.getEnd());
}
@@ -591,9 +593,10 @@ public class XMLUtilities extends AbstractUtilities {
public int countAllElements(final String entitySetName) throws Exception {
final String basePath = entitySetName + File.separatorChar;
int count = countFeedElements(fsManager.readFile(basePath + Constants.get(version, ConstantKey.FEED), Accept.XML),
- "entry");
+ "entry");
- final String skipTokenDirPath = fsManager.getAbsolutePath(basePath + Constants.get(version, ConstantKey.SKIP_TOKEN),
+ final String skipTokenDirPath =
+ fsManager.getAbsolutePath(basePath + Constants.get(version, ConstantKey.SKIP_TOKEN),
null);
try {
@@ -602,7 +605,7 @@ public class XMLUtilities extends AbstractUtilities {
for (FileObject file : files) {
count += countFeedElements(fsManager.readFile(
- basePath + Constants.get(version, ConstantKey.SKIP_TOKEN) + File.separatorChar
+ basePath + Constants.get(version, ConstantKey.SKIP_TOKEN) + File.separatorChar
+ file.getName().getBaseName(), null), "entry");
}
} catch (FileSystemException fse) {
@@ -621,7 +624,7 @@ public class XMLUtilities extends AbstractUtilities {
final XMLEvent event = reader.nextEvent();
if (event.getEventType() == XMLStreamConstants.START_ELEMENT
- && elementName.equals(event.asStartElement().getName().getLocalPart())) {
+ && elementName.equals(event.asStartElement().getName().getLocalPart())) {
count++;
}
}
@@ -631,18 +634,18 @@ public class XMLUtilities extends AbstractUtilities {
}
public Map.Entry<Integer, XMLElement> extractElement(
- final XMLEventReader reader, final XMLEventWriter writer, final List<String> path,
- final int startPathPos, final int minPathPos, final int maxPathPos)
- throws Exception {
+ final XMLEventReader reader, final XMLEventWriter writer, final List<String> path,
+ final int startPathPos, final int minPathPos, final int maxPathPos)
+ throws Exception {
return extractElement(reader, writer, path, null, false, startPathPos, minPathPos, maxPathPos);
}
public Map.Entry<Integer, XMLElement> extractElement(
- final XMLEventReader reader, final XMLEventWriter writer, final List<String> path,
- final Collection<Map.Entry<String, String>> filter,
- final boolean filterInOr,
- final int startPathPos, final int minPathPos, final int maxPathPos)
- throws Exception {
+ final XMLEventReader reader, final XMLEventWriter writer, final List<String> path,
+ final Collection<Map.Entry<String, String>> filter,
+ final boolean filterInOr,
+ final int startPathPos, final int minPathPos, final int maxPathPos)
+ throws Exception {
StartElement start = null;
int searchFor = 0;
@@ -652,9 +655,9 @@ public class XMLUtilities extends AbstractUtilities {
String current = null;
// set defaults
- final List<String> pathElementNames = path == null ? Collections.<String>emptyList() : path;
+ final List<String> pathElementNames = path == null ? Collections.<String> emptyList() : path;
final Collection<Map.Entry<String, String>> filterAttrs =
- filter == null ? Collections.<Map.Entry<String, String>>emptySet() : filter;
+ filter == null ? Collections.<Map.Entry<String, String>> emptySet() : filter;
while (reader.hasNext() && start == null) {
final XMLEvent event = reader.nextEvent();
@@ -664,7 +667,7 @@ public class XMLUtilities extends AbstractUtilities {
if (current != null || ((minPathPos < 0 || minPathPos <= depth) && (maxPathPos < 0 || depth <= maxPathPos))) {
if (pathElementNames.isEmpty()
- || pathElementNames.get(searchFor).trim().equals(event.asStartElement().getName().getLocalPart())) {
+ || pathElementNames.get(searchFor).trim().equals(event.asStartElement().getName().getLocalPart())) {
if (searchFor < pathElementNames.size() - 1) {
// path exploring not completed
@@ -736,7 +739,7 @@ public class XMLUtilities extends AbstractUtilities {
try {
final XMLElement feedElement =
- extractElement(reader, writer, Collections.<String>singletonList("feed"), 0, 1, 1).getValue();
+ extractElement(reader, writer, Collections.<String> singletonList("feed"), 0, 1, 1).getValue();
writer.add(feedElement.getStart());
addAtomElement(IOUtils.toInputStream(String.format("<m:count>%d</m:count>", count), Constants.ENCODING), writer);
@@ -776,22 +779,22 @@ public class XMLUtilities extends AbstractUtilities {
while (reader.hasNext()) {
final XMLEvent event = reader.nextEvent();
if (event.getEventType() == XMLStreamConstants.START_ELEMENT
- && Constants.get(version, ConstantKey.LINK).equals(event.asStartElement().getName().getLocalPart())
- && !fieldToBeSaved.contains(
+ && Constants.get(version, ConstantKey.LINK).equals(event.asStartElement().getName().getLocalPart())
+ && !fieldToBeSaved.contains(
event.asStartElement().getAttributeByName(new QName("title")).getValue())
- && !"edit".equals(event.asStartElement().getAttributeByName(new QName("rel")).getValue())) {
+ && !"edit".equals(event.asStartElement().getAttributeByName(new QName("rel")).getValue())) {
writeCurrent = false;
} else if (event.getEventType() == XMLStreamConstants.END_ELEMENT
- && Constants.get(version, ConstantKey.LINK).equals(event.asEndElement().getName().getLocalPart())) {
+ && Constants.get(version, ConstantKey.LINK).equals(event.asEndElement().getName().getLocalPart())) {
writeNext = true;
} else if (event.getEventType() == XMLStreamConstants.START_ELEMENT
- && (Constants.get(version, ConstantKey.PROPERTIES)).equals(
+ && (Constants.get(version, ConstantKey.PROPERTIES)).equals(
event.asStartElement().getName().getLocalPart())) {
writeCurrent = true;
writeNext = false;
inProperties = true;
} else if (event.getEventType() == XMLStreamConstants.END_ELEMENT
- && (Constants.get(version, ConstantKey.PROPERTIES)).equals(
+ && (Constants.get(version, ConstantKey.PROPERTIES)).equals(
event.asEndElement().getName().getLocalPart())) {
writeCurrent = true;
} else if (inProperties) {
@@ -807,8 +810,8 @@ public class XMLUtilities extends AbstractUtilities {
}
} else if (event.getEventType() == XMLStreamConstants.END_ELEMENT
- && StringUtils.isNotBlank(currentName)
- && (Constants.get(version, ConstantKey.ATOM_PROPERTY_PREFIX) + currentName.trim()).equals(
+ && StringUtils.isNotBlank(currentName)
+ && (Constants.get(version, ConstantKey.ATOM_PROPERTY_PREFIX) + currentName.trim()).equals(
event.asEndElement().getName().getLocalPart())) {
writeNext = false;
currentName = null;
@@ -833,15 +836,15 @@ public class XMLUtilities extends AbstractUtilities {
// Do not raise any exception in order to support FC properties as well
// if (!found.isEmpty()) {
- // throw new Exception(String.format("Could not find a properties '%s'", found));
+ // throw new Exception(String.format("Could not find a properties '%s'", found));
// }
return new ByteArrayInputStream(bos.toByteArray());
}
@Override
public InputStream readEntities(
- final List<String> links, final String linkName, final String next, final boolean forceFeed)
- throws Exception {
+ final List<String> links, final String linkName, final String next, final boolean forceFeed)
+ throws Exception {
if (links.isEmpty()) {
throw new NotFoundException();
@@ -858,13 +861,14 @@ public class XMLUtilities extends AbstractUtilities {
// build a feed
writer.write(("<feed xml:base=\"" + Constants.get(version, ConstantKey.DEFAULT_SERVICE_URL) + "\" "
- + "xmlns=\"http://www.w3.org/2005/Atom\" "
- + "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" "
- + "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">")
- .toCharArray());
+ + "xmlns=\"http://www.w3.org/2005/Atom\" "
+ + "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" "
+ + "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">")
+ .toCharArray());
- writer.write(("<id>" + Constants.get(version, ConstantKey.DEFAULT_SERVICE_URL) + "entityset(entityid)/" + linkName
- + "</id>").toCharArray());
+ writer.write(("<id>" + Constants.get(version, ConstantKey.DEFAULT_SERVICE_URL) + "entityset(entityid)/"
+ + linkName
+ + "</id>").toCharArray());
writer.write(("<title type=\"text\">" + linkName + "</title>").toCharArray());
writer.write("<updated>2014-03-03T13:40:49Z</updated>".toCharArray());
@@ -876,10 +880,10 @@ public class XMLUtilities extends AbstractUtilities {
final Map.Entry<String, String> uri = Commons.parseEntityURI(link);
final XMLElement entry =
- extractElement(
+ extractElement(
getEventReader(readEntity(uri.getKey(), uri.getValue(), Accept.ATOM).getValue()),
null,
- Collections.<String>singletonList("entry"),
+ Collections.<String> singletonList("entry"),
0, 1, 1).getValue();
IOUtils.copy(entry.toStream(), writer, encoding);
@@ -916,8 +920,8 @@ public class XMLUtilities extends AbstractUtilities {
XMLEventReader reader = getEventReader(new ByteArrayInputStream(bos.toByteArray()));
final Map.Entry<Integer, XMLElement> propertyElement =
- extractElement(reader, null,
- Collections.<String>singletonList(Constants.get(version, ConstantKey.PROPERTIES)), 0, 2, 3);
+ extractElement(reader, null,
+ Collections.<String> singletonList(Constants.get(version, ConstantKey.PROPERTIES)), 0, 2, 3);
reader.close();
reader = propertyElement.getValue().getContentReader(version);
@@ -940,12 +944,12 @@ public class XMLUtilities extends AbstractUtilities {
int pos = 0;
while (true) {
final Map.Entry<Integer, XMLElement> linkElement =
- extractElement(reader, null,
- Collections.<String>singletonList(Constants.get(version, ConstantKey.LINK)), pos, 2, 2);
+ extractElement(reader, null,
+ Collections.<String> singletonList(Constants.get(version, ConstantKey.LINK)), pos, 2, 2);
res.put("[Constants.get(version, ConstantKey.LINK)]"
- + linkElement.getValue().getStart().getAttributeByName(new QName("title")).getValue(),
- linkElement.getValue().toStream());
+ + linkElement.getValue().getStart().getAttributeByName(new QName("title")).getValue(),
+ linkElement.getValue().toStream());
pos = linkElement.getKey();
}
@@ -958,8 +962,8 @@ public class XMLUtilities extends AbstractUtilities {
@Override
protected InputStream replaceLink(
- final InputStream toBeChanged, final String linkName, final InputStream replacement)
- throws Exception {
+ final InputStream toBeChanged, final String linkName, final InputStream replacement)
+ throws Exception {
final XMLEventReader reader = getEventReader(toBeChanged);
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -970,10 +974,10 @@ public class XMLUtilities extends AbstractUtilities {
try {
final XMLElement linkElement =
- extractElement(reader, writer,
- Collections.<String>singletonList(Constants.get(version, ConstantKey.LINK)),
- Collections.<Map.Entry<String, String>>singletonList(
- new SimpleEntry<String, String>("title", linkName)), false, 0, -1, -1).getValue();
+ extractElement(reader, writer,
+ Collections.<String> singletonList(Constants.get(version, ConstantKey.LINK)),
+ Collections.<Map.Entry<String, String>> singletonList(
+ new SimpleEntry<String, String>("title", linkName)), false, 0, -1, -1).getValue();
writer.add(linkElement.getStart());
// ------------------------------------------
@@ -1003,8 +1007,8 @@ public class XMLUtilities extends AbstractUtilities {
@Override
public Map.Entry<String, List<String>> extractLinkURIs(
- final String entitySetName, final String entityId, final String linkName)
- throws Exception {
+ final String entitySetName, final String entityId, final String linkName)
+ throws Exception {
final LinkInfo links = readLinks(entitySetName, entityId, linkName, Accept.XML);
return extractLinkURIs(links.getLinks());
@@ -1012,7 +1016,7 @@ public class XMLUtilities extends AbstractUtilities {
@Override
public Map.Entry<String, List<String>> extractLinkURIs(final InputStream is)
- throws Exception {
+ throws Exception {
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
IOUtils.copy(is, bos);
IOUtils.closeQuietly(is);
@@ -1021,8 +1025,8 @@ public class XMLUtilities extends AbstractUtilities {
final List<String> links = new ArrayList<String>();
try {
while (true) {
- links.add(IOUtils.toString(extractElement(reader, null, Collections.<String>singletonList("uri"), 0, -1, -1).
- getValue().getContent()));
+ links.add(IOUtils.toString(extractElement(reader, null, Collections.<String> singletonList("uri"), 0, -1, -1).
+ getValue().getContent()));
}
} catch (Exception ignore) {
// End document reached ...
@@ -1033,8 +1037,8 @@ public class XMLUtilities extends AbstractUtilities {
reader = getEventReader(new ByteArrayInputStream(bos.toByteArray()));
try {
- next = IOUtils.toString(extractElement(reader, null, Collections.<String>singletonList("next"), 0, -1, -1).
- getValue().getContent());
+ next = IOUtils.toString(extractElement(reader, null, Collections.<String> singletonList("next"), 0, -1, -1).
+ getValue().getContent());
} catch (Exception ignore) {
// next link is not mandatory
next = null;
@@ -1046,8 +1050,8 @@ public class XMLUtilities extends AbstractUtilities {
@Override
public InputStream replaceProperty(
- final InputStream src, final InputStream replacement, final List<String> path, final boolean justValue)
- throws Exception {
+ final InputStream src, final InputStream replacement, final List<String> path, final boolean justValue)
+ throws Exception {
final List<String> pathElements = new ArrayList<String>();
@@ -1104,7 +1108,7 @@ public class XMLUtilities extends AbstractUtilities {
final XMLEventWriter writer = getEventWriter(bos);
final XMLEventReader changesReader = new XMLEventReaderWrapper(IOUtils.toInputStream(
- String.format("<%s m:null=\"true\" />", path.get(path.size() - 1)), Constants.ENCODING), version);
+ String.format("<%s m:null=\"true\" />", path.get(path.size() - 1)), Constants.ENCODING), version);
writer.add(changesReader);
changesReader.close();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java
index f54b5b8..a5a0b93 100644
--- a/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
[29/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java
index 3f2656a..dfacc88 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,35 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Product")
+public interface Product
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection> {
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product
+ newProduct();
-@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Product")
-public interface Product
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection> {
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection
+ newProductCollection();
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.DiscontinuedProduct
+ newDiscontinuedProduct();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product newProduct();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection newProductCollection();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.DiscontinuedProduct newDiscontinuedProduct();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.DiscontinuedProductCollection newDiscontinuedProductCollection();
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.DiscontinuedProductCollection
+ newDiscontinuedProductCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
index a8d4871..1bde1a4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductDetail")
-public interface ProductDetail
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetailCollection> {
+public interface ProductDetail
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetailCollection> {
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail
+ newProductDetail();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail newProductDetail();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetailCollection newProductDetailCollection();
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetailCollection
+ newProductDetailCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
index 6062d47..cd6aaef 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,16 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoKey;
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductPhoto")
-public interface ProductPhoto
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto, ProductPhotoKey, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection> {
+public interface ProductPhoto
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto, ProductPhotoKey, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection> {
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto
+ newProductPhoto();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto newProductPhoto();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection newProductPhotoCollection();
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection
+ newProductPhotoCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
index 4937f9e..eb8c315 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,16 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewKey;
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductReview")
-public interface ProductReview
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview, ProductReviewKey, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection> {
+public interface ProductReview
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview, ProductReviewKey, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection> {
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview
+ newProductReview();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview newProductReview();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection newProductReviewCollection();
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection
+ newProductReviewCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
index 8268ba9..57fd9ec 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "RSAToken")
-public interface RSAToken
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken, java.lang.String, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.RSATokenCollection> {
+public interface RSAToken
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken, java.lang.String, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.RSATokenCollection> {
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken
+ newRSAToken();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken newRSAToken();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.RSATokenCollection newRSATokenCollection();
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.RSATokenCollection
+ newRSATokenCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/package-info.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/package-info.java
index 09db110..e6746dc 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/package-info.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/package-info.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
index a72f8b6..ca7f40c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
@@ -1,68 +1,36 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Aliases")
-public interface Aliases
+public interface Aliases
extends java.io.Serializable {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AlternativeNames", type = "Edm.String",
+ nullable = false)
+ java.util.Collection<java.lang.String> getAlternativeNames();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AlternativeNames", type = "Edm.String", nullable = false)
- java.util.Collection<java.lang.String> getAlternativeNames();
-
- void setAlternativeNames(java.util.Collection<java.lang.String> _alternativeNames);
-
-
+ void setAlternativeNames(java.util.Collection<java.lang.String> _alternativeNames);
- ComplexFactory factory();
+ ComplexFactory factory();
- interface ComplexFactory {
- }
+ interface ComplexFactory {}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
index 330d22f..0a2ae26 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
@@ -1,105 +1,72 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "AllSpatialCollectionTypes",
- openType = false,
- hasStream = false,
- isAbstract = true)
-public interface AllSpatialCollectionTypes
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getId();
-
- void setId(java.lang.Integer _id);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Int32")
- Annotatable getIdAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = true)
+public interface AllSpatialCollectionTypes
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getId();
+
+ void setId(java.lang.Integer _id);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
index 15bc2c0..e25b099 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface AllSpatialCollectionTypesCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes> {
+public interface AllSpatialCollectionTypesCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
index 9682b90..bf6d093 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
@@ -1,268 +1,240 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "AllSpatialCollectionTypes_Simple",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialCollectionTypes")
-public interface AllSpatialCollectionTypes_Simple
- extends Annotatable,org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getId();
-
- void setId(java.lang.Integer _id);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeogPoint",
- type = "Edm.GeographyPoint",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> getManyGeogPoint();
-
- void setManyGeogPoint(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> _manyGeogPoint);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeogLine",
- type = "Edm.GeographyLineString",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> getManyGeogLine();
-
- void setManyGeogLine(java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> _manyGeogLine);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeogPolygon",
- type = "Edm.GeographyPolygon",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> getManyGeogPolygon();
-
- void setManyGeogPolygon(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> _manyGeogPolygon);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeomPoint",
- type = "Edm.GeometryPoint",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> getManyGeomPoint();
-
- void setManyGeomPoint(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> _manyGeomPoint);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeomLine",
- type = "Edm.GeometryLineString",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> getManyGeomLine();
-
- void setManyGeomLine(java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> _manyGeomLine);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeomPolygon",
- type = "Edm.GeometryPolygon",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> getManyGeomPolygon();
-
- void setManyGeomPolygon(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> _manyGeomPolygon);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes.ComplexFactory{
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Int32")
- Annotatable getIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeogPoint",
- type = "Edm.GeographyPoint")
- Annotatable getManyGeogPointAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeogLine",
- type = "Edm.GeographyLineString")
- Annotatable getManyGeogLineAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeogPolygon",
- type = "Edm.GeographyPolygon")
- Annotatable getManyGeogPolygonAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeomPoint",
- type = "Edm.GeometryPoint")
- Annotatable getManyGeomPointAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeomLine",
- type = "Edm.GeometryLineString")
- Annotatable getManyGeomLineAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeomPolygon",
- type = "Edm.GeometryPolygon")
- Annotatable getManyGeomPolygonAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialCollectionTypes")
+public interface AllSpatialCollectionTypes_Simple
+ extends
+ Annotatable,
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes {
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getId();
+
+ @Override
+ void setId(java.lang.Integer _id);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeogPoint",
+ type = "Edm.GeographyPoint",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> getManyGeogPoint();
+
+ void setManyGeogPoint(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> _manyGeogPoint);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeogLine",
+ type = "Edm.GeographyLineString",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> getManyGeogLine();
+
+ void setManyGeogLine(java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> _manyGeogLine);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeogPolygon",
+ type = "Edm.GeographyPolygon",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> getManyGeogPolygon();
+
+ void setManyGeogPolygon(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> _manyGeogPolygon);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeomPoint",
+ type = "Edm.GeometryPoint",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> getManyGeomPoint();
+
+ void setManyGeomPoint(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> _manyGeomPoint);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeomLine",
+ type = "Edm.GeometryLineString",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> getManyGeomLine();
+
+ void setManyGeomLine(java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> _manyGeomLine);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeomPolygon",
+ type = "Edm.GeometryPolygon",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> getManyGeomPolygon();
+
+ void setManyGeomPolygon(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> _manyGeomPolygon);
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory
+ extends
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes.ComplexFactory {}
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations
+ extends
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeogPoint",
+ type = "Edm.GeographyPoint")
+ Annotatable getManyGeogPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeogLine",
+ type = "Edm.GeographyLineString")
+ Annotatable getManyGeogLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeogPolygon",
+ type = "Edm.GeographyPolygon")
+ Annotatable getManyGeogPolygonAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeomPoint",
+ type = "Edm.GeometryPoint")
+ Annotatable getManyGeomPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeomLine",
+ type = "Edm.GeometryLineString")
+ Annotatable getManyGeomLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeomPolygon",
+ type = "Edm.GeometryPolygon")
+ Annotatable getManyGeomPolygonAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
index 180cb85..564007e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface AllSpatialCollectionTypes_SimpleCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes_Simple> {
+public interface AllSpatialCollectionTypes_SimpleCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes_Simple> {
Object getAnnotation(Class<? extends AbstractTerm> term);
[48/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/V4Services.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/V4Services.java b/fit/src/main/java/org/apache/olingo/fit/V4Services.java
index 27634b2..978bf5a 100644
--- a/fit/src/main/java/org/apache/olingo/fit/V4Services.java
+++ b/fit/src/main/java/org/apache/olingo/fit/V4Services.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -113,9 +113,9 @@ public class V4Services extends AbstractServices {
@GET
@Path("/redirect/{name}({id})")
public Response conformanceRedirect(
- @Context UriInfo uriInfo,
- @PathParam("name") String name,
- @PathParam("id") String id) {
+ @Context final UriInfo uriInfo,
+ @PathParam("name") final String name,
+ @PathParam("id") final String id) {
return Response.temporaryRedirect(
URI.create(uriInfo.getRequestUri().toASCIIString().replace("/redirect", ""))).build();
}
@@ -123,8 +123,8 @@ public class V4Services extends AbstractServices {
@GET
@Path("/$crossjoin({elements:.*})")
public Response crossjoin(
- @PathParam("elements") String elements,
- @QueryParam("$filter") String filter) {
+ @PathParam("elements") final String elements,
+ @QueryParam("$filter") final String filter) {
try {
if (CROSSJOIN_PATTERN.matcher("$crossjoin(" + elements + ")?$filter=" + filter).matches()) {
@@ -142,8 +142,8 @@ public class V4Services extends AbstractServices {
@GET
@Path("/relatedEntitySelect/{path:.*}")
public Response relatedEntitySelect(
- @PathParam("path") String path,
- @QueryParam("$expand") String expand) {
+ @PathParam("path") final String path,
+ @QueryParam("$expand") final String expand) {
if (RELENTITY_SELECT_PATTERN.matcher(expand).matches()) {
return xml.createResponse(null, null, Accept.JSON_FULLMETA);
@@ -356,17 +356,17 @@ public class V4Services extends AbstractServices {
@GET
@Path("/People/{type:.*}")
public Response getPeople(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
@PathParam("type") final String type,
- @QueryParam("$top") @DefaultValue(StringUtils.EMPTY) String top,
- @QueryParam("$skip") @DefaultValue(StringUtils.EMPTY) String skip,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
- @QueryParam("$inlinecount") @DefaultValue(StringUtils.EMPTY) String count,
- @QueryParam("$filter") @DefaultValue(StringUtils.EMPTY) String filter,
- @QueryParam("$search") @DefaultValue(StringUtils.EMPTY) String search,
- @QueryParam("$orderby") @DefaultValue(StringUtils.EMPTY) String orderby,
- @QueryParam("$skiptoken") @DefaultValue(StringUtils.EMPTY) String skiptoken) {
+ @QueryParam("$top") @DefaultValue(StringUtils.EMPTY) final String top,
+ @QueryParam("$skip") @DefaultValue(StringUtils.EMPTY) final String skip,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+ @QueryParam("$inlinecount") @DefaultValue(StringUtils.EMPTY) final String count,
+ @QueryParam("$filter") @DefaultValue(StringUtils.EMPTY) final String filter,
+ @QueryParam("$search") @DefaultValue(StringUtils.EMPTY) final String search,
+ @QueryParam("$orderby") @DefaultValue(StringUtils.EMPTY) final String orderby,
+ @QueryParam("$skiptoken") @DefaultValue(StringUtils.EMPTY) final String skiptoken) {
return StringUtils.isBlank(filter) && StringUtils.isBlank(search)
? NumberUtils.isNumber(type)
@@ -379,9 +379,9 @@ public class V4Services extends AbstractServices {
@GET
@Path("/Boss")
public Response getSingletonBoss(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
return getEntityInternal(
uriInfo.getRequestUri().toASCIIString(), accept, "Boss", StringUtils.EMPTY, format, null, null, false);
@@ -390,9 +390,9 @@ public class V4Services extends AbstractServices {
@GET
@Path("/Company")
public Response getSingletonCompany(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
return getEntityInternal(
uriInfo.getRequestUri().toASCIIString(), accept, "Company", StringUtils.EMPTY, format, null, null, false);
@@ -403,11 +403,11 @@ public class V4Services extends AbstractServices {
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
@Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
public Response patchSingletonCompany(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @HeaderParam("If-Match") @DefaultValue(StringUtils.EMPTY) String ifMatch,
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @HeaderParam("If-Match") @DefaultValue(StringUtils.EMPTY) final String ifMatch,
final String changes) {
return super.patchEntity(uriInfo, accept, contentType, prefer, ifMatch, "Company", StringUtils.EMPTY, changes);
@@ -416,11 +416,11 @@ public class V4Services extends AbstractServices {
@GET
@Path("/Customers")
public Response getCustomers(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @QueryParam("$deltatoken") @DefaultValue(StringUtils.EMPTY) String deltatoken) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @QueryParam("$deltatoken") @DefaultValue(StringUtils.EMPTY) final String deltatoken) {
try {
final Accept acceptType;
@@ -466,8 +466,8 @@ public class V4Services extends AbstractServices {
@GET
@Path("/Company/Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount{paren:[\\(\\)]*}")
public Response functionGetEmployeesCount(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
try {
final Accept acceptType;
@@ -497,9 +497,9 @@ public class V4Services extends AbstractServices {
@POST
@Path("/Company/Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue{paren:[\\(\\)]*}")
public Response actionIncreaseRevenue(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
final String param) {
try {
@@ -526,9 +526,9 @@ public class V4Services extends AbstractServices {
@GET
@Path("/Products({entityId})/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails({param:.*})")
public Response functionGetProductDetails(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @PathParam("entityId") String entityId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entityId") final String entityId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
try {
final Accept acceptType;
@@ -571,9 +571,9 @@ public class V4Services extends AbstractServices {
@POST
@Path("/Products({entityId})/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight{paren:[\\(\\)]*}")
public Response actionAddAccessRight(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
final String param) {
try {
@@ -610,11 +610,11 @@ public class V4Services extends AbstractServices {
@POST
@Path("/Customers(PersonID={personId})/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress{paren:[\\(\\)]*}")
public Response actionResetAddress(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @PathParam("personId") String personId,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("personId") final String personId,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
final String param) {
try {
@@ -636,10 +636,10 @@ public class V4Services extends AbstractServices {
@Path("/ProductDetails(ProductID={productId},ProductDetailID={productDetailId})"
+ "/Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct{paren:[\\(\\)]*}")
public Response functionGetRelatedProduct(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @PathParam("productId") String productId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("productId") final String productId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
return getEntityInternal(
uriInfo.getRequestUri().toASCIIString(), accept, "Products", productId, format, null, null, false);
@@ -648,11 +648,11 @@ public class V4Services extends AbstractServices {
@POST
@Path("/Accounts({entityId})/Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI{paren:[\\(\\)]*}")
public Response actionRefreshDefaultPI(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @PathParam("entityId") String entityId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @PathParam("entityId") final String entityId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
final String param) {
try {
@@ -671,9 +671,9 @@ public class V4Services extends AbstractServices {
@GET
@Path("/Accounts({entityId})/Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI{paren:[\\(\\)]*}")
public Response functionGetDefaultPI(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @PathParam("entityId") String entityId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entityId") final String entityId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
return getContainedEntity(accept, entityId, "MyPaymentInstruments", entityId + "901", format);
}
@@ -681,9 +681,9 @@ public class V4Services extends AbstractServices {
@GET
@Path("/Accounts({entityId})/Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo{paren:[\\(\\)]*}")
public Response functionGetAccountInfo(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @PathParam("entityId") String entityId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entityId") final String entityId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
return getPath(accept, "Accounts", entityId, "AccountInfo", format);
}
@@ -691,9 +691,9 @@ public class V4Services extends AbstractServices {
@GET
@Path("/Accounts({entityId})/MyGiftCard/Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount({param:.*})")
public Response functionGetActualAmount(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @PathParam("entityId") String entityId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entityId") final String entityId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
try {
final Accept acceptType;
@@ -721,7 +721,7 @@ public class V4Services extends AbstractServices {
/**
* Retrieve entity reference sample.
- *
+ *
* @param accept Accept header.
* @param path path.
* @param format format query option.
@@ -730,9 +730,9 @@ public class V4Services extends AbstractServices {
@GET
@Path("/{path:.*}/$ref")
public Response getEntityReference(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @PathParam("path") String path,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("path") final String path,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
try {
final Map.Entry<Accept, AbstractUtilities> utils = getUtilities(accept, format);
@@ -802,11 +802,11 @@ public class V4Services extends AbstractServices {
@GET
@Path("/Accounts({entityId})/{containedEntitySetName}({containedEntityId})")
public Response getContainedEntity(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @PathParam("entityId") String entityId,
- @PathParam("containedEntitySetName") String containedEntitySetName,
- @PathParam("containedEntityId") String containedEntityId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entityId") final String entityId,
+ @PathParam("containedEntitySetName") final String containedEntitySetName,
+ @PathParam("containedEntityId") final String containedEntityId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
try {
final Accept acceptType;
@@ -840,11 +840,11 @@ public class V4Services extends AbstractServices {
@POST
@Path("/Accounts({entityId})/{containedEntitySetName:.*}")
public Response postContainedEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @PathParam("entityId") String entityId,
- @PathParam("containedEntitySetName") String containedEntitySetName,
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @PathParam("entityId") final String entityId,
+ @PathParam("containedEntitySetName") final String containedEntitySetName,
final String entity) {
try {
@@ -917,13 +917,13 @@ public class V4Services extends AbstractServices {
@PATCH
@Path("/{entitySetName}({entityId})/{containedEntitySetName}({containedEntityId})")
public Response patchContainedEntity(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- @PathParam("containedEntitySetName") String containedEntitySetName,
- @PathParam("containedEntityId") String containedEntityId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ @PathParam("containedEntitySetName") final String containedEntitySetName,
+ @PathParam("containedEntityId") final String containedEntityId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
final String changes) {
try {
@@ -985,9 +985,9 @@ public class V4Services extends AbstractServices {
@DELETE
@Path("/Accounts({entityId})/{containedEntitySetName}({containedEntityId})")
public Response removeContainedEntity(
- @PathParam("entityId") String entityId,
- @PathParam("containedEntitySetName") String containedEntitySetName,
- @PathParam("containedEntityId") String containedEntityId) {
+ @PathParam("entityId") final String entityId,
+ @PathParam("containedEntitySetName") final String containedEntitySetName,
+ @PathParam("containedEntityId") final String containedEntityId) {
try {
// 1. Fetch the contained entity to be removed
@@ -1026,10 +1026,10 @@ public class V4Services extends AbstractServices {
@GET
@Path("/Accounts({entityId})/{containedEntitySetName:.*}")
public Response getContainedEntitySet(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @PathParam("entityId") String entityId,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entityId") final String entityId,
@PathParam("containedEntitySetName") String containedEntitySetName,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
if ("MyGiftCard".equals(containedEntitySetName)) {
return getContainedEntity(accept, entityId, containedEntitySetName, null, format);
@@ -1081,8 +1081,8 @@ public class V4Services extends AbstractServices {
@GET
@Path("/GetDefaultColor()")
public Response functionGetDefaultColor(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
try {
final Accept acceptType;
@@ -1112,9 +1112,9 @@ public class V4Services extends AbstractServices {
@GET
@Path("/GetPerson2({param:.*})")
public Response functionGetPerson2(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
return getEntityInternal(
uriInfo.getRequestUri().toASCIIString(), accept, "Customers", "1", format, null, null, false);
@@ -1123,9 +1123,9 @@ public class V4Services extends AbstractServices {
@GET
@Path("/GetPerson({param:.*})")
public Response functionGetPerson(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
return getEntityInternal(
uriInfo.getRequestUri().toASCIIString(), accept, "Customers", "1", format, null, null, false);
@@ -1134,9 +1134,9 @@ public class V4Services extends AbstractServices {
@GET
@Path("/GetAllProducts()")
public Response functionGetAllProducts(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
return getEntitySet(uriInfo, accept, "Products", null, null, format, null, null, null, null);
}
@@ -1144,9 +1144,9 @@ public class V4Services extends AbstractServices {
@GET
@Path("/GetProductsByAccessLevel({param:.*})")
public Response functionGetProductsByAccessLevel(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
try {
final Accept acceptType;
@@ -1177,9 +1177,9 @@ public class V4Services extends AbstractServices {
@GET
@Path("/GetBossEmails({param:.*})")
public Response functionGetBossEmails(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
try {
final Accept acceptType;
@@ -1206,9 +1206,9 @@ public class V4Services extends AbstractServices {
@POST
@Path("/Discount()")
public Response actionDiscount(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
final String param) {
try {
@@ -1246,9 +1246,9 @@ public class V4Services extends AbstractServices {
@POST
@Path("/ResetBossAddress()")
public Response actionResetBossAddress(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
final String param) {
try {
@@ -1284,9 +1284,9 @@ public class V4Services extends AbstractServices {
@POST
@Path("/ResetBossEmail()")
public Response actionResetBossEmail(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
final String param) {
try {
@@ -1317,9 +1317,9 @@ public class V4Services extends AbstractServices {
@POST
@Path("/Products({productId})/Categories/$ref")
public Response createLinked(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
final String entity) {
return xml.createResponse(null, null, null, Status.NO_CONTENT);
@@ -1328,9 +1328,9 @@ public class V4Services extends AbstractServices {
@DELETE
@Path("/Products({productId})/Categories({categoryId})/$ref")
public Response deleteLinked(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
final String entity) {
return xml.createResponse(null, null, null, Status.NO_CONTENT);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java b/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java
index 5d64457..cf20fba 100644
--- a/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java
+++ b/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -24,6 +24,7 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
import org.apache.olingo.fit.metadata.Metadata;
import org.apache.olingo.fit.utils.Accept;
@@ -42,10 +43,10 @@ public class V4Vocabularies {
private final XMLUtilities xml;
public V4Vocabularies() throws Exception {
- this.metadata = new Metadata(FSManager.instance(ODataServiceVersion.V40).readRes(
- "vocabularies-" + Constants.get(ODataServiceVersion.V40, ConstantKey.METADATA), Accept.XML),
- ODataServiceVersion.V40);
- this.xml = new XMLUtilities(ODataServiceVersion.V40, metadata);
+ metadata = new Metadata(FSManager.instance(ODataServiceVersion.V40).readRes(
+ "vocabularies-" + Constants.get(ODataServiceVersion.V40, ConstantKey.METADATA), Accept.XML),
+ ODataServiceVersion.V40);
+ xml = new XMLUtilities(ODataServiceVersion.V40, metadata);
}
@GET
@@ -54,11 +55,11 @@ public class V4Vocabularies {
public Response getMetadata() {
try {
return xml.createResponse(
- null,
- FSManager.instance(ODataServiceVersion.V40).readRes(
- "vocabularies-" + Constants.get(ODataServiceVersion.V40, ConstantKey.METADATA), Accept.XML),
- null,
- Accept.XML);
+ null,
+ FSManager.instance(ODataServiceVersion.V40).readRes(
+ "vocabularies-" + Constants.get(ODataServiceVersion.V40, ConstantKey.METADATA), Accept.XML),
+ null,
+ Accept.XML);
} catch (Exception e) {
return xml.createFaultResponse(Accept.XML.toString(ODataServiceVersion.V40), e);
}
@@ -70,10 +71,10 @@ public class V4Vocabularies {
public Response getVocabulary(@PathParam("vocabulary") final String vocabulary) {
try {
return xml.createResponse(
- null,
- FSManager.instance(ODataServiceVersion.V40).readFile(vocabulary, null),
- null,
- Accept.XML);
+ null,
+ FSManager.instance(ODataServiceVersion.V40).readFile(vocabulary, null),
+ null,
+ Accept.XML);
} catch (Exception e) {
return xml.createFaultResponse(Accept.XML.toString(ODataServiceVersion.V40), e);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/metadata/AbstractMetadataElement.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/metadata/AbstractMetadataElement.java b/fit/src/main/java/org/apache/olingo/fit/metadata/AbstractMetadataElement.java
index 9a83a76..8a94814 100644
--- a/fit/src/main/java/org/apache/olingo/fit/metadata/AbstractMetadataElement.java
+++ b/fit/src/main/java/org/apache/olingo/fit/metadata/AbstractMetadataElement.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/metadata/Association.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/metadata/Association.java b/fit/src/main/java/org/apache/olingo/fit/metadata/Association.java
index f750d2c..5277f23 100644
--- a/fit/src/main/java/org/apache/olingo/fit/metadata/Association.java
+++ b/fit/src/main/java/org/apache/olingo/fit/metadata/Association.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/metadata/AssociationSet.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/metadata/AssociationSet.java b/fit/src/main/java/org/apache/olingo/fit/metadata/AssociationSet.java
index 3d381d7..f94a62f 100644
--- a/fit/src/main/java/org/apache/olingo/fit/metadata/AssociationSet.java
+++ b/fit/src/main/java/org/apache/olingo/fit/metadata/AssociationSet.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/metadata/Container.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/metadata/Container.java b/fit/src/main/java/org/apache/olingo/fit/metadata/Container.java
index 37d3f92..fefdea1 100644
--- a/fit/src/main/java/org/apache/olingo/fit/metadata/Container.java
+++ b/fit/src/main/java/org/apache/olingo/fit/metadata/Container.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/metadata/EntitySet.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/metadata/EntitySet.java b/fit/src/main/java/org/apache/olingo/fit/metadata/EntitySet.java
index b127861..d35dfc0 100644
--- a/fit/src/main/java/org/apache/olingo/fit/metadata/EntitySet.java
+++ b/fit/src/main/java/org/apache/olingo/fit/metadata/EntitySet.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -33,12 +33,13 @@ public class EntitySet extends AbstractMetadataElement {
// V4 only
// --------------------------
private final Map<String, String> binding;
+
// --------------------------
public EntitySet(final String name, final boolean singleton) {
this.name = name;
this.singleton = singleton;
- this.binding = new LinkedHashMap<String, String>();
+ binding = new LinkedHashMap<String, String>();
}
public EntitySet(final String name) {
@@ -53,7 +54,7 @@ public class EntitySet extends AbstractMetadataElement {
return type;
}
- public void setType(String type) {
+ public void setType(final String type) {
this.type = type;
}
@@ -62,11 +63,11 @@ public class EntitySet extends AbstractMetadataElement {
}
public EntitySet addBinding(final String path, final String target) {
- this.binding.put(path, target);
+ binding.put(path, target);
return this;
}
public String getTarget(final String path) {
- return this.binding.get(path);
+ return binding.get(path);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/metadata/EntityType.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/metadata/EntityType.java b/fit/src/main/java/org/apache/olingo/fit/metadata/EntityType.java
index 90f51d5..46d9c41 100644
--- a/fit/src/main/java/org/apache/olingo/fit/metadata/EntityType.java
+++ b/fit/src/main/java/org/apache/olingo/fit/metadata/EntityType.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -37,8 +37,8 @@ public class EntityType extends AbstractMetadataElement {
public EntityType(final String name) {
this.name = name;
- this.properties = new HashMap<String, Property>();
- this.navigationProperties = new HashMap<String, NavigationProperty>();
+ properties = new HashMap<String, Property>();
+ navigationProperties = new HashMap<String, NavigationProperty>();
}
public String getName() {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/metadata/Metadata.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/metadata/Metadata.java b/fit/src/main/java/org/apache/olingo/fit/metadata/Metadata.java
index 543fae7..64c20a4 100644
--- a/fit/src/main/java/org/apache/olingo/fit/metadata/Metadata.java
+++ b/fit/src/main/java/org/apache/olingo/fit/metadata/Metadata.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+
import javax.xml.namespace.QName;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLInputFactory;
@@ -30,6 +31,7 @@ import javax.xml.stream.XMLStreamException;
import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.StartElement;
import javax.xml.stream.events.XMLEvent;
+
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
@@ -54,8 +56,8 @@ public class Metadata extends AbstractMetadataElement {
public Metadata(final InputStream is, final ODataServiceVersion version) {
this.version = version;
- this.DEF_NS = Constants.get(version, ConstantKey.EDM_NS);
- this.schemas = new HashMap<String, Schema>();
+ DEF_NS = Constants.get(version, ConstantKey.EDM_NS);
+ schemas = new HashMap<String, Schema>();
try {
final XMLInputFactory ifactory = XMLInputFactory.newInstance();
@@ -87,14 +89,14 @@ public class Metadata extends AbstractMetadataElement {
if (StringUtils.isNotBlank(property.getReleationship())) {
// V3 ...
final Association association = schemaEntry.getValue().getAssociation(
- property.getReleationship().replaceAll(schemaEntry.getKey() + "\\.", ""));
+ property.getReleationship().replaceAll(schemaEntry.getKey() + "\\.", ""));
final Association.Role role = association.getRole(property.getToRole());
property.setFeed(role.getMultiplicity().equals("*"));
property.setType(property.isEntitySet() ? "Collection(" + role.getType() + ")" : role.getType());
// let me assume that it will be just a single container
final AssociationSet associationSet = schemaEntry.getValue().getContainers().iterator().next().
- getAssociationSet(property.getReleationship());
+ getAssociationSet(property.getReleationship());
final AssociationSet.Role associationSetRole = associationSet.getRole(property.getToRole());
property.setTarget(associationSetRole.getEntitySet());
@@ -103,7 +105,7 @@ public class Metadata extends AbstractMetadataElement {
property.setFeed(property.getType().startsWith("Collection("));
final Collection<EntitySet> entitySets = schemaEntry.getValue().getContainers().iterator().next().
- getEntitySets(schemaEntry.getKey(), entityType.getName());
+ getEntitySets(schemaEntry.getKey(), entityType.getName());
final Iterator<EntitySet> iter = entitySets.iterator();
boolean found = false;
@@ -204,11 +206,11 @@ public class Metadata extends AbstractMetadataElement {
XMLEvent event = reader.nextEvent();
if (event.isStartElement() && event.asStartElement().getName().equals(new QName(DEF_NS, "EntityType"))
- || event.isStartElement() && event.asStartElement().getName().equals(new QName(DEF_NS, "ComplexType"))) {
+ || event.isStartElement() && event.asStartElement().getName().equals(new QName(DEF_NS, "ComplexType"))) {
final EntityType entityType = getEntityType(event.asStartElement(), reader);
schema.addEntityType(entityType.getName(), entityType);
} else if (event.isStartElement()
- && event.asStartElement().getName().equals(new QName(DEF_NS, "EntityContainer"))) {
+ && event.asStartElement().getName().equals(new QName(DEF_NS, "EntityContainer"))) {
final org.apache.olingo.fit.metadata.Container container = getContainer(event.asStartElement(), reader);
schema.addContainer(container.getName(), container);
} else if (event.isStartElement() && event.asStartElement().getName().equals(new QName(DEF_NS, "Association"))) {
@@ -224,9 +226,9 @@ public class Metadata extends AbstractMetadataElement {
}
private org.apache.olingo.fit.metadata.Container getContainer(
- final StartElement start, final XMLEventReader reader) throws XMLStreamException {
+ final StartElement start, final XMLEventReader reader) throws XMLStreamException {
final org.apache.olingo.fit.metadata.Container container =
- new org.apache.olingo.fit.metadata.Container(start.getAttributeByName(new QName("Name")).getValue());
+ new org.apache.olingo.fit.metadata.Container(start.getAttributeByName(new QName("Name")).getValue());
boolean completed = false;
@@ -234,12 +236,12 @@ public class Metadata extends AbstractMetadataElement {
XMLEvent event = reader.nextEvent();
if (event.isStartElement()
- && (event.asStartElement().getName().equals(new QName(DEF_NS, "EntitySet"))
- || event.asStartElement().getName().equals(new QName(DEF_NS, "Singleton")))) {
+ && (event.asStartElement().getName().equals(new QName(DEF_NS, "EntitySet"))
+ || event.asStartElement().getName().equals(new QName(DEF_NS, "Singleton")))) {
final EntitySet entitySet = getEntitySet(event.asStartElement(), reader);
container.addEntitySet(entitySet.getName(), entitySet);
} else if (event.isStartElement()
- && event.asStartElement().getName().equals(new QName(DEF_NS, "AssociationSet"))) {
+ && event.asStartElement().getName().equals(new QName(DEF_NS, "AssociationSet"))) {
// just for V3
final AssociationSet associationSet = getAssociationSet(event.asStartElement(), reader);
container.addAssociationSet(associationSet.getAssociation(), associationSet);
@@ -252,7 +254,7 @@ public class Metadata extends AbstractMetadataElement {
}
private Association getAssociation(
- final StartElement start, final XMLEventReader reader) throws XMLStreamException {
+ final StartElement start, final XMLEventReader reader) throws XMLStreamException {
final Association association = new Association(start.getAttributeByName(new QName("Name")).getValue());
boolean completed = false;
@@ -264,7 +266,7 @@ public class Metadata extends AbstractMetadataElement {
final String role = event.asStartElement().getAttributeByName(new QName("Role")).getValue();
final String type = event.asStartElement().getAttributeByName(new QName("Type")).getValue();
final String multiplicity =
- event.asStartElement().getAttributeByName(new QName("Multiplicity")).getValue();
+ event.asStartElement().getAttributeByName(new QName("Multiplicity")).getValue();
association.addRole(role, type, multiplicity);
} else if (event.isEndElement() && event.asEndElement().getName().equals(start.getName())) {
completed = true;
@@ -275,10 +277,10 @@ public class Metadata extends AbstractMetadataElement {
}
private AssociationSet getAssociationSet(
- final StartElement start, final XMLEventReader reader) throws XMLStreamException {
+ final StartElement start, final XMLEventReader reader) throws XMLStreamException {
final AssociationSet associationSet = new AssociationSet(
- start.getAttributeByName(new QName("Name")).getValue(),
- start.getAttributeByName(new QName("Association")).getValue());
+ start.getAttributeByName(new QName("Name")).getValue(),
+ start.getAttributeByName(new QName("Association")).getValue());
boolean completed = false;
@@ -317,7 +319,7 @@ public class Metadata extends AbstractMetadataElement {
final org.apache.olingo.fit.metadata.Property property = getProperty(event.asStartElement());
entityType.addProperty(property.getName(), property);
} else if (event.isStartElement()
- && event.asStartElement().getName().equals(new QName(DEF_NS, "NavigationProperty"))) {
+ && event.asStartElement().getName().equals(new QName(DEF_NS, "NavigationProperty"))) {
final NavigationProperty property = getNavigationProperty(event.asStartElement());
entityType.addNavigationProperty(property.getName(), property);
} else if (event.isEndElement() && event.asEndElement().getName().equals(start.getName())) {
@@ -330,7 +332,7 @@ public class Metadata extends AbstractMetadataElement {
private org.apache.olingo.fit.metadata.Property getProperty(final StartElement start) throws XMLStreamException {
final org.apache.olingo.fit.metadata.Property property =
- new org.apache.olingo.fit.metadata.Property(start.getAttributeByName(new QName("Name")).getValue());
+ new org.apache.olingo.fit.metadata.Property(start.getAttributeByName(new QName("Name")).getValue());
final Attribute type = start.getAttributeByName(new QName("Type"));
property.setType(type == null ? "Edm.String" : type.getValue());
@@ -343,7 +345,7 @@ public class Metadata extends AbstractMetadataElement {
private NavigationProperty getNavigationProperty(final StartElement start) throws XMLStreamException {
final NavigationProperty property =
- new NavigationProperty(start.getAttributeByName(new QName("Name")).getValue());
+ new NavigationProperty(start.getAttributeByName(new QName("Name")).getValue());
final Attribute type = start.getAttributeByName(new QName("Type"));
if (type != null) {
@@ -365,8 +367,8 @@ public class Metadata extends AbstractMetadataElement {
private EntitySet getEntitySet(final StartElement start, final XMLEventReader reader) throws XMLStreamException {
final EntitySet entitySet = "Singleton".equals(start.getName().getLocalPart())
- ? new EntitySet(start.getAttributeByName(new QName("Name")).getValue(), true)
- : new EntitySet(start.getAttributeByName(new QName("Name")).getValue());
+ ? new EntitySet(start.getAttributeByName(new QName("Name")).getValue(), true)
+ : new EntitySet(start.getAttributeByName(new QName("Name")).getValue());
Attribute type = start.getAttributeByName(new QName("EntityType"));
if (type == null) {
@@ -382,7 +384,7 @@ public class Metadata extends AbstractMetadataElement {
XMLEvent event = reader.nextEvent();
if (event.isStartElement()
- && event.asStartElement().getName().equals(new QName(DEF_NS, "NavigationPropertyBinding"))) {
+ && event.asStartElement().getName().equals(new QName(DEF_NS, "NavigationPropertyBinding"))) {
final String path = event.asStartElement().getAttributeByName(new QName("Path")).getValue();
final String target = event.asStartElement().getAttributeByName(new QName("Target")).getValue();
entitySet.addBinding(path, target);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/metadata/NavigationProperty.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/metadata/NavigationProperty.java b/fit/src/main/java/org/apache/olingo/fit/metadata/NavigationProperty.java
index ab3a88b..b506279 100644
--- a/fit/src/main/java/org/apache/olingo/fit/metadata/NavigationProperty.java
+++ b/fit/src/main/java/org/apache/olingo/fit/metadata/NavigationProperty.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -48,7 +48,7 @@ public class NavigationProperty extends AbstractMetadataElement {
return releationship;
}
- public void setReleationship(String releationship) {
+ public void setReleationship(final String releationship) {
this.releationship = releationship;
}
@@ -56,7 +56,7 @@ public class NavigationProperty extends AbstractMetadataElement {
return toRole;
}
- public void setToRole(String toRole) {
+ public void setToRole(final String toRole) {
this.toRole = toRole;
}
@@ -64,7 +64,7 @@ public class NavigationProperty extends AbstractMetadataElement {
return type;
}
- public void setType(String type) {
+ public void setType(final String type) {
this.type = type;
}
@@ -72,7 +72,7 @@ public class NavigationProperty extends AbstractMetadataElement {
return target;
}
- public void setTarget(String target) {
+ public void setTarget(final String target) {
this.target = target;
}
@@ -80,7 +80,7 @@ public class NavigationProperty extends AbstractMetadataElement {
return entitySet;
}
- public void setFeed(boolean entitySet) {
+ public void setFeed(final boolean entitySet) {
this.entitySet = entitySet;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/metadata/Property.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/metadata/Property.java b/fit/src/main/java/org/apache/olingo/fit/metadata/Property.java
index 0ce180b..5716fcb 100644
--- a/fit/src/main/java/org/apache/olingo/fit/metadata/Property.java
+++ b/fit/src/main/java/org/apache/olingo/fit/metadata/Property.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -26,7 +26,7 @@ public class Property extends AbstractMetadataElement {
private boolean nullable;
- public Property(String name) {
+ public Property(final String name) {
this.name = name;
}
@@ -38,7 +38,7 @@ public class Property extends AbstractMetadataElement {
return type;
}
- public void setType(String type) {
+ public void setType(final String type) {
this.type = type;
}
@@ -46,7 +46,7 @@ public class Property extends AbstractMetadataElement {
return nullable;
}
- public void setNullable(boolean nullable) {
+ public void setNullable(final boolean nullable) {
this.nullable = nullable;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/metadata/Schema.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/metadata/Schema.java b/fit/src/main/java/org/apache/olingo/fit/metadata/Schema.java
index 04cf75a..7df5d38 100644
--- a/fit/src/main/java/org/apache/olingo/fit/metadata/Schema.java
+++ b/fit/src/main/java/org/apache/olingo/fit/metadata/Schema.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -35,8 +35,8 @@ public class Schema extends AbstractMetadataElement {
public Schema(final String namespace) {
this.namespace = namespace;
entityTypes = new HashMap<String, EntityType>();
- this.containers = new HashMap<String, Container>();
- this.associations = new HashMap<String, Association>();
+ containers = new HashMap<String, Container>();
+ associations = new HashMap<String, Association>();
}
public String getNamespace() {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/methods/MERGE.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/methods/MERGE.java b/fit/src/main/java/org/apache/olingo/fit/methods/MERGE.java
index 2966c11..f70eb43 100644
--- a/fit/src/main/java/org/apache/olingo/fit/methods/MERGE.java
+++ b/fit/src/main/java/org/apache/olingo/fit/methods/MERGE.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -22,10 +22,10 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+
import javax.ws.rs.HttpMethod;
-@Target({ElementType.METHOD})
+@Target({ ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
@HttpMethod("MERGE")
-public @interface MERGE {
-}
+public @interface MERGE {}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/methods/PATCH.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/methods/PATCH.java b/fit/src/main/java/org/apache/olingo/fit/methods/PATCH.java
index 6fd07b8..d4e6404 100644
--- a/fit/src/main/java/org/apache/olingo/fit/methods/PATCH.java
+++ b/fit/src/main/java/org/apache/olingo/fit/methods/PATCH.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -22,10 +22,10 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+
import javax.ws.rs.HttpMethod;
-@Target({ElementType.METHOD})
+@Target({ ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
@HttpMethod("PATCH")
-public @interface PATCH {
-}
+public @interface PATCH {}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/rproxy/LinkRewrite.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/rproxy/LinkRewrite.java b/fit/src/main/java/org/apache/olingo/fit/rproxy/LinkRewrite.java
index 082708f..af477b3 100644
--- a/fit/src/main/java/org/apache/olingo/fit/rproxy/LinkRewrite.java
+++ b/fit/src/main/java/org/apache/olingo/fit/rproxy/LinkRewrite.java
@@ -1,24 +1,25 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.fit.rproxy;
import java.util.Properties;
+
import org.esigate.Driver;
import org.esigate.DriverConfiguration;
import org.esigate.events.Event;
@@ -35,7 +36,7 @@ public class LinkRewrite implements Extension, IEventListener {
@Override
public void init(final Driver driver, final Properties properties) {
- this.config = driver.getConfiguration();
+ config = driver.getConfiguration();
driver.getEventManager().register(EventManager.EVENT_RENDER_PRE, this);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/rproxy/LinkRewriteRenderer.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/rproxy/LinkRewriteRenderer.java b/fit/src/main/java/org/apache/olingo/fit/rproxy/LinkRewriteRenderer.java
index f3447ac..f0dd762 100644
--- a/fit/src/main/java/org/apache/olingo/fit/rproxy/LinkRewriteRenderer.java
+++ b/fit/src/main/java/org/apache/olingo/fit/rproxy/LinkRewriteRenderer.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,6 +20,7 @@ package org.apache.olingo.fit.rproxy;
import java.io.IOException;
import java.io.Writer;
+
import org.apache.http.HttpEntityEnclosingRequest;
import org.esigate.Renderer;
@@ -37,19 +38,19 @@ public class LinkRewriteRenderer implements Renderer {
}
this.baseUrl = removeLeadingSlash(baseUrl);
- this.replacementUrl = removeLeadingSlash(visibleBaseUrl);
+ replacementUrl = removeLeadingSlash(visibleBaseUrl);
}
private String removeLeadingSlash(final String src) {
final int lastCharPosition = src.length() - 1;
return src.charAt(lastCharPosition) == SLASH
- ? src.substring(0, lastCharPosition)
- : src;
+ ? src.substring(0, lastCharPosition)
+ : src;
}
@Override
public void render(final HttpEntityEnclosingRequest httpRequest, final String src, final Writer out)
- throws IOException {
+ throws IOException {
out.write(src.replaceAll(baseUrl, replacementUrl));
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/serializer/FITAtomDeserializer.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/serializer/FITAtomDeserializer.java b/fit/src/main/java/org/apache/olingo/fit/serializer/FITAtomDeserializer.java
index 901cc3c..447e632 100644
--- a/fit/src/main/java/org/apache/olingo/fit/serializer/FITAtomDeserializer.java
+++ b/fit/src/main/java/org/apache/olingo/fit/serializer/FITAtomDeserializer.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java b/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java
index 779c531..d2e6d1f 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -38,6 +38,7 @@ import java.util.regex.Pattern;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.core.Response;
+import javax.xml.stream.XMLStreamException;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
@@ -97,7 +98,7 @@ public abstract class AbstractUtilities {
public AbstractUtilities(final ODataServiceVersion version, final Metadata metadata) throws Exception {
this.version = version;
this.metadata = metadata;
- this.fsManager = FSManager.instance(version);
+ fsManager = FSManager.instance(version);
atomDeserializer = new FITAtomDeserializer(version);
jsonDeserializer = new JsonDeserializer(version, true);
atomSerializer = new AtomSerializer(version, true);
@@ -110,7 +111,7 @@ public abstract class AbstractUtilities {
/**
* Add links to the given entity.
- *
+ *
* @param entitySetName
* @param entitykey
* @param is
@@ -123,17 +124,17 @@ public abstract class AbstractUtilities {
/**
* Retrieve all entity link names.
- *
+ *
* @param is
* @return
* @throws IOException
- * @throws XMLStreamException
+ * @throws XMLStreamException
*/
protected abstract Set<String> retrieveAllLinkNames(final InputStream is) throws Exception;
/**
* Retrieve entity links and inlines.
- *
+ *
* @param entitySetName
* @param is
* @return
@@ -143,7 +144,7 @@ public abstract class AbstractUtilities {
/**
* Normalize navigation info and add edit link if missing.
- *
+ *
* @param entitySetName
* @param entityKey
* @param is
@@ -276,7 +277,7 @@ public abstract class AbstractUtilities {
// -----------------------------------------
// 4. Create links file and provided inlines
- // -----------------------------------------
+ // -----------------------------------------
for (Map.Entry<String, List<String>> link : links.getLinks()) {
putLinksInMemory(path, entitySetName, entityKey, link.getKey(), link.getValue());
}
@@ -727,7 +728,7 @@ public abstract class AbstractUtilities {
/**
* Retrieves entity links about the given link name.
- *
+ *
* @param entitySetName entity set name.
* @param entityId entity id.
* @param linkName link name.
@@ -736,7 +737,7 @@ public abstract class AbstractUtilities {
*/
public LinkInfo readLinks(
final String entitySetName, final String entityId, final String linkName, final Accept accept)
- throws Exception {
+ throws Exception {
final String basePath = getLinksBasePath(entitySetName, entityId);
@@ -795,7 +796,7 @@ public abstract class AbstractUtilities {
throws Exception {
// --------------------------------
- // 0. Retrieve all 'linkName' navigation link uris (NotFoundException if missing)
+ // 0. Retrieve all 'linkName' navigation link uris (NotFoundException if missing)
// --------------------------------
final Map.Entry<String, List<String>> links = extractLinkURIs(entitySetName, entityId, linkName);
// --------------------------------
@@ -854,7 +855,7 @@ public abstract class AbstractUtilities {
protected abstract InputStream replaceLink(
final InputStream toBeChanged, final String linkName, final InputStream replacement)
- throws Exception;
+ throws Exception;
public abstract InputStream selectEntity(final InputStream entity, final String[] propertyNames)
throws Exception;
@@ -882,5 +883,5 @@ public abstract class AbstractUtilities {
public abstract Map.Entry<String, List<String>> extractLinkURIs(
final String entitySetName, final String entityId, final String linkName)
- throws Exception;
+ throws Exception;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/utils/Accept.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/Accept.java b/fit/src/main/java/org/apache/olingo/fit/utils/Accept.java
index ab3b680..67f10bc 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/Accept.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/Accept.java
@@ -1,24 +1,25 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.fit.utils;
import java.util.regex.Pattern;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.http.entity.ContentType;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
@@ -30,11 +31,11 @@ public enum Accept {
XML(ContentType.APPLICATION_XML.getMimeType(), ".xml"),
ATOM(ContentType.APPLICATION_ATOM_XML.getMimeType(), ".xml"),
JSON(ContentType.APPLICATION_JSON.getMimeType() + ";odata=minimalmetadata",
- ContentType.APPLICATION_JSON.getMimeType() + ";odata.metadata=minimal", ".full.json"),
+ ContentType.APPLICATION_JSON.getMimeType() + ";odata.metadata=minimal", ".full.json"),
JSON_NOMETA(ContentType.APPLICATION_JSON.getMimeType() + ";odata=nometadata",
- ContentType.APPLICATION_JSON.getMimeType() + ";odata.metadata=none", ".full.json"),
+ ContentType.APPLICATION_JSON.getMimeType() + ";odata.metadata=none", ".full.json"),
JSON_FULLMETA(ContentType.APPLICATION_JSON.getMimeType() + ";odata=fullmetadata",
- ContentType.APPLICATION_JSON.getMimeType() + ";odata.metadata=full", ".full.json");
+ ContentType.APPLICATION_JSON.getMimeType() + ";odata.metadata=full", ".full.json");
private final String contentTypeV3;
@@ -46,7 +47,7 @@ public enum Accept {
Accept(final String contentTypeV3, final String fileExtension) {
this.contentTypeV3 = contentTypeV3;
- this.contentTypeV4 = contentTypeV3;
+ contentTypeV4 = contentTypeV3;
this.fileExtension = fileExtension;
}
@@ -83,7 +84,7 @@ public enum Accept {
} else if (contentType.startsWith(JSON_FULLMETA.toString(version))) {
return JSON_FULLMETA;
} else if (contentType.startsWith(JSON.toString(version))
- || contentType.startsWith(ContentType.APPLICATION_JSON.getMimeType())) {
+ || contentType.startsWith(ContentType.APPLICATION_JSON.getMimeType())) {
return JSON;
} else if (contentType.startsWith(XML.toString(version))) {
[33/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndexCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndexCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndexCollection.java
index e66cd96..f5b8d72 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndexCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndexCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.*;
-import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface RowIndexCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowIndex> {
+public interface RowIndexCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowIndex> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/package-info.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/package-info.java
index e8f9b9b..92b2a1a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/package-info.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/package-info.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBinarySet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBinarySet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBinarySet.java
index 776681c..efed6e1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBinarySet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBinarySet.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmBinarySet")
-public interface EdmBinarySet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBinary, byte[], org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBinaryCollection> {
+public interface EdmBinarySet
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBinary, byte[], org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBinaryCollection> {
+
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBinary
+ newEdmBinary();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBinary newEdmBinary();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBinaryCollection newEdmBinaryCollection();
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBinaryCollection
+ newEdmBinaryCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBooleanSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBooleanSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBooleanSet.java
index b1a950b..8ee6ff4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBooleanSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBooleanSet.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmBooleanSet")
-public interface EdmBooleanSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBoolean, java.lang.Boolean, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBooleanCollection> {
+public interface EdmBooleanSet
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBoolean, java.lang.Boolean, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBooleanCollection> {
+
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBoolean
+ newEdmBoolean();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBoolean newEdmBoolean();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBooleanCollection newEdmBooleanCollection();
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBooleanCollection
+ newEdmBooleanCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmByteSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmByteSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmByteSet.java
index 95b051e..d45a137 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmByteSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmByteSet.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmByteSet")
-public interface EdmByteSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmByte, java.lang.Short, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmByteCollection> {
+public interface EdmByteSet
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmByte, java.lang.Short, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmByteCollection> {
+
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmByte
+ newEdmByte();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmByte newEdmByte();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmByteCollection newEdmByteCollection();
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmByteCollection
+ newEdmByteCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeOffsetSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeOffsetSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeOffsetSet.java
index 8df4e7d..4957c43 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeOffsetSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeOffsetSet.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmDateTimeOffsetSet")
-public interface EdmDateTimeOffsetSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeOffset, java.util.Calendar, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeOffsetCollection> {
+public interface EdmDateTimeOffsetSet
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeOffset, java.util.Calendar, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeOffsetCollection> {
+
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeOffset
+ newEdmDateTimeOffset();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeOffset newEdmDateTimeOffset();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeOffsetCollection newEdmDateTimeOffsetCollection();
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeOffsetCollection
+ newEdmDateTimeOffsetCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeSet.java
index b1cfbda..99cac82 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeSet.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmDateTimeSet")
-public interface EdmDateTimeSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTime, java.util.Calendar, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeCollection> {
+public interface EdmDateTimeSet
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTime, java.util.Calendar, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeCollection> {
+
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTime
+ newEdmDateTime();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTime newEdmDateTime();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeCollection newEdmDateTimeCollection();
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeCollection
+ newEdmDateTimeCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDecimalSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDecimalSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDecimalSet.java
index 920a9ef..310a881 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDecimalSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDecimalSet.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmDecimalSet")
-public interface EdmDecimalSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDecimal, java.math.BigDecimal, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDecimalCollection> {
+public interface EdmDecimalSet
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDecimal, java.math.BigDecimal, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDecimalCollection> {
+
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDecimal
+ newEdmDecimal();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDecimal newEdmDecimal();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDecimalCollection newEdmDecimalCollection();
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDecimalCollection
+ newEdmDecimalCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDoubleSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDoubleSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDoubleSet.java
index f006be7..321f21b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDoubleSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDoubleSet.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmDoubleSet")
-public interface EdmDoubleSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDouble, java.lang.Double, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDoubleCollection> {
+public interface EdmDoubleSet
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDouble, java.lang.Double, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDoubleCollection> {
+
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDouble
+ newEdmDouble();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDouble newEdmDouble();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDoubleCollection newEdmDoubleCollection();
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDoubleCollection
+ newEdmDoubleCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmGuidSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmGuidSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmGuidSet.java
index 1a59c71..1d356d1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmGuidSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmGuidSet.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmGuidSet")
-public interface EdmGuidSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmGuid, java.util.UUID, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmGuidCollection> {
+public interface EdmGuidSet
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmGuid, java.util.UUID, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmGuidCollection> {
+
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmGuid
+ newEdmGuid();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmGuid newEdmGuid();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmGuidCollection newEdmGuidCollection();
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmGuidCollection
+ newEdmGuidCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt16Set.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt16Set.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt16Set.java
index bc1b5ec..acf8998 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt16Set.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt16Set.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmInt16Set")
-public interface EdmInt16Set
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt16, java.lang.Short, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt16Collection> {
+public interface EdmInt16Set
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt16, java.lang.Short, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt16Collection> {
+
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt16
+ newEdmInt16();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt16 newEdmInt16();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt16Collection newEdmInt16Collection();
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt16Collection
+ newEdmInt16Collection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt32Set.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt32Set.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt32Set.java
index 6bd87a4..cb9fd9f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt32Set.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt32Set.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmInt32Set")
-public interface EdmInt32Set
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt32, java.lang.Integer, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt32Collection> {
+public interface EdmInt32Set
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt32, java.lang.Integer, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt32Collection> {
+
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt32
+ newEdmInt32();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt32 newEdmInt32();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt32Collection newEdmInt32Collection();
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt32Collection
+ newEdmInt32Collection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt64Set.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt64Set.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt64Set.java
index d9fbc9d..ef59662 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt64Set.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt64Set.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmInt64Set")
-public interface EdmInt64Set
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt64, java.lang.Long, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt64Collection> {
+public interface EdmInt64Set
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt64, java.lang.Long, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt64Collection> {
+
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt64
+ newEdmInt64();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt64 newEdmInt64();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt64Collection newEdmInt64Collection();
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt64Collection
+ newEdmInt64Collection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmSingleSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmSingleSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmSingleSet.java
index d055aac..fa065e6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmSingleSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmSingleSet.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmSingleSet")
-public interface EdmSingleSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmSingle, java.lang.Float, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmSingleCollection> {
+public interface EdmSingleSet
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmSingle, java.lang.Float, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmSingleCollection> {
+
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmSingle
+ newEdmSingle();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmSingle newEdmSingle();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmSingleCollection newEdmSingleCollection();
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmSingleCollection
+ newEdmSingleCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmStringSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmStringSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmStringSet.java
index 9cbf840..1ab5e87 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmStringSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmStringSet.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmStringSet")
-public interface EdmStringSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmString, java.lang.String, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmStringCollection> {
+public interface EdmStringSet
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmString, java.lang.String, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmStringCollection> {
+
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmString
+ newEdmString();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmString newEdmString();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmStringCollection newEdmStringCollection();
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmStringCollection
+ newEdmStringCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmTimeSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmTimeSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmTimeSet.java
index bdef918..10e5d67 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmTimeSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmTimeSet.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmTimeSet")
-public interface EdmTimeSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmTime, java.math.BigDecimal, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmTimeCollection> {
+public interface EdmTimeSet
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmTime, java.math.BigDecimal, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmTimeCollection> {
+
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmTime
+ newEdmTime();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmTime newEdmTime();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmTimeCollection newEdmTimeCollection();
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmTimeCollection
+ newEdmTimeCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/Folders.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/Folders.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/Folders.java
index 82b014f..794248c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/Folders.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/Folders.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Folders")
-public interface Folders
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.Folder, java.lang.Integer, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.FolderCollection> {
+public interface Folders
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.Folder, java.lang.Integer, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.FolderCollection> {
+
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.Folder
+ newFolder();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.Folder newFolder();
- org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.FolderCollection newFolderCollection();
+ org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.FolderCollection
+ newFolderCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java
index aee4490..b4920a9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java
@@ -1,78 +1,66 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.PersistenceManager;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
@org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "TestContext",
- namespace = "Microsoft.Test.OData.Services.PrimitiveKeysService",
- isDefaultEntityContainer = true)
+ namespace = "Microsoft.Test.OData.Services.PrimitiveKeysService",
+ isDefaultEntityContainer = true)
public interface TestContext extends PersistenceManager {
- EdmTimeSet getEdmTimeSet();
- EdmDoubleSet getEdmDoubleSet();
- EdmStringSet getEdmStringSet();
- EdmBooleanSet getEdmBooleanSet();
- EdmBinarySet getEdmBinarySet();
- EdmDecimalSet getEdmDecimalSet();
- EdmGuidSet getEdmGuidSet();
- EdmInt32Set getEdmInt32Set();
- EdmInt64Set getEdmInt64Set();
- EdmInt16Set getEdmInt16Set();
- EdmByteSet getEdmByteSet();
- EdmDateTimeSet getEdmDateTimeSet();
- Folders getFolders();
- EdmSingleSet getEdmSingleSet();
- EdmDateTimeOffsetSet getEdmDateTimeOffsetSet();
+ EdmTimeSet getEdmTimeSet();
+ EdmDoubleSet getEdmDoubleSet();
+ EdmStringSet getEdmStringSet();
+ EdmBooleanSet getEdmBooleanSet();
+
+ EdmBinarySet getEdmBinarySet();
+
+ EdmDecimalSet getEdmDecimalSet();
+
+ EdmGuidSet getEdmGuidSet();
+
+ EdmInt32Set getEdmInt32Set();
+
+ EdmInt64Set getEdmInt64Set();
+
+ EdmInt16Set getEdmInt16Set();
+
+ EdmByteSet getEdmByteSet();
+
+ EdmDateTimeSet getEdmDateTimeSet();
+
+ Folders getFolders();
+
+ EdmSingleSet getEdmSingleSet();
+
+ EdmDateTimeOffsetSet getEdmDateTimeOffsetSet();
Operations operations();
public interface Operations {
-
- }
}
+
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/package-info.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/package-info.java
index dc4441d..7463fa4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/package-info.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/package-info.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinary.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinary.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinary.java
index b966c8d..cf7f500 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinary.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinary.java
@@ -1,105 +1,72 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmBinary",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface EdmBinary
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Binary",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- byte[] getId();
-
- void setId(byte[] _id);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Binary")
- Annotatable getIdAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface EdmBinary
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Binary",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ byte[] getId();
+
+ void setId(byte[] _id);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Binary")
+ Annotatable getIdAnnotations();
+
+ }
}
[24/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
index 2908c96..36fdc73 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
@@ -1,200 +1,166 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "LastLogin",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface LastLogin
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Username",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getUsername();
-
- void setUsername(java.lang.String _username);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LoggedIn",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getLoggedIn();
-
- void setLoggedIn(java.util.Calendar _loggedIn);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LoggedOut",
- type = "Edm.DateTime",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getLoggedOut();
-
- void setLoggedOut(java.util.Calendar _loggedOut);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Duration",
- type = "Edm.Time",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.math.BigDecimal getDuration();
-
- void setDuration(java.math.BigDecimal _duration);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login getLogin();
-
- void setLogin(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Username",
- type = "Edm.String")
- Annotatable getUsernameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LoggedIn",
- type = "Edm.DateTime")
- Annotatable getLoggedInAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LoggedOut",
- type = "Edm.DateTime")
- Annotatable getLoggedOutAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Duration",
- type = "Edm.Time")
- Annotatable getDurationAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
- Annotatable getLoginAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface LastLogin
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Username",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getUsername();
+
+ void setUsername(java.lang.String _username);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LoggedIn",
+ type = "Edm.DateTime",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getLoggedIn();
+
+ void setLoggedIn(java.util.Calendar _loggedIn);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LoggedOut",
+ type = "Edm.DateTime",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getLoggedOut();
+
+ void setLoggedOut(java.util.Calendar _loggedOut);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Duration",
+ type = "Edm.Time",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.math.BigDecimal getDuration();
+
+ void setDuration(java.math.BigDecimal _duration);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Login",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login
+ getLogin();
+
+ void
+ setLogin(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Username",
+ type = "Edm.String")
+ Annotatable getUsernameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LoggedIn",
+ type = "Edm.DateTime")
+ Annotatable getLoggedInAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LoggedOut",
+ type = "Edm.DateTime")
+ Annotatable getLoggedOutAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Duration",
+ type = "Edm.Time")
+ Annotatable getDurationAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getLoginAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
index f6277cc..b3c6157 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface LastLoginCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin> {
+public interface LastLoginCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java
index 302a32f..e662def 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java
@@ -1,227 +1,192 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "License",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface License
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LicenseNumber",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getLicenseNumber();
-
- void setLicenseNumber(java.lang.String _licenseNumber);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LicenseClass",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getLicenseClass();
-
- void setLicenseClass(java.lang.String _licenseClass);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Restrictions",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getRestrictions();
-
- void setRestrictions(java.lang.String _restrictions);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ExpirationDate",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getExpirationDate();
-
- void setExpirationDate(java.util.Calendar _expirationDate);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Driver",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Driver",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Driver",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver getDriver();
-
- void setDriver(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver _driver);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LicenseNumber",
- type = "Edm.String")
- Annotatable getLicenseNumberAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LicenseClass",
- type = "Edm.String")
- Annotatable getLicenseClassAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Restrictions",
- type = "Edm.String")
- Annotatable getRestrictionsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ExpirationDate",
- type = "Edm.DateTime")
- Annotatable getExpirationDateAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Driver",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Driver")
- Annotatable getDriverAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface License
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LicenseNumber",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getLicenseNumber();
+
+ void setLicenseNumber(java.lang.String _licenseNumber);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LicenseClass",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getLicenseClass();
+
+ void setLicenseClass(java.lang.String _licenseClass);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Restrictions",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getRestrictions();
+
+ void setRestrictions(java.lang.String _restrictions);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ExpirationDate",
+ type = "Edm.DateTime",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getExpirationDate();
+
+ void setExpirationDate(java.util.Calendar _expirationDate);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Driver",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Driver",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Driver",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver
+ getDriver();
+
+ void
+ setDriver(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver _driver);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LicenseNumber",
+ type = "Edm.String")
+ Annotatable getLicenseNumberAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LicenseClass",
+ type = "Edm.String")
+ Annotatable getLicenseClassAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Restrictions",
+ type = "Edm.String")
+ Annotatable getRestrictionsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ExpirationDate",
+ type = "Edm.DateTime")
+ Annotatable getExpirationDateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Driver",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Driver")
+ Annotatable getDriverAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
index 64ebeb0..4b6b6e1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface LicenseCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.License> {
+public interface LicenseCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.License> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
index e1639db..3d1d281 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
@@ -1,202 +1,182 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Login",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Login
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Username",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getUsername();
-
- void setUsername(java.lang.String _username);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getCustomerId();
-
- void setCustomerId(java.lang.Integer _customerId);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Customer",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Customer",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer getCustomer();
-
- void setCustomer(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer _customer);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "LastLogin",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.LastLogin",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "LastLogin",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin getLastLogin();
-
- void setLastLogin(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin _lastLogin);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "SentMessages",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Message",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Message",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection getSentMessages();
-
- void setSentMessages(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection _sentMessages);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ReceivedMessages",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Message",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Message",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection getReceivedMessages();
-
- void setReceivedMessages(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection _receivedMessages);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Orders",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Order",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection getOrders();
-
- void setOrders(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection _orders);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Username",
- type = "Edm.String")
- Annotatable getUsernameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerId",
- type = "Edm.Int32")
- Annotatable getCustomerIdAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Customer",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
- Annotatable getCustomerAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "LastLogin",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.LastLogin")
- Annotatable getLastLoginAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "SentMessages",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Message")
- Annotatable getSentMessagesAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ReceivedMessages",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Message")
- Annotatable getReceivedMessagesAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Orders",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
- Annotatable getOrdersAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Login
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Username",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getUsername();
+
+ void setUsername(java.lang.String _username);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getCustomerId();
+
+ void setCustomerId(java.lang.Integer _customerId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Customer",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Customer",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer
+ getCustomer();
+
+ void
+ setCustomer(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer _customer);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "LastLogin",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.LastLogin",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "LastLogin",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin
+ getLastLogin();
+
+ void
+ setLastLogin(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin _lastLogin);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "SentMessages",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Message",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Message",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection
+ getSentMessages();
+
+ void
+ setSentMessages(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection _sentMessages);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ReceivedMessages",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Message",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Message",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection
+ getReceivedMessages();
+
+ void
+ setReceivedMessages(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection _receivedMessages);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Orders",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Order",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection
+ getOrders();
+
+ void
+ setOrders(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection _orders);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Username",
+ type = "Edm.String")
+ Annotatable getUsernameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerId",
+ type = "Edm.Int32")
+ Annotatable getCustomerIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Customer",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
+ Annotatable getCustomerAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "LastLogin",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.LastLogin")
+ Annotatable getLastLoginAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "SentMessages",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Message")
+ Annotatable getSentMessagesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ReceivedMessages",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Message")
+ Annotatable getReceivedMessagesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Orders",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
+ Annotatable getOrdersAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java
index afc5dd6..3602552 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface LoginCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login> {
+public interface LoginCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login> {
Object getAnnotation(Class<? extends AbstractTerm> term);
[15/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java
index db95749..bd94057 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,35 +20,20 @@
package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*;
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Row")
+public interface Row
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row, java.util.UUID, org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowCollection> {
+ org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row newRow();
-@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Row")
-public interface Row
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row, java.util.UUID, org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowCollection> {
+ org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowCollection
+ newRowCollection();
+
+ org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.IndexedRow
+ newIndexedRow();
- org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row newRow();
- org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowCollection newRowCollection();
- org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.IndexedRow newIndexedRow();
- org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.IndexedRowCollection newIndexedRowCollection();
+ org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.IndexedRowCollection
+ newIndexedRowCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java
index 535ec88..a12382f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,14 @@
package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "RowIndex")
-public interface RowIndex
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndex, java.lang.Integer, org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndexCollection> {
+public interface RowIndex
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndex, java.lang.Integer, org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndexCollection> {
+
+ org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndex newRowIndex();
- org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndex newRowIndex();
- org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndexCollection newRowIndexCollection();
+ org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndexCollection
+ newRowIndexCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/package-info.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/package-info.java
index 815a133..fcb1372 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/package-info.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/package-info.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfo.java
index dc11e74..41cd289 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfo.java
@@ -1,115 +1,80 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "AccountInfo",
- isOpenType = true,
- isAbstract = false)
-public interface AccountInfo
- extends AbstractOpenType,java.io.Serializable {
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.String getFirstName();
-
- void setFirstName(java.lang.String _firstName);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.String getLastName();
-
- void setLastName(java.lang.String _lastName);
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FirstName",
- type = "Edm.String")
- Annotatable getFirstNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LastName",
- type = "Edm.String")
- Annotatable getLastNameAnnotations();
-
-
- }
-
+ isOpenType = true,
+ isAbstract = false)
+public interface AccountInfo
+ extends AbstractOpenType, java.io.Serializable {
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getFirstName();
+
+ void setFirstName(java.lang.String _firstName);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getLastName();
+
+ void setLastName(java.lang.String _lastName);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FirstName",
+ type = "Edm.String")
+ Annotatable getFirstNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LastName",
+ type = "Edm.String")
+ Annotatable getLastNameAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Color.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Color.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Color.java
index 535c552..d16b473 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Color.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Color.java
@@ -1,45 +1,42 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EnumType;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4")
@org.apache.olingo.ext.proxy.api.annotations.EnumType(name = "Color",
- underlyingType = EdmPrimitiveTypeKind.Int32,
- isFlags = false)
+ underlyingType = EdmPrimitiveTypeKind.Int32,
+ isFlags = false)
public enum Color {
- Red(1),
- Green(2),
- Blue(4);
+ Red(1),
+ Green(2),
+ Blue(4);
+
+ private java.lang.Integer value;
- private java.lang.Integer value;
-
- public java.lang.Integer getValue(){
- return this.value;
- }
+ public java.lang.Integer getValue() {
+ return value;
+ }
- private Color(final java.lang.Integer value){
- this.value=value;
- }
+ private Color(final java.lang.Integer value) {
+ this.value = value;
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetails.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetails.java
index 5801de5..e37f420 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetails.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetails.java
@@ -1,325 +1,269 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ContactDetails",
- isOpenType = false,
- isAbstract = false)
-public interface ContactDetails
+ isOpenType = false,
+ isAbstract = false)
+public interface ContactDetails
extends java.io.Serializable {
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstContacted",
- type = "Edm.Binary",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- byte[] getFirstContacted();
-
- void setFirstContacted(byte[] _firstContacted);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastContacted",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.util.Calendar getLastContacted();
-
- void setLastContacted(java.util.Calendar _lastContacted);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Contacted",
- type = "Edm.Date",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.util.Calendar getContacted();
-
- void setContacted(java.util.Calendar _contacted);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GUID",
- type = "Edm.Guid",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.util.UUID getGUID();
-
- void setGUID(java.util.UUID _gUID);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PreferedContactTime",
- type = "Edm.TimeOfDay",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.util.Calendar getPreferedContactTime();
-
- void setPreferedContactTime(java.util.Calendar _preferedContactTime);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Byte",
- type = "Edm.Byte",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.Short getByte();
-
- void setByte(java.lang.Short _byte);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SignedByte",
- type = "Edm.SByte",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.Byte getSignedByte();
-
- void setSignedByte(java.lang.Byte _signedByte);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Double",
- type = "Edm.Double",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.Double getDouble();
-
- void setDouble(java.lang.Double _double);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Single",
- type = "Edm.Single",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.Float getSingle();
-
- void setSingle(java.lang.Float _single);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Short",
- type = "Edm.Int16",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.Short getShort();
-
- void setShort(java.lang.Short _short);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.Integer getInt();
-
- void setInt(java.lang.Integer _int);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Long",
- type = "Edm.Int64",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.Long getLong();
-
- void setLong(java.lang.Long _long);
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FirstContacted",
- type = "Edm.Binary")
- Annotatable getFirstContactedAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LastContacted",
- type = "Edm.DateTimeOffset")
- Annotatable getLastContactedAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Contacted",
- type = "Edm.Date")
- Annotatable getContactedAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GUID",
- type = "Edm.Guid")
- Annotatable getGUIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PreferedContactTime",
- type = "Edm.TimeOfDay")
- Annotatable getPreferedContactTimeAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Byte",
- type = "Edm.Byte")
- Annotatable getByteAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "SignedByte",
- type = "Edm.SByte")
- Annotatable getSignedByteAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Double",
- type = "Edm.Double")
- Annotatable getDoubleAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Single",
- type = "Edm.Single")
- Annotatable getSingleAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Short",
- type = "Edm.Int16")
- Annotatable getShortAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Int",
- type = "Edm.Int32")
- Annotatable getIntAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Long",
- type = "Edm.Int64")
- Annotatable getLongAnnotations();
-
-
- }
-
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstContacted",
+ type = "Edm.Binary",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ byte[] getFirstContacted();
+
+ void setFirstContacted(byte[] _firstContacted);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastContacted",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.util.Calendar getLastContacted();
+
+ void setLastContacted(java.util.Calendar _lastContacted);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Contacted",
+ type = "Edm.Date",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.util.Calendar getContacted();
+
+ void setContacted(java.util.Calendar _contacted);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GUID",
+ type = "Edm.Guid",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.util.UUID getGUID();
+
+ void setGUID(java.util.UUID _gUID);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PreferedContactTime",
+ type = "Edm.TimeOfDay",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.util.Calendar getPreferedContactTime();
+
+ void setPreferedContactTime(java.util.Calendar _preferedContactTime);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Byte",
+ type = "Edm.Byte",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.Short getByte();
+
+ void setByte(java.lang.Short _byte);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SignedByte",
+ type = "Edm.SByte",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.Byte getSignedByte();
+
+ void setSignedByte(java.lang.Byte _signedByte);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Double",
+ type = "Edm.Double",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.Double getDouble();
+
+ void setDouble(java.lang.Double _double);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Single",
+ type = "Edm.Single",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.Float getSingle();
+
+ void setSingle(java.lang.Float _single);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Short",
+ type = "Edm.Int16",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.Short getShort();
+
+ void setShort(java.lang.Short _short);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.Integer getInt();
+
+ void setInt(java.lang.Integer _int);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Long",
+ type = "Edm.Int64",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.Long getLong();
+
+ void setLong(java.lang.Long _long);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FirstContacted",
+ type = "Edm.Binary")
+ Annotatable getFirstContactedAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LastContacted",
+ type = "Edm.DateTimeOffset")
+ Annotatable getLastContactedAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Contacted",
+ type = "Edm.Date")
+ Annotatable getContactedAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GUID",
+ type = "Edm.Guid")
+ Annotatable getGUIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PreferedContactTime",
+ type = "Edm.TimeOfDay")
+ Annotatable getPreferedContactTimeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Byte",
+ type = "Edm.Byte")
+ Annotatable getByteAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "SignedByte",
+ type = "Edm.SByte")
+ Annotatable getSignedByteAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Double",
+ type = "Edm.Double")
+ Annotatable getDoubleAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Single",
+ type = "Edm.Single")
+ Annotatable getSingleAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Short",
+ type = "Edm.Int16")
+ Annotatable getShortAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Int",
+ type = "Edm.Int32")
+ Annotatable getIntAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Long",
+ type = "Edm.Int64")
+ Annotatable getLongAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRow.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRow.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRow.java
index 7dd0848..20911f7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRow.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRow.java
@@ -1,106 +1,81 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "IndexedRow",
- openType = true,
- hasStream = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.OpenTypesServiceV4.Row")
-public interface IndexedRow
- extends Annotatable,org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Guid",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.UUID getId();
-
- void setId(java.util.UUID _id);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row.ComplexFactory{
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Guid")
- Annotatable getIdAnnotations();
-
-
- }
+ openType = true,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.OpenTypesServiceV4.Row")
+public interface IndexedRow
+ extends Annotatable,
+ org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row {
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Guid",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.UUID getId();
+
+ @Override
+ void setId(java.util.UUID _id);
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory extends
+ org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row.ComplexFactory {}
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations extends
+ org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Guid")
+ Annotatable getIdAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowCollection.java
index 36382b5..5b1a867 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface IndexedRowCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.IndexedRow> {
+public interface IndexedRowCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.IndexedRow> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Row.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Row.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Row.java
index 7bb0dad..214dca5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Row.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Row.java
@@ -1,105 +1,73 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Row",
- openType = true,
- hasStream = false,
- isAbstract = false)
-public interface Row
- extends Annotatable,AbstractOpenType {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Guid",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.UUID getId();
-
- void setId(java.util.UUID _id);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Guid")
- Annotatable getIdAnnotations();
-
-
- }
+ openType = true,
+ hasStream = false,
+ isAbstract = false)
+public interface Row
+ extends Annotatable, AbstractOpenType {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Guid",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.UUID getId();
+
+ void setId(java.util.UUID _id);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Guid")
+ Annotatable getIdAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowCollection.java
index aa4f641..cb6a6fe 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface RowCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row> {
+public interface RowCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndex.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndex.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndex.java
index 545214c..19d8e01 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndex.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndex.java
@@ -1,119 +1,87 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "RowIndex",
- openType = true,
- hasStream = false,
- isAbstract = false)
-public interface RowIndex
- extends Annotatable,AbstractOpenType {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getId();
-
- void setId(java.lang.Integer _id);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Rows",
- type = "Microsoft.Test.OData.Services.OpenTypesServiceV4.Row",
- targetSchema = "Microsoft.Test.OData.Services.OpenTypesServiceV4",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Row",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row getRows();
-
- void setRows(org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row _rows);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Int32")
- Annotatable getIdAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Rows",
- type = "Microsoft.Test.OData.Services.OpenTypesServiceV4.Row")
- Annotatable getRowsAnnotations();
- }
+ openType = true,
+ hasStream = false,
+ isAbstract = false)
+public interface RowIndex
+ extends Annotatable, AbstractOpenType {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getId();
+
+ void setId(java.lang.Integer _id);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Rows",
+ type = "Microsoft.Test.OData.Services.OpenTypesServiceV4.Row",
+ targetSchema = "Microsoft.Test.OData.Services.OpenTypesServiceV4",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Row",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row getRows();
+
+ void
+ setRows(org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row _rows);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Rows",
+ type = "Microsoft.Test.OData.Services.OpenTypesServiceV4.Row")
+ Annotatable getRowsAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexCollection.java
index 08c3be0..639766e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface RowIndexCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndex> {
+public interface RowIndexCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndex> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/package-info.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/package-info.java
index 4588f37..65a5829 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/package-info.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/package-info.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java
index c571081..66fa7fe 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,14 @@
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Accounts")
-public interface Accounts
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountCollection> {
+public interface Accounts
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountCollection> {
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account newAccount();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account newAccount();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountCollection newAccountCollection();
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountCollection
+ newAccountCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java
index b644b9c..e907075 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,30 +20,8 @@
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractSingleton;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Singleton;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-
-
@org.apache.olingo.ext.proxy.api.annotations.Singleton(name = "Boss")
-public interface Boss extends AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection> {
-}
+public interface Boss
+ extends
+ AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection> {}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java
index 8810011..40f863d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,30 +20,8 @@
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractSingleton;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Singleton;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-
-
@org.apache.olingo.ext.proxy.api.annotations.Singleton(name = "Company")
-public interface Company extends AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCollection> {
-}
+public interface Company
+ extends
+ AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCollection> {}
[27/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
index 3d94ec0..30967c9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface BackOrderLine2Collection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2> {
+public interface BackOrderLine2Collection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
index cf9a4f9..84736d8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface BackOrderLineCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine> {
+public interface BackOrderLineCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
index 26deea3..5a334c8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
@@ -1,189 +1,154 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Car",
- openType = false,
- hasStream = true,
- isAbstract = false)
-public interface Car
- extends Annotatable,java.io.Serializable {
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Photo",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.io.InputStream getPhoto();
-
- void setPhoto(java.io.InputStream _photo);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Video",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.io.InputStream getVideo();
-
- void setVideo(java.io.InputStream _video);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "VIN",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getVIN();
-
- void setVIN(java.lang.Integer _vIN);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getDescription();
-
- void setDescription(java.lang.String _description);
-
-
-
- void setStream(java.io.InputStream stream);
-
- java.io.InputStream getStream();
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Photo",
- type = "Edm.Stream")
- Annotatable getPhotoAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Video",
- type = "Edm.Stream")
- Annotatable getVideoAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "VIN",
- type = "Edm.Int32")
- Annotatable getVINAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
- type = "Edm.String")
- Annotatable getDescriptionAnnotations();
-
-
- }
+ openType = false,
+ hasStream = true,
+ isAbstract = false)
+public interface Car
+ extends Annotatable, java.io.Serializable {
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Photo",
+ type = "Edm.Stream",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.io.InputStream getPhoto();
+
+ void setPhoto(java.io.InputStream _photo);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Video",
+ type = "Edm.Stream",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.io.InputStream getVideo();
+
+ void setVideo(java.io.InputStream _video);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "VIN",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getVIN();
+
+ void setVIN(java.lang.Integer _vIN);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getDescription();
+
+ void setDescription(java.lang.String _description);
+
+ void setStream(java.io.InputStream stream);
+
+ java.io.InputStream getStream();
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Photo",
+ type = "Edm.Stream")
+ Annotatable getPhotoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Video",
+ type = "Edm.Stream")
+ Annotatable getVideoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "VIN",
+ type = "Edm.Int32")
+ Annotatable getVINAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
+ type = "Edm.String")
+ Annotatable getDescriptionAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
index 7c42934..da2da9f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface CarCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car> {
+public interface CarCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
index d72cc08..5b1cf20 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
@@ -1,82 +1,45 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ComplexToCategory")
-public interface ComplexToCategory
+public interface ComplexToCategory
extends java.io.Serializable {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Term", type = "Edm.String", nullable = true)
+ java.lang.String getTerm();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Term", type = "Edm.String", nullable = true)
- java.lang.String getTerm();
-
- void setTerm(java.lang.String _term);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Scheme", type = "Edm.String", nullable = true)
- java.lang.String getScheme();
-
- void setScheme(java.lang.String _scheme);
+ void setTerm(java.lang.String _term);
-
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Scheme", type = "Edm.String", nullable = true)
+ java.lang.String getScheme();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Label", type = "Edm.String", nullable = true)
- java.lang.String getLabel();
+ void setScheme(java.lang.String _scheme);
- void setLabel(java.lang.String _label);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Label", type = "Edm.String", nullable = true)
+ java.lang.String getLabel();
-
+ void setLabel(java.lang.String _label);
- ComplexFactory factory();
+ ComplexFactory factory();
- interface ComplexFactory {
- }
+ interface ComplexFactory {}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java
index 16f7736..7ad8b63 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java
@@ -1,159 +1,102 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ComplexWithAllPrimitiveTypes")
-public interface ComplexWithAllPrimitiveTypes
+public interface ComplexWithAllPrimitiveTypes
extends java.io.Serializable {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Binary", type = "Edm.Binary", nullable = true)
+ byte[] getBinary();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Binary", type = "Edm.Binary", nullable = true)
- byte[] getBinary();
-
- void setBinary(byte[] _binary);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Boolean", type = "Edm.Boolean", nullable = false)
- java.lang.Boolean getBoolean();
-
- void setBoolean(java.lang.Boolean _boolean);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Byte", type = "Edm.Byte", nullable = false)
- java.lang.Short getByte();
-
- void setByte(java.lang.Short _byte);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DateTime", type = "Edm.DateTime", nullable = false)
- java.util.Calendar getDateTime();
-
- void setDateTime(java.util.Calendar _dateTime);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Decimal", type = "Edm.Decimal", nullable = false)
- java.math.BigDecimal getDecimal();
-
- void setDecimal(java.math.BigDecimal _decimal);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Double", type = "Edm.Double", nullable = false)
- java.lang.Double getDouble();
+ void setBinary(byte[] _binary);
- void setDouble(java.lang.Double _double);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Boolean", type = "Edm.Boolean", nullable = false)
+ java.lang.Boolean getBoolean();
-
+ void setBoolean(java.lang.Boolean _boolean);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int16", type = "Edm.Int16", nullable = false)
- java.lang.Short getInt16();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Byte", type = "Edm.Byte", nullable = false)
+ java.lang.Short getByte();
- void setInt16(java.lang.Short _int16);
+ void setByte(java.lang.Short _byte);
-
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DateTime", type = "Edm.DateTime", nullable = false)
+ java.util.Calendar getDateTime();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int32", type = "Edm.Int32", nullable = false)
- java.lang.Integer getInt32();
+ void setDateTime(java.util.Calendar _dateTime);
- void setInt32(java.lang.Integer _int32);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Decimal", type = "Edm.Decimal", nullable = false)
+ java.math.BigDecimal getDecimal();
-
+ void setDecimal(java.math.BigDecimal _decimal);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int64", type = "Edm.Int64", nullable = false)
- java.lang.Long getInt64();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Double", type = "Edm.Double", nullable = false)
+ java.lang.Double getDouble();
- void setInt64(java.lang.Long _int64);
+ void setDouble(java.lang.Double _double);
-
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int16", type = "Edm.Int16", nullable = false)
+ java.lang.Short getInt16();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SByte", type = "Edm.SByte", nullable = false)
- java.lang.Byte getSByte();
+ void setInt16(java.lang.Short _int16);
- void setSByte(java.lang.Byte _sByte);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int32", type = "Edm.Int32", nullable = false)
+ java.lang.Integer getInt32();
-
+ void setInt32(java.lang.Integer _int32);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "String", type = "Edm.String", nullable = true)
- java.lang.String getString();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int64", type = "Edm.Int64", nullable = false)
+ java.lang.Long getInt64();
- void setString(java.lang.String _string);
+ void setInt64(java.lang.Long _int64);
-
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SByte", type = "Edm.SByte", nullable = false)
+ java.lang.Byte getSByte();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Single", type = "Edm.Single", nullable = false)
- java.lang.Float getSingle();
+ void setSByte(java.lang.Byte _sByte);
- void setSingle(java.lang.Float _single);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "String", type = "Edm.String", nullable = true)
+ java.lang.String getString();
-
+ void setString(java.lang.String _string);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeographyPoint", type = "Edm.GeographyPoint", nullable = true)
- org.apache.olingo.commons.api.edm.geo.Point getGeographyPoint();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Single", type = "Edm.Single", nullable = false)
+ java.lang.Float getSingle();
- void setGeographyPoint(org.apache.olingo.commons.api.edm.geo.Point _geographyPoint);
+ void setSingle(java.lang.Float _single);
-
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeographyPoint", type = "Edm.GeographyPoint",
+ nullable = true)
+ org.apache.olingo.commons.api.edm.geo.Point getGeographyPoint();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeometryPoint", type = "Edm.GeometryPoint", nullable = true)
- org.apache.olingo.commons.api.edm.geo.Point getGeometryPoint();
+ void setGeographyPoint(org.apache.olingo.commons.api.edm.geo.Point _geographyPoint);
- void setGeometryPoint(org.apache.olingo.commons.api.edm.geo.Point _geometryPoint);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeometryPoint", type = "Edm.GeometryPoint",
+ nullable = true)
+ org.apache.olingo.commons.api.edm.geo.Point getGeometryPoint();
-
+ void setGeometryPoint(org.apache.olingo.commons.api.edm.geo.Point _geometryPoint);
- ComplexFactory factory();
+ ComplexFactory factory();
- interface ComplexFactory {
- }
+ interface ComplexFactory {}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
index 9874a32..8d074b0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
@@ -1,157 +1,128 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Computer",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Computer
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComputerId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getComputerId();
-
- void setComputerId(java.lang.Integer _computerId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ComputerDetail",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "ComputerDetail",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail getComputerDetail();
-
- void setComputerDetail(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail _computerDetail);
-
-
- Operations operations();
-
- interface Operations {
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetComputer",
- type = OperationType.ACTION,
- returnType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer getComputer(
- );
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComputerId",
- type = "Edm.Int32")
- Annotatable getComputerIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ComputerDetail",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail")
- Annotatable getComputerDetailAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Computer
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComputerId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getComputerId();
+
+ void setComputerId(java.lang.Integer _computerId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ComputerDetail",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "ComputerDetail",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail
+ getComputerDetail();
+
+ void
+ setComputerDetail(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail _computerDetail);
+
+ Operations operations();
+
+ interface Operations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetComputer",
+ type = OperationType.ACTION,
+ returnType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer
+ getComputer(
+ );
+
+ }
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComputerId",
+ type = "Edm.Int32")
+ Annotatable getComputerIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ComputerDetail",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail")
+ Annotatable getComputerDetailAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
index 577e16e..46fb209 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface ComputerCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer> {
+public interface ComputerCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
index ee4e989..6f69e43 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
@@ -1,297 +1,269 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.ext.proxy.api.annotations.Key;
+import org.apache.olingo.ext.proxy.api.annotations.Parameter;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ComputerDetail",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface ComputerDetail
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComputerDetailId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getComputerDetailId();
-
- void setComputerDetailId(java.lang.Integer _computerDetailId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Manufacturer",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getManufacturer();
-
- void setManufacturer(java.lang.String _manufacturer);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Model",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getModel();
-
- void setModel(java.lang.String _model);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Serial",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getSerial();
-
- void setSerial(java.lang.String _serial);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SpecificationsBag",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.lang.String> getSpecificationsBag();
-
- void setSpecificationsBag(java.util.Collection<java.lang.String> _specificationsBag);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PurchaseDate",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getPurchaseDate();
-
- void setPurchaseDate(java.util.Calendar _purchaseDate);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions getDimensions();
-
- void setDimensions(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Computer",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Computer",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer getComputer();
-
- void setComputer(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer _computer);
-
-
- Operations operations();
-
- interface Operations {
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ResetComputerDetailsSpecifications",
- type = OperationType.ACTION)
- void resetComputerDetailsSpecifications(
- @Parameter(name = "specifications", type = "Collection(Edm.String)", nullable = false) java.util.Collection<java.lang.String> specifications,
- @Parameter(name = "purchaseTime", type = "Edm.DateTime", nullable = false) java.util.Calendar purchaseTime
- );
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions();
-
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComputerDetailId",
- type = "Edm.Int32")
- Annotatable getComputerDetailIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Manufacturer",
- type = "Edm.String")
- Annotatable getManufacturerAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Model",
- type = "Edm.String")
- Annotatable getModelAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Serial",
- type = "Edm.String")
- Annotatable getSerialAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "SpecificationsBag",
- type = "Edm.String")
- Annotatable getSpecificationsBagAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PurchaseDate",
- type = "Edm.DateTime")
- Annotatable getPurchaseDateAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
- Annotatable getDimensionsAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Computer",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer")
- Annotatable getComputerAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface ComputerDetail
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComputerDetailId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getComputerDetailId();
+
+ void setComputerDetailId(java.lang.Integer _computerDetailId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Manufacturer",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getManufacturer();
+
+ void setManufacturer(java.lang.String _manufacturer);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Model",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getModel();
+
+ void setModel(java.lang.String _model);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Serial",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getSerial();
+
+ void setSerial(java.lang.String _serial);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SpecificationsBag",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.lang.String> getSpecificationsBag();
+
+ void setSpecificationsBag(java.util.Collection<java.lang.String> _specificationsBag);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PurchaseDate",
+ type = "Edm.DateTime",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getPurchaseDate();
+
+ void setPurchaseDate(java.util.Calendar _purchaseDate);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions
+ getDimensions();
+
+ void
+ setDimensions(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Computer",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Computer",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer
+ getComputer();
+
+ void
+ setComputer(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer _computer);
+
+ Operations operations();
+
+ interface Operations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ResetComputerDetailsSpecifications",
+ type = OperationType.ACTION)
+ void
+ resetComputerDetailsSpecifications(
+ @Parameter(name = "specifications", type = "Collection(Edm.String)", nullable = false) java.util.Collection<java.lang.String> specifications,
+ @Parameter(name = "purchaseTime", type = "Edm.DateTime", nullable = false) java.util.Calendar purchaseTime
+ );
+
+ }
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions
+ newDimensions();
+
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComputerDetailId",
+ type = "Edm.Int32")
+ Annotatable getComputerDetailIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Manufacturer",
+ type = "Edm.String")
+ Annotatable getManufacturerAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Model",
+ type = "Edm.String")
+ Annotatable getModelAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Serial",
+ type = "Edm.String")
+ Annotatable getSerialAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "SpecificationsBag",
+ type = "Edm.String")
+ Annotatable getSpecificationsBagAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PurchaseDate",
+ type = "Edm.DateTime")
+ Annotatable getPurchaseDateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Dimensions",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
+ Annotatable getDimensionsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Computer",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer")
+ Annotatable getComputerAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
index d717ecf..9021bc1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface ComputerDetailCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail> {
+public interface ComputerDetailCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
index a5cdd20..6802b63 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
@@ -1,75 +1,41 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ConcurrencyInfo")
-public interface ConcurrencyInfo
+public interface ConcurrencyInfo
extends java.io.Serializable {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Token", type = "Edm.String", nullable = true)
+ java.lang.String getToken();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Token", type = "Edm.String", nullable = true)
- java.lang.String getToken();
-
- void setToken(java.lang.String _token);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "QueriedDateTime", type = "Edm.DateTime", nullable = true)
- java.util.Calendar getQueriedDateTime();
+ void setToken(java.lang.String _token);
- void setQueriedDateTime(java.util.Calendar _queriedDateTime);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "QueriedDateTime", type = "Edm.DateTime",
+ nullable = true)
+ java.util.Calendar getQueriedDateTime();
-
+ void setQueriedDateTime(java.util.Calendar _queriedDateTime);
- ComplexFactory factory();
+ ComplexFactory factory();
- interface ComplexFactory {
- }
+ interface ComplexFactory {}
}
[38/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java
index de48841..f1c8059 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java
@@ -1,630 +1,591 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "MappedEntityType",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface MappedEntityType
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getId();
-
- void setId(java.lang.Integer _id);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Href",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getHref();
-
- void setHref(java.lang.String _href);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Title",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getTitle();
-
- void setTitle(java.lang.String _title);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HrefLang",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getHrefLang();
-
- void setHrefLang(java.lang.String _hrefLang);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Type",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getType();
-
- void setType(java.lang.String _type);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Length",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getLength();
-
- void setLength(java.lang.Integer _length);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfPrimitiveToLinks",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.lang.String> getBagOfPrimitiveToLinks();
-
- void setBagOfPrimitiveToLinks(java.util.Collection<java.lang.String> _bagOfPrimitiveToLinks);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Logo",
- type = "Edm.Binary",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- byte[] getLogo();
-
- void setLogo(byte[] _logo);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfDecimals",
- type = "Edm.Decimal",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.math.BigDecimal> getBagOfDecimals();
-
- void setBagOfDecimals(java.util.Collection<java.math.BigDecimal> _bagOfDecimals);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfDoubles",
- type = "Edm.Double",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.lang.Double> getBagOfDoubles();
-
- void setBagOfDoubles(java.util.Collection<java.lang.Double> _bagOfDoubles);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfSingles",
- type = "Edm.Single",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.lang.Float> getBagOfSingles();
-
- void setBagOfSingles(java.util.Collection<java.lang.Float> _bagOfSingles);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfBytes",
- type = "Edm.Byte",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.lang.Short> getBagOfBytes();
-
- void setBagOfBytes(java.util.Collection<java.lang.Short> _bagOfBytes);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfInt16s",
- type = "Edm.Int16",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.lang.Short> getBagOfInt16s();
-
- void setBagOfInt16s(java.util.Collection<java.lang.Short> _bagOfInt16s);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfInt32s",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.lang.Integer> getBagOfInt32s();
-
- void setBagOfInt32s(java.util.Collection<java.lang.Integer> _bagOfInt32s);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfInt64s",
- type = "Edm.Int64",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.lang.Long> getBagOfInt64s();
-
- void setBagOfInt64s(java.util.Collection<java.lang.Long> _bagOfInt64s);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfGuids",
- type = "Edm.Guid",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.util.UUID> getBagOfGuids();
-
- void setBagOfGuids(java.util.Collection<java.util.UUID> _bagOfGuids);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfDateTime",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.util.Calendar> getBagOfDateTime();
-
- void setBagOfDateTime(java.util.Collection<java.util.Calendar> _bagOfDateTime);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfComplexToCategories",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory> getBagOfComplexToCategories();
-
- void setBagOfComplexToCategories(java.util.Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory> _bagOfComplexToCategories);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexPhone",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone getComplexPhone();
-
- void setComplexPhone(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _complexPhone);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexContactDetails",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails getComplexContactDetails();
-
- void setComplexContactDetails(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _complexContactDetails);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfComplexToCategories",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory newBagOfComplexToCategories();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexPhone",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone newComplexPhone();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexContactDetails",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newComplexContactDetails();
-
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Int32")
- Annotatable getIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Href",
- type = "Edm.String")
- Annotatable getHrefAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Title",
- type = "Edm.String")
- Annotatable getTitleAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HrefLang",
- type = "Edm.String")
- Annotatable getHrefLangAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Type",
- type = "Edm.String")
- Annotatable getTypeAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Length",
- type = "Edm.Int32")
- Annotatable getLengthAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfPrimitiveToLinks",
- type = "Edm.String")
- Annotatable getBagOfPrimitiveToLinksAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Logo",
- type = "Edm.Binary")
- Annotatable getLogoAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfDecimals",
- type = "Edm.Decimal")
- Annotatable getBagOfDecimalsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfDoubles",
- type = "Edm.Double")
- Annotatable getBagOfDoublesAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfSingles",
- type = "Edm.Single")
- Annotatable getBagOfSinglesAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfBytes",
- type = "Edm.Byte")
- Annotatable getBagOfBytesAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfInt16s",
- type = "Edm.Int16")
- Annotatable getBagOfInt16sAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfInt32s",
- type = "Edm.Int32")
- Annotatable getBagOfInt32sAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfInt64s",
- type = "Edm.Int64")
- Annotatable getBagOfInt64sAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfGuids",
- type = "Edm.Guid")
- Annotatable getBagOfGuidsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfDateTime",
- type = "Edm.DateTime")
- Annotatable getBagOfDateTimeAnnotations();
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface MappedEntityType
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getId();
+
+ void setId(java.lang.Integer _id);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Href",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getHref();
+
+ void setHref(java.lang.String _href);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Title",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getTitle();
+
+ void setTitle(java.lang.String _title);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HrefLang",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getHrefLang();
+
+ void setHrefLang(java.lang.String _hrefLang);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Type",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getType();
+
+ void setType(java.lang.String _type);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Length",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getLength();
+
+ void setLength(java.lang.Integer _length);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfPrimitiveToLinks",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.lang.String> getBagOfPrimitiveToLinks();
+
+ void setBagOfPrimitiveToLinks(java.util.Collection<java.lang.String> _bagOfPrimitiveToLinks);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Logo",
+ type = "Edm.Binary",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ byte[] getLogo();
+
+ void setLogo(byte[] _logo);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfDecimals",
+ type = "Edm.Decimal",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.math.BigDecimal> getBagOfDecimals();
+
+ void setBagOfDecimals(java.util.Collection<java.math.BigDecimal> _bagOfDecimals);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfDoubles",
+ type = "Edm.Double",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.lang.Double> getBagOfDoubles();
+
+ void setBagOfDoubles(java.util.Collection<java.lang.Double> _bagOfDoubles);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfSingles",
+ type = "Edm.Single",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.lang.Float> getBagOfSingles();
+
+ void setBagOfSingles(java.util.Collection<java.lang.Float> _bagOfSingles);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfBytes",
+ type = "Edm.Byte",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.lang.Short> getBagOfBytes();
+
+ void setBagOfBytes(java.util.Collection<java.lang.Short> _bagOfBytes);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfInt16s",
+ type = "Edm.Int16",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.lang.Short> getBagOfInt16s();
+
+ void setBagOfInt16s(java.util.Collection<java.lang.Short> _bagOfInt16s);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfInt32s",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.lang.Integer> getBagOfInt32s();
+
+ void setBagOfInt32s(java.util.Collection<java.lang.Integer> _bagOfInt32s);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfInt64s",
+ type = "Edm.Int64",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.lang.Long> getBagOfInt64s();
+
+ void setBagOfInt64s(java.util.Collection<java.lang.Long> _bagOfInt64s);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfGuids",
+ type = "Edm.Guid",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.util.UUID> getBagOfGuids();
+
+ void setBagOfGuids(java.util.Collection<java.util.UUID> _bagOfGuids);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfDateTime",
+ type = "Edm.DateTime",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.util.Calendar> getBagOfDateTime();
+
+ void setBagOfDateTime(java.util.Collection<java.util.Calendar> _bagOfDateTime);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfComplexToCategories",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory>
+ getBagOfComplexToCategories();
+
+ void
+ setBagOfComplexToCategories(
+ java.util.Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory> _bagOfComplexToCategories);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexPhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone
+ getComplexPhone();
+
+ void
+ setComplexPhone(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _complexPhone);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexContactDetails",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails
+ getComplexContactDetails();
+
+ void
+ setComplexContactDetails(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _complexContactDetails);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfComplexToCategories",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory
+ newBagOfComplexToCategories();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexPhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone
+ newComplexPhone();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexContactDetails",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails
+ newComplexContactDetails();
+
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Href",
+ type = "Edm.String")
+ Annotatable getHrefAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Title",
+ type = "Edm.String")
+ Annotatable getTitleAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HrefLang",
+ type = "Edm.String")
+ Annotatable getHrefLangAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Type",
+ type = "Edm.String")
+ Annotatable getTypeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Length",
+ type = "Edm.Int32")
+ Annotatable getLengthAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfPrimitiveToLinks",
+ type = "Edm.String")
+ Annotatable getBagOfPrimitiveToLinksAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Logo",
+ type = "Edm.Binary")
+ Annotatable getLogoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfDecimals",
+ type = "Edm.Decimal")
+ Annotatable getBagOfDecimalsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfDoubles",
+ type = "Edm.Double")
+ Annotatable getBagOfDoublesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfSingles",
+ type = "Edm.Single")
+ Annotatable getBagOfSinglesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfBytes",
+ type = "Edm.Byte")
+ Annotatable getBagOfBytesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfInt16s",
+ type = "Edm.Int16")
+ Annotatable getBagOfInt16sAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfInt32s",
+ type = "Edm.Int32")
+ Annotatable getBagOfInt32sAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfInt64s",
+ type = "Edm.Int64")
+ Annotatable getBagOfInt64sAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfGuids",
+ type = "Edm.Guid")
+ Annotatable getBagOfGuidsAnnotations();
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfComplexToCategories",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory")
- Annotatable getBagOfComplexToCategoriesAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfDateTime",
+ type = "Edm.DateTime")
+ Annotatable getBagOfDateTimeAnnotations();
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComplexPhone",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
- Annotatable getComplexPhoneAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfComplexToCategories",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory")
+ Annotatable getBagOfComplexToCategoriesAnnotations();
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComplexContactDetails",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
- Annotatable getComplexContactDetailsAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComplexPhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
+ Annotatable getComplexPhoneAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComplexContactDetails",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
+ Annotatable getComplexContactDetailsAnnotations();
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java
index 0058d91..1862f1d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface MappedEntityTypeCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType> {
+public interface MappedEntityTypeCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Message.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Message.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Message.java
index a17fe06..232de0a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Message.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Message.java
@@ -1,309 +1,281 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
@KeyRef(MessageKey.class)
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Message",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Message
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MessageId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getMessageId();
-
- void setMessageId(java.lang.Integer _messageId);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FromUsername",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getFromUsername();
-
- void setFromUsername(java.lang.String _fromUsername);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ToUsername",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getToUsername();
-
- void setToUsername(java.lang.String _toUsername);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Sent",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getSent();
-
- void setSent(java.util.Calendar _sent);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Subject",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getSubject();
-
- void setSubject(java.lang.String _subject);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Body",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getBody();
-
- void setBody(java.lang.String _body);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "IsRead",
- type = "Edm.Boolean",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Boolean getIsRead();
-
- void setIsRead(java.lang.Boolean _isRead);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Sender",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login getSender();
-
- void setSender(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login _sender);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Recipient",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login getRecipient();
-
- void setRecipient(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login _recipient);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Attachments",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.MessageAttachment",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "MessageAttachment",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection getAttachments();
-
- void setAttachments(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection _attachments);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "MessageId",
- type = "Edm.Int32")
- Annotatable getMessageIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FromUsername",
- type = "Edm.String")
- Annotatable getFromUsernameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ToUsername",
- type = "Edm.String")
- Annotatable getToUsernameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Sent",
- type = "Edm.DateTimeOffset")
- Annotatable getSentAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Subject",
- type = "Edm.String")
- Annotatable getSubjectAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Body",
- type = "Edm.String")
- Annotatable getBodyAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "IsRead",
- type = "Edm.Boolean")
- Annotatable getIsReadAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Sender",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
- Annotatable getSenderAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Recipient",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
- Annotatable getRecipientAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Attachments",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.MessageAttachment")
- Annotatable getAttachmentsAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Message
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MessageId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getMessageId();
+
+ void setMessageId(java.lang.Integer _messageId);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FromUsername",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getFromUsername();
+
+ void setFromUsername(java.lang.String _fromUsername);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ToUsername",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getToUsername();
+
+ void setToUsername(java.lang.String _toUsername);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Sent",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getSent();
+
+ void setSent(java.util.Calendar _sent);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Subject",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getSubject();
+
+ void setSubject(java.lang.String _subject);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Body",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getBody();
+
+ void setBody(java.lang.String _body);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "IsRead",
+ type = "Edm.Boolean",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Boolean getIsRead();
+
+ void setIsRead(java.lang.Boolean _isRead);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Sender",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Login",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login
+ getSender();
+
+ void
+ setSender(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login _sender);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Recipient",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Login",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login
+ getRecipient();
+
+ void
+ setRecipient(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login _recipient);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Attachments",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.MessageAttachment",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "MessageAttachment",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection
+ getAttachments();
+
+ void
+ setAttachments(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection _attachments);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "MessageId",
+ type = "Edm.Int32")
+ Annotatable getMessageIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FromUsername",
+ type = "Edm.String")
+ Annotatable getFromUsernameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ToUsername",
+ type = "Edm.String")
+ Annotatable getToUsernameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Sent",
+ type = "Edm.DateTimeOffset")
+ Annotatable getSentAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Subject",
+ type = "Edm.String")
+ Annotatable getSubjectAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Body",
+ type = "Edm.String")
+ Annotatable getBodyAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "IsRead",
+ type = "Edm.Boolean")
+ Annotatable getIsReadAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Sender",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getSenderAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Recipient",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getRecipientAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Attachments",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.MessageAttachment")
+ Annotatable getAttachmentsAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java
index 844cb1e..71de66a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java
@@ -1,132 +1,98 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "MessageAttachment",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface MessageAttachment
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AttachmentId",
- type = "Edm.Guid",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.UUID getAttachmentId();
-
- void setAttachmentId(java.util.UUID _attachmentId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Attachment",
- type = "Edm.Binary",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- byte[] getAttachment();
-
- void setAttachment(byte[] _attachment);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "AttachmentId",
- type = "Edm.Guid")
- Annotatable getAttachmentIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Attachment",
- type = "Edm.Binary")
- Annotatable getAttachmentAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface MessageAttachment
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AttachmentId",
+ type = "Edm.Guid",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.UUID getAttachmentId();
+
+ void setAttachmentId(java.util.UUID _attachmentId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Attachment",
+ type = "Edm.Binary",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ byte[] getAttachment();
+
+ void setAttachment(byte[] _attachment);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "AttachmentId",
+ type = "Edm.Guid")
+ Annotatable getAttachmentIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Attachment",
+ type = "Edm.Binary")
+ Annotatable getAttachmentAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java
index 0f00e36..a47e7a1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface MessageAttachmentCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment> {
+public interface MessageAttachmentCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment> {
Object getAnnotation(Class<? extends AbstractTerm> term);
[40/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
index 4d95ea8..3eb913e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
@@ -1,454 +1,485 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "DiscontinuedProduct",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
-public interface DiscontinuedProduct
- extends Annotatable,org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product {
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Picture",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.io.InputStream getPicture();
-
- void setPicture(java.io.InputStream _picture);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductId();
-
- void setProductId(java.lang.Integer _productId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getDescription();
-
- void setDescription(java.lang.String _description);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions getDimensions();
-
- void setDimensions(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BaseConcurrency",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getBaseConcurrency();
-
- void setBaseConcurrency(java.lang.String _baseConcurrency);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getComplexConcurrency();
-
- void setComplexConcurrency(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _complexConcurrency);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "NestedComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo getNestedComplexConcurrency();
-
- void setNestedComplexConcurrency(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _nestedComplexConcurrency);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Discontinued",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getDiscontinued();
-
- void setDiscontinued(java.util.Calendar _discontinued);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReplacementProductId",
- type = "Edm.Int32",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getReplacementProductId();
-
- void setReplacementProductId(java.lang.Integer _replacementProductId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DiscontinuedPhone",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone getDiscontinuedPhone();
-
- void setDiscontinuedPhone(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _discontinuedPhone);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ChildConcurrencyToken",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getChildConcurrencyToken();
-
- void setChildConcurrencyToken(java.lang.String _childConcurrencyToken);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "RelatedProducts",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Product",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection getRelatedProducts();
-
- void setRelatedProducts(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection _relatedProducts);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Detail",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "ProductDetail",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail getDetail();
-
- void setDetail(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail _detail);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Reviews",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "ProductReview",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection getReviews();
-
- void setReviews(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection _reviews);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Photos",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "ProductPhoto",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection getPhotos();
-
- void setPhotos(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection _photos);
-
-
- @Override
- Operations operations();
-
- interface Operations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product.Operations{
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product.ComplexFactory{
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newComplexConcurrency();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "NestedComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newNestedComplexConcurrency();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DiscontinuedPhone",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone newDiscontinuedPhone();
-
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Picture",
- type = "Edm.Stream")
- Annotatable getPictureAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
- type = "Edm.Int32")
- Annotatable getProductIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
- type = "Edm.String")
- Annotatable getDescriptionAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
- Annotatable getDimensionsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BaseConcurrency",
- type = "Edm.String")
- Annotatable getBaseConcurrencyAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
- Annotatable getComplexConcurrencyAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "NestedComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
- Annotatable getNestedComplexConcurrencyAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Discontinued",
- type = "Edm.DateTime")
- Annotatable getDiscontinuedAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ReplacementProductId",
- type = "Edm.Int32")
- Annotatable getReplacementProductIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DiscontinuedPhone",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
- Annotatable getDiscontinuedPhoneAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ChildConcurrencyToken",
- type = "Edm.String")
- Annotatable getChildConcurrencyTokenAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "RelatedProducts",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
- Annotatable getRelatedProductsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Detail",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail")
- Annotatable getDetailAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Reviews",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview")
- Annotatable getReviewsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Photos",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto")
- Annotatable getPhotosAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+public interface DiscontinuedProduct
+ extends Annotatable,
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Picture",
+ type = "Edm.Stream",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.io.InputStream getPicture();
+
+ @Override
+ void setPicture(java.io.InputStream _picture);
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductId();
+
+ @Override
+ void setProductId(java.lang.Integer _productId);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getDescription();
+
+ @Override
+ void setDescription(java.lang.String _description);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions
+ getDimensions();
+
+ @Override
+ void
+ setDimensions(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BaseConcurrency",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getBaseConcurrency();
+
+ @Override
+ void setBaseConcurrency(java.lang.String _baseConcurrency);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo
+ getComplexConcurrency();
+
+ @Override
+ void
+ setComplexConcurrency(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _complexConcurrency);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "NestedComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo
+ getNestedComplexConcurrency();
+
+ @Override
+ void
+ setNestedComplexConcurrency(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _nestedComplexConcurrency);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Discontinued",
+ type = "Edm.DateTime",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getDiscontinued();
+
+ void setDiscontinued(java.util.Calendar _discontinued);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReplacementProductId",
+ type = "Edm.Int32",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getReplacementProductId();
+
+ void setReplacementProductId(java.lang.Integer _replacementProductId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DiscontinuedPhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone
+ getDiscontinuedPhone();
+
+ void
+ setDiscontinuedPhone(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _discontinuedPhone);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ChildConcurrencyToken",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getChildConcurrencyToken();
+
+ void setChildConcurrencyToken(java.lang.String _childConcurrencyToken);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "RelatedProducts",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Product",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection
+ getRelatedProducts();
+
+ @Override
+ void
+ setRelatedProducts(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection _relatedProducts);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Detail",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "ProductDetail",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail
+ getDetail();
+
+ @Override
+ void
+ setDetail(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail _detail);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Reviews",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "ProductReview",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection
+ getReviews();
+
+ @Override
+ void
+ setReviews(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection _reviews);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Photos",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "ProductPhoto",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection
+ getPhotos();
+
+ @Override
+ void
+ setPhotos(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection _photos);
+
+ @Override
+ Operations operations();
+
+ interface Operations
+ extends
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product.Operations {
+
+ }
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory
+ extends
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product.ComplexFactory {
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions
+ newDimensions();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo
+ newComplexConcurrency();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "NestedComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo
+ newNestedComplexConcurrency();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DiscontinuedPhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone
+ newDiscontinuedPhone();
+
+ }
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations
+ extends
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Picture",
+ type = "Edm.Stream")
+ Annotatable getPictureAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
+ type = "Edm.String")
+ Annotatable getDescriptionAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Dimensions",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
+ Annotatable getDimensionsAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BaseConcurrency",
+ type = "Edm.String")
+ Annotatable getBaseConcurrencyAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
+ Annotatable getComplexConcurrencyAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "NestedComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
+ Annotatable getNestedComplexConcurrencyAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Discontinued",
+ type = "Edm.DateTime")
+ Annotatable getDiscontinuedAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ReplacementProductId",
+ type = "Edm.Int32")
+ Annotatable getReplacementProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DiscontinuedPhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
+ Annotatable getDiscontinuedPhoneAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ChildConcurrencyToken",
+ type = "Edm.String")
+ Annotatable getChildConcurrencyTokenAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "RelatedProducts",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getRelatedProductsAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Detail",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail")
+ Annotatable getDetailAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Reviews",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview")
+ Annotatable getReviewsAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Photos",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto")
+ Annotatable getPhotosAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
index 3862b80..9957155 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface DiscontinuedProductCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.DiscontinuedProduct> {
+public interface DiscontinuedProductCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.DiscontinuedProduct> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
index a1a3e9b..264adbd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
@@ -1,146 +1,114 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Driver",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Driver
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BirthDate",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getBirthDate();
-
- void setBirthDate(java.util.Calendar _birthDate);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "License",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.License",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "License",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.License getLicense();
-
- void setLicense(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.License _license);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BirthDate",
- type = "Edm.DateTime")
- Annotatable getBirthDateAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "License",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.License")
- Annotatable getLicenseAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Driver
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BirthDate",
+ type = "Edm.DateTime",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getBirthDate();
+
+ void setBirthDate(java.util.Calendar _birthDate);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "License",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.License",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "License",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.License
+ getLicense();
+
+ void
+ setLicense(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.License _license);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BirthDate",
+ type = "Edm.DateTime")
+ Annotatable getBirthDateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "License",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.License")
+ Annotatable getLicenseAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
index d6d953e..ed26035 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface DriverCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Driver> {
+public interface DriverCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Driver> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
index f4bf42e..73c625b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
@@ -1,260 +1,250 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.ext.proxy.api.annotations.Key;
+import org.apache.olingo.ext.proxy.api.annotations.Parameter;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Employee",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person")
-public interface Employee
- extends Annotatable,org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPersonId();
-
- void setPersonId(java.lang.Integer _personId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManagersPersonId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getManagersPersonId();
-
- void setManagersPersonId(java.lang.Integer _managersPersonId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Salary",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getSalary();
-
- void setSalary(java.lang.Integer _salary);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Title",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getTitle();
-
- void setTitle(java.lang.String _title);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonMetadata",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "PersonMetadata",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection getPersonMetadata();
-
- void setPersonMetadata(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Manager",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Person",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee getManager();
-
- void setManager(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee _manager);
-
-
- @Override
- Operations operations();
-
- interface Operations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.Operations{
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "UpdatePersonInfo",
- type = OperationType.ACTION)
- void updatePersonInfo(
- );
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "IncreaseEmployeeSalary",
- type = OperationType.ACTION,
- returnType = "Edm.Boolean")
- java.lang.Boolean increaseEmployeeSalary(
- @Parameter(name = "n", type = "Edm.Int32", nullable = false) java.lang.Integer n
- );
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.ComplexFactory{
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
- type = "Edm.Int32")
- Annotatable getPersonIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManagersPersonId",
- type = "Edm.Int32")
- Annotatable getManagersPersonIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Salary",
- type = "Edm.Int32")
- Annotatable getSalaryAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Title",
- type = "Edm.String")
- Annotatable getTitleAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonMetadata",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata")
- Annotatable getPersonMetadataAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Manager",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee")
- Annotatable getManagerAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person")
+public interface Employee
+ extends Annotatable,
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person {
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPersonId();
+
+ @Override
+ void setPersonId(java.lang.Integer _personId);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ @Override
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManagersPersonId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getManagersPersonId();
+
+ void setManagersPersonId(java.lang.Integer _managersPersonId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Salary",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getSalary();
+
+ void setSalary(java.lang.Integer _salary);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Title",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getTitle();
+
+ void setTitle(java.lang.String _title);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonMetadata",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "PersonMetadata",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection
+ getPersonMetadata();
+
+ @Override
+ void
+ setPersonMetadata(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Manager",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Person",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee
+ getManager();
+
+ void
+ setManager(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee _manager);
+
+ @Override
+ Operations operations();
+
+ interface Operations
+ extends
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.Operations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "UpdatePersonInfo",
+ type = OperationType.ACTION)
+ void updatePersonInfo(
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "IncreaseEmployeeSalary",
+ type = OperationType.ACTION,
+ returnType = "Edm.Boolean")
+ java.lang.Boolean increaseEmployeeSalary(
+ @Parameter(name = "n", type = "Edm.Int32", nullable = false) java.lang.Integer n
+ );
+
+ }
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory
+ extends
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.ComplexFactory {}
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations
+ extends
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
+ type = "Edm.Int32")
+ Annotatable getPersonIdAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManagersPersonId",
+ type = "Edm.Int32")
+ Annotatable getManagersPersonIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Salary",
+ type = "Edm.Int32")
+ Annotatable getSalaryAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Title",
+ type = "Edm.String")
+ Annotatable getTitleAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonMetadata",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata")
+ Annotatable getPersonMetadataAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Manager",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee")
+ Annotatable getManagerAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
index e328445..7e74475 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
@@ -1,62 +1,46 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
import org.apache.olingo.ext.proxy.api.OperationType;
import org.apache.olingo.ext.proxy.api.annotations.Operation;
import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface EmployeeCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee> {
- Operations operations();
+public interface EmployeeCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee> {
+ Operations operations();
- public interface Operations {
+ public interface Operations {
-
- @Operation(name = "IncreaseSalaries",
- type = OperationType.ACTION)
- void increaseSalaries(
- @Parameter(name = "n", type = "Edm.Int32", nullable = false) java.lang.Integer n
- );
+ @Operation(name = "IncreaseSalaries",
+ type = OperationType.ACTION)
+ void increaseSalaries(
+ @Parameter(name = "n", type = "Edm.Int32", nullable = false) java.lang.Integer n
+ );
- }
+ }
Object getAnnotation(Class<? extends AbstractTerm> term);
[13/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java
index 7fe3774..c3d4770 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java
@@ -1,265 +1,263 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.ext.proxy.api.annotations.Key;
+import org.apache.olingo.ext.proxy.api.annotations.Parameter;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Account",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Account
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getAccountID();
-
- void setAccountID(java.lang.Integer _accountID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Country",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getCountry();
-
- void setCountry(java.lang.String _country);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountInfo",
- type = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo getAccountInfo();
-
- void setAccountInfo(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo _accountInfo);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "MyGiftCard",
- type = "Microsoft.Test.OData.Services.ODataWCFService.GiftCard",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "",
- targetEntitySet = "",
- containsTarget = true)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard getMyGiftCard();
-
- void setMyGiftCard(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard _myGiftCard);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "AvailableSubscriptionTemplatess",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "SubscriptionTemplates",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection getAvailableSubscriptionTemplatess();
-
- void setAvailableSubscriptionTemplatess(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection _availableSubscriptionTemplatess);
-
-
- Operations operations();
-
- interface Operations {
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetDefaultPI",
- type = OperationType.FUNCTION,
- isComposable = false,
- returnType = "Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument getDefaultPI(
- );
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetAccountInfo",
- type = OperationType.FUNCTION,
- isComposable = true,
- returnType = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo getAccountInfo(
- );
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "RefreshDefaultPI",
- type = OperationType.ACTION,
- returnType = "Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument refreshDefaultPI(
- @Parameter(name = "newDate", type = "Edm.DateTimeOffset", nullable = true) java.util.Calendar newDate
- );
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountInfo",
- type = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo newAccountInfo();
-
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "AccountID",
- type = "Edm.Int32")
- Annotatable getAccountIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Country",
- type = "Edm.String")
- Annotatable getCountryAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "AccountInfo",
- type = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo")
- Annotatable getAccountInfoAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "MyGiftCard",
- type = "Microsoft.Test.OData.Services.ODataWCFService.GiftCard")
- Annotatable getMyGiftCardAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "MyPaymentInstruments",
- type = "Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument")
- Annotatable getMyPaymentInstrumentsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ActiveSubscriptions",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription")
- Annotatable getActiveSubscriptionsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "AvailableSubscriptionTemplatess",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription")
- Annotatable getAvailableSubscriptionTemplatessAnnotations();
- }
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "MyPaymentInstruments",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "SubscriptionTemplates",
- containsTarget = true)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.MyPaymentInstruments getMyPaymentInstruments();
- void setMyPaymentInstruments(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.MyPaymentInstruments _myPaymentInstruments);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "MyPaymentInstruments", contained = true)
- interface MyPaymentInstruments
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection> {
-
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument newPaymentInstrument();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection newPaymentInstrumentCollection();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI newCreditCardPI();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPICollection newCreditCardPICollection();
- }
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ActiveSubscriptions",
- type = "java.lang.Integer",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "SubscriptionTemplates",
- containsTarget = true)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.ActiveSubscriptions getActiveSubscriptions();
- void setActiveSubscriptions(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.ActiveSubscriptions _activeSubscriptions);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ActiveSubscriptions", contained = true)
- interface ActiveSubscriptions
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection> {
-
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription newSubscription();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection newSubscriptionCollection();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Account
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getAccountID();
+
+ void setAccountID(java.lang.Integer _accountID);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Country",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getCountry();
+
+ void setCountry(java.lang.String _country);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountInfo",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo
+ getAccountInfo();
+
+ void
+ setAccountInfo(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo _accountInfo);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "MyGiftCard",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.GiftCard",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "",
+ targetEntitySet = "",
+ containsTarget = true)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard
+ getMyGiftCard();
+
+ void
+ setMyGiftCard(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard _myGiftCard);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "AvailableSubscriptionTemplatess",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "SubscriptionTemplates",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection
+ getAvailableSubscriptionTemplatess();
+
+ void
+ setAvailableSubscriptionTemplatess(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection _availableSubscriptionTemplatess);
+
+ Operations operations();
+
+ interface Operations {
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetDefaultPI",
+ type = OperationType.FUNCTION,
+ isComposable = false,
+ returnType = "Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument
+ getDefaultPI(
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetAccountInfo",
+ type = OperationType.FUNCTION,
+ isComposable = true,
+ returnType = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo
+ getAccountInfo(
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "RefreshDefaultPI",
+ type = OperationType.ACTION,
+ returnType = "Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument
+ refreshDefaultPI(
+ @Parameter(name = "newDate", type = "Edm.DateTimeOffset", nullable = true) java.util.Calendar newDate
+ );
}
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountInfo",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo
+ newAccountInfo();
+
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "AccountID",
+ type = "Edm.Int32")
+ Annotatable getAccountIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Country",
+ type = "Edm.String")
+ Annotatable getCountryAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "AccountInfo",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo")
+ Annotatable getAccountInfoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "MyGiftCard",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.GiftCard")
+ Annotatable getMyGiftCardAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "MyPaymentInstruments",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument")
+ Annotatable getMyPaymentInstrumentsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ActiveSubscriptions",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription")
+ Annotatable getActiveSubscriptionsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(
+ name = "AvailableSubscriptionTemplatess",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription")
+ Annotatable getAvailableSubscriptionTemplatessAnnotations();
+ }
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "MyPaymentInstruments",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "SubscriptionTemplates",
+ containsTarget = true)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.MyPaymentInstruments
+ getMyPaymentInstruments();
+
+ void
+ setMyPaymentInstruments(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.MyPaymentInstruments _myPaymentInstruments);
+
+ @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "MyPaymentInstruments", contained = true)
+ interface MyPaymentInstruments
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection> {
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument
+ newPaymentInstrument();
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection
+ newPaymentInstrumentCollection();
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI
+ newCreditCardPI();
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPICollection
+ newCreditCardPICollection();
+ }
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ActiveSubscriptions",
+ type = "java.lang.Integer",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "SubscriptionTemplates",
+ containsTarget = true)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.ActiveSubscriptions
+ getActiveSubscriptions();
+
+ void
+ setActiveSubscriptions(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.ActiveSubscriptions _activeSubscriptions);
+
+ @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ActiveSubscriptions", contained = true)
+ interface ActiveSubscriptions
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection> {
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription
+ newSubscription();
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection
+ newSubscriptionCollection();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java
index a78767b..4646bd0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface AccountCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account> {
+public interface AccountCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java
index c3022a6..8ef4847 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java
@@ -1,115 +1,80 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "AccountInfo",
- isOpenType = true,
- isAbstract = false)
-public interface AccountInfo
- extends AbstractOpenType,java.io.Serializable {
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.String getFirstName();
-
- void setFirstName(java.lang.String _firstName);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.String getLastName();
-
- void setLastName(java.lang.String _lastName);
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FirstName",
- type = "Edm.String")
- Annotatable getFirstNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LastName",
- type = "Edm.String")
- Annotatable getLastNameAnnotations();
-
-
- }
-
+ isOpenType = true,
+ isAbstract = false)
+public interface AccountInfo
+ extends AbstractOpenType, java.io.Serializable {
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getFirstName();
+
+ void setFirstName(java.lang.String _firstName);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getLastName();
+
+ void setLastName(java.lang.String _lastName);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FirstName",
+ type = "Edm.String")
+ Annotatable getFirstNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LastName",
+ type = "Edm.String")
+ Annotatable getLastNameAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java
index a28baa4..8994935 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java
@@ -1,136 +1,98 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Address",
- isOpenType = false,
- isAbstract = false)
-public interface Address
+ isOpenType = false,
+ isAbstract = false)
+public interface Address
extends java.io.Serializable {
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.String getStreet();
-
- void setStreet(java.lang.String _street);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.String getCity();
-
- void setCity(java.lang.String _city);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PostalCode",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.String getPostalCode();
-
- void setPostalCode(java.lang.String _postalCode);
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Street",
- type = "Edm.String")
- Annotatable getStreetAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "City",
- type = "Edm.String")
- Annotatable getCityAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PostalCode",
- type = "Edm.String")
- Annotatable getPostalCodeAnnotations();
-
-
- }
-
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getStreet();
+
+ void setStreet(java.lang.String _street);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getCity();
+
+ void setCity(java.lang.String _city);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PostalCode",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getPostalCode();
+
+ void setPostalCode(java.lang.String _postalCode);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Street",
+ type = "Edm.String")
+ Annotatable getStreetAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "City",
+ type = "Edm.String")
+ Annotatable getCityAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PostalCode",
+ type = "Edm.String")
+ Annotatable getPostalCodeAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java
index 4c41e70..de79e44 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java
@@ -1,159 +1,124 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Asset",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Asset
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AssetID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getAssetID();
-
- void setAssetID(java.lang.Integer _assetID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Number",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getNumber();
-
- void setNumber(java.lang.Integer _number);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "AssetID",
- type = "Edm.Int32")
- Annotatable getAssetIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Number",
- type = "Edm.Int32")
- Annotatable getNumberAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Asset
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AssetID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getAssetID();
+
+ void setAssetID(java.lang.Integer _assetID);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Number",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getNumber();
+
+ void setNumber(java.lang.Integer _number);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "AssetID",
+ type = "Edm.Int32")
+ Annotatable getAssetIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Number",
+ type = "Edm.Int32")
+ Annotatable getNumberAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java
index 5a48400..c6dbedf 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface AssetCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Asset> {
+public interface AssetCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Asset> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java
index 36ab4dd..296f19f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java
@@ -1,132 +1,98 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Club",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Club
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ClubID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getClubID();
-
- void setClubID(java.lang.Integer _clubID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ClubID",
- type = "Edm.Int32")
- Annotatable getClubIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Club
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ClubID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getClubID();
+
+ void setClubID(java.lang.Integer _clubID);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ClubID",
+ type = "Edm.Int32")
+ Annotatable getClubIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java
index 61b6e82..beb1a62 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface ClubCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Club> {
+public interface ClubCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Club> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java
index 84c3835..91eede5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java
@@ -1,45 +1,42 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EnumType;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EnumType(name = "Color",
- underlyingType = EdmPrimitiveTypeKind.Int32,
- isFlags = false)
+ underlyingType = EdmPrimitiveTypeKind.Int32,
+ isFlags = false)
public enum Color {
- Red(1),
- Green(2),
- Blue(4);
+ Red(1),
+ Green(2),
+ Blue(4);
+
+ private java.lang.Integer value;
- private java.lang.Integer value;
-
- public java.lang.Integer getValue(){
- return this.value;
- }
+ public java.lang.Integer getValue() {
+ return value;
+ }
- private Color(final java.lang.Integer value){
- this.value=value;
- }
+ private Color(final java.lang.Integer value) {
+ this.value = value;
+ }
}
[14/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java
index 74964cf..3d86513 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Customers")
-public interface Customers
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection> {
+public interface Customers
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection> {
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer
+ newCustomer();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer newCustomer();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection newCustomerCollection();
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection
+ newCustomerCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java
index d85dc02..bf242ee 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,30 +20,8 @@
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractSingleton;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Singleton;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-
-
@org.apache.olingo.ext.proxy.api.annotations.Singleton(name = "DefaultStoredPI")
-public interface DefaultStoredPI extends AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPICollection> {
-}
+public interface DefaultStoredPI
+ extends
+ AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPICollection> {}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java
index 800d234..73e2a44 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Departments")
-public interface Departments
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection> {
+public interface Departments
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection> {
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department
+ newDepartment();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department newDepartment();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection newDepartmentCollection();
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection
+ newDepartmentCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java
index ae7eb7c..5586ae7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Employees")
-public interface Employees
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection> {
+public interface Employees
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection> {
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee
+ newEmployee();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee newEmployee();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection newEmployeeCollection();
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection
+ newEmployeeCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java
index dad0585..f13e4e2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java
@@ -1,178 +1,180 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.PersistenceManager;
import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+import org.apache.olingo.ext.proxy.api.PersistenceManager;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "InMemoryEntities",
- namespace = "Microsoft.Test.OData.Services.ODataWCFService",
- isDefaultEntityContainer = true)
+ namespace = "Microsoft.Test.OData.Services.ODataWCFService",
+ isDefaultEntityContainer = true)
public interface InMemoryEntities extends PersistenceManager {
- Accounts getAccounts();
- StoredPIs getStoredPIs();
- Customers getCustomers();
- Products getProducts();
- OrderDetails getOrderDetails();
- Departments getDepartments();
- Employees getEmployees();
- Orders getOrders();
- People getPeople();
- SubscriptionTemplates getSubscriptionTemplates();
- ProductReviews getProductReviews();
- ProductDetails getProductDetails();
+ Accounts getAccounts();
+
+ StoredPIs getStoredPIs();
+
+ Customers getCustomers();
+
+ Products getProducts();
+
+ OrderDetails getOrderDetails();
+
+ Departments getDepartments();
+
+ Employees getEmployees();
+
+ Orders getOrders();
+
+ People getPeople();
+ SubscriptionTemplates getSubscriptionTemplates();
- PublicCompany getPublicCompany();
+ ProductReviews getProductReviews();
- DefaultStoredPI getDefaultStoredPI();
+ ProductDetails getProductDetails();
- VipCustomer getVipCustomer();
+ PublicCompany getPublicCompany();
- Company getCompany();
+ DefaultStoredPI getDefaultStoredPI();
- Boss getBoss();
+ VipCustomer getVipCustomer();
- LabourUnion getLabourUnion();
+ Company getCompany();
+ Boss getBoss();
+
+ LabourUnion getLabourUnion();
Operations operations();
public interface Operations {
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetBossEmails",
- type = OperationType.FUNCTION,
- isComposable = false,
- returnType = "Collection(Edm.String)")
- java.util.Collection<java.lang.String> getBossEmails(
- @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "start", type = "Edm.Int32", nullable = false) java.lang.Integer start,
- @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "count", type = "Edm.Int32", nullable = false) java.lang.Integer count
- );
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetPerson2",
- type = OperationType.FUNCTION,
- isComposable = true,
- returnType = "Microsoft.Test.OData.Services.ODataWCFService.Person")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person getPerson2(
- @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "city", type = "Edm.String", nullable = false) java.lang.String city
- );
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetDefaultColor",
- type = OperationType.FUNCTION,
- isComposable = true,
- returnType = "Microsoft.Test.OData.Services.ODataWCFService.Color")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color getDefaultColor(
- );
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetPerson",
- type = OperationType.FUNCTION,
- isComposable = true,
- returnType = "Microsoft.Test.OData.Services.ODataWCFService.Person")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person getPerson(
- @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "address", type = "Microsoft.Test.OData.Services.ODataWCFService.Address", nullable = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address address
- );
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetProductsByAccessLevel",
- type = OperationType.FUNCTION,
- isComposable = false,
- returnType = "Collection(Edm.String)")
- java.util.Collection<java.lang.String> getProductsByAccessLevel(
- @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "accessLevel", type = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", nullable = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel accessLevel
- );
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetAllProducts",
- type = OperationType.FUNCTION,
- isComposable = true,
- returnType = "Collection(Microsoft.Test.OData.Services.ODataWCFService.Product)")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection getAllProducts(
- );
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ResetBossAddress",
- type = OperationType.ACTION,
- returnType = "Microsoft.Test.OData.Services.ODataWCFService.Address")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address resetBossAddress(
- @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "address", type = "Microsoft.Test.OData.Services.ODataWCFService.Address", nullable = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address address
- );
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ResetDataSource",
- type = OperationType.ACTION)
- void resetDataSource(
- );
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "Discount",
- type = OperationType.ACTION)
- void discount(
- @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "percentage", type = "Edm.Int32", nullable = false) java.lang.Integer percentage
- );
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ResetBossEmail",
- type = OperationType.ACTION,
- returnType = "Collection(Edm.String)")
- java.util.Collection<java.lang.String> resetBossEmail(
- @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "emails", type = "Collection(Edm.String)", nullable = false) java.util.Collection<java.lang.String> emails
- );
-
- }
-
- ComplexFactory complexFactory();
-
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newAddress();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
- type = "Microsoft.Test.OData.Services.ODataWCFService.HomeAddress")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress newHomeAddress();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CompanyAddress",
- type = "Microsoft.Test.OData.Services.ODataWCFService.CompanyAddress")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyAddress newCompanyAddress();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountInfo",
- type = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo newAccountInfo();
-
- }
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetBossEmails",
+ type = OperationType.FUNCTION,
+ isComposable = false,
+ returnType = "Collection(Edm.String)")
+ java.util.Collection<java.lang.String>
+ getBossEmails(
+ @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "start", type = "Edm.Int32", nullable = false) java.lang.Integer start,
+ @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "count", type = "Edm.Int32", nullable = false) java.lang.Integer count
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetPerson2",
+ type = OperationType.FUNCTION,
+ isComposable = true,
+ returnType = "Microsoft.Test.OData.Services.ODataWCFService.Person")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person
+ getPerson2(
+ @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "city", type = "Edm.String", nullable = false) java.lang.String city
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetDefaultColor",
+ type = OperationType.FUNCTION,
+ isComposable = true,
+ returnType = "Microsoft.Test.OData.Services.ODataWCFService.Color")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color
+ getDefaultColor(
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetPerson",
+ type = OperationType.FUNCTION,
+ isComposable = true,
+ returnType = "Microsoft.Test.OData.Services.ODataWCFService.Person")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person
+ getPerson(
+ @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "address",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Address", nullable = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address address
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetProductsByAccessLevel",
+ type = OperationType.FUNCTION,
+ isComposable = false,
+ returnType = "Collection(Edm.String)")
+ java.util.Collection<java.lang.String>
+ getProductsByAccessLevel(
+ @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "accessLevel",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", nullable = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel accessLevel
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetAllProducts",
+ type = OperationType.FUNCTION,
+ isComposable = true,
+ returnType = "Collection(Microsoft.Test.OData.Services.ODataWCFService.Product)")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection
+ getAllProducts(
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ResetBossAddress",
+ type = OperationType.ACTION,
+ returnType = "Microsoft.Test.OData.Services.ODataWCFService.Address")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address
+ resetBossAddress(
+ @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "address",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Address", nullable = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address address
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ResetDataSource",
+ type = OperationType.ACTION)
+ void resetDataSource(
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "Discount",
+ type = OperationType.ACTION)
+ void discount(
+ @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "percentage", type = "Edm.Int32",
+ nullable = false) java.lang.Integer percentage
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ResetBossEmail",
+ type = OperationType.ACTION,
+ returnType = "Collection(Edm.String)")
+ java.util.Collection<java.lang.String> resetBossEmail(
+ @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "emails", type = "Collection(Edm.String)",
+ nullable = false) java.util.Collection<java.lang.String> emails
+ );
+
+ }
+
+ ComplexFactory complexFactory();
+
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address
+ newAddress();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.HomeAddress")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress
+ newHomeAddress();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CompanyAddress",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.CompanyAddress")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyAddress
+ newCompanyAddress();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountInfo",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo
+ newAccountInfo();
+
}
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/LabourUnion.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/LabourUnion.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/LabourUnion.java
index 85682f3..0818d29 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/LabourUnion.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/LabourUnion.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,30 +20,8 @@
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractSingleton;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Singleton;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-
-
@org.apache.olingo.ext.proxy.api.annotations.Singleton(name = "LabourUnion")
-public interface LabourUnion extends AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnion, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnionCollection> {
-}
+public interface LabourUnion
+ extends
+ AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnion, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnionCollection> {}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java
index f4d92d1..e4062a5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,16 @@
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey;
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "OrderDetails")
-public interface OrderDetails
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail, OrderDetailKey, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection> {
+public interface OrderDetails
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail, OrderDetailKey, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection> {
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail
+ newOrderDetail();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail newOrderDetail();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection newOrderDetailCollection();
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection
+ newOrderDetailCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java
index 6324951..e9d8400 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,14 @@
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Orders")
-public interface Orders
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection> {
+public interface Orders
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection> {
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order newOrder();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order newOrder();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection newOrderCollection();
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection
+ newOrderCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java
index 0da37d6..9981d47 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,37 +20,26 @@
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "People")
-public interface People
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection> {
-
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person newPerson();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection newPersonCollection();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer newCustomer();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection newCustomerCollection();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee newEmployee();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection newEmployeeCollection();
+public interface People
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection> {
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person newPerson();
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection
+ newPersonCollection();
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer
+ newCustomer();
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection
+ newCustomerCollection();
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee
+ newEmployee();
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection
+ newEmployeeCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java
index e0c6ce4..a7f2d19 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,16 @@
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailKey;
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductDetails")
-public interface ProductDetails
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail, ProductDetailKey, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection> {
+public interface ProductDetails
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail, ProductDetailKey, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection> {
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail
+ newProductDetail();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail newProductDetail();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection newProductDetailCollection();
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection
+ newProductDetailCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java
index 3441421..b14fac3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,16 @@
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReviewKey;
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductReviews")
-public interface ProductReviews
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReview, ProductReviewKey, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReviewCollection> {
+public interface ProductReviews
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReview, ProductReviewKey, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReviewCollection> {
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReview
+ newProductReview();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReview newProductReview();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReviewCollection newProductReviewCollection();
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReviewCollection
+ newProductReviewCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java
index 48c3040..5246b34 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,14 @@
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Products")
-public interface Products
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection> {
+public interface Products
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection> {
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product newProduct();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product newProduct();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection newProductCollection();
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection
+ newProductCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/PublicCompany.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/PublicCompany.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/PublicCompany.java
index b2bc233..9ab59eb 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/PublicCompany.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/PublicCompany.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,30 +20,8 @@
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractSingleton;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Singleton;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-
-
@org.apache.olingo.ext.proxy.api.annotations.Singleton(name = "PublicCompany")
-public interface PublicCompany extends AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCollection> {
-}
+public interface PublicCompany
+ extends
+ AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCollection> {}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java
index 12e8461..10af3b4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "StoredPIs")
-public interface StoredPIs
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPICollection> {
+public interface StoredPIs
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPICollection> {
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI
+ newStoredPI();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI newStoredPI();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPICollection newStoredPICollection();
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPICollection
+ newStoredPICollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java
index fe6a468..d8ea272 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "SubscriptionTemplates")
-public interface SubscriptionTemplates
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection> {
+public interface SubscriptionTemplates
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection> {
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription
+ newSubscription();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription newSubscription();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection newSubscriptionCollection();
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection
+ newSubscriptionCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/VipCustomer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/VipCustomer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/VipCustomer.java
index 07b886a..676ba03 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/VipCustomer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/VipCustomer.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,30 +20,8 @@
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractSingleton;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Singleton;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-
-
@org.apache.olingo.ext.proxy.api.annotations.Singleton(name = "VipCustomer")
-public interface VipCustomer extends AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection> {
-}
+public interface VipCustomer
+ extends
+ AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection> {}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java
index abf2d52..adec511 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java
index f03c8d2..9bb2976 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java
@@ -1,47 +1,44 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EnumType;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EnumType(name = "AccessLevel",
- underlyingType = EdmPrimitiveTypeKind.Int32,
- isFlags = true)
+ underlyingType = EdmPrimitiveTypeKind.Int32,
+ isFlags = true)
public enum AccessLevel {
- None(0),
- Read(1),
- Write(2),
- Execute(4),
- ReadWrite(3);
+ None(0),
+ Read(1),
+ Write(2),
+ Execute(4),
+ ReadWrite(3);
+
+ private java.lang.Integer value;
- private java.lang.Integer value;
-
- public java.lang.Integer getValue(){
- return this.value;
- }
+ public java.lang.Integer getValue() {
+ return value;
+ }
- private AccessLevel(final java.lang.Integer value){
- this.value=value;
- }
+ private AccessLevel(final java.lang.Integer value) {
+ this.value = value;
+ }
}
[20/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
index a175f6c..e36e14c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
@@ -1,282 +1,270 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ProductPageView",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.PageView")
-public interface ProductPageView
- extends Annotatable,org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageViewId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPageViewId();
-
- void setPageViewId(java.lang.Integer _pageViewId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Username",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getUsername();
-
- void setUsername(java.lang.String _username);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Viewed",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getViewed();
-
- void setViewed(java.util.Calendar _viewed);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TimeSpentOnPage",
- type = "Edm.Time",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.math.BigDecimal getTimeSpentOnPage();
-
- void setTimeSpentOnPage(java.math.BigDecimal _timeSpentOnPage);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageUrl",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getPageUrl();
-
- void setPageUrl(java.lang.String _pageUrl);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductId();
-
- void setProductId(java.lang.Integer _productId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getConcurrencyToken();
-
- void setConcurrencyToken(java.lang.String _concurrencyToken);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login getLogin();
-
- void setLogin(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView.ComplexFactory{
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PageViewId",
- type = "Edm.Int32")
- Annotatable getPageViewIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Username",
- type = "Edm.String")
- Annotatable getUsernameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Viewed",
- type = "Edm.DateTimeOffset")
- Annotatable getViewedAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TimeSpentOnPage",
- type = "Edm.Time")
- Annotatable getTimeSpentOnPageAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PageUrl",
- type = "Edm.String")
- Annotatable getPageUrlAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
- type = "Edm.Int32")
- Annotatable getProductIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
- type = "Edm.String")
- Annotatable getConcurrencyTokenAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
- Annotatable getLoginAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.PageView")
+public interface ProductPageView
+ extends Annotatable,
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView {
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageViewId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPageViewId();
+
+ @Override
+ void setPageViewId(java.lang.Integer _pageViewId);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Username",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getUsername();
+
+ @Override
+ void setUsername(java.lang.String _username);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Viewed",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getViewed();
+
+ @Override
+ void setViewed(java.util.Calendar _viewed);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TimeSpentOnPage",
+ type = "Edm.Time",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.math.BigDecimal getTimeSpentOnPage();
+
+ @Override
+ void setTimeSpentOnPage(java.math.BigDecimal _timeSpentOnPage);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageUrl",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getPageUrl();
+
+ @Override
+ void setPageUrl(java.lang.String _pageUrl);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductId();
+
+ void setProductId(java.lang.Integer _productId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getConcurrencyToken();
+
+ void setConcurrencyToken(java.lang.String _concurrencyToken);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Login",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login
+ getLogin();
+
+ @Override
+ void
+ setLogin(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory
+ extends
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView.ComplexFactory {}
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations
+ extends
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PageViewId",
+ type = "Edm.Int32")
+ Annotatable getPageViewIdAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Username",
+ type = "Edm.String")
+ Annotatable getUsernameAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Viewed",
+ type = "Edm.DateTimeOffset")
+ Annotatable getViewedAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TimeSpentOnPage",
+ type = "Edm.Time")
+ Annotatable getTimeSpentOnPageAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PageUrl",
+ type = "Edm.String")
+ Annotatable getPageUrlAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
+ type = "Edm.String")
+ Annotatable getConcurrencyTokenAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getLoginAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java
index 2e792a6..8610405 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface ProductPageViewCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPageView> {
+public interface ProductPageViewCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPageView> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java
index 080ee20..2dfc28c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java
@@ -1,159 +1,127 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
@KeyRef(ProductPhotoKey.class)
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ProductPhoto",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface ProductPhoto
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductId();
-
- void setProductId(java.lang.Integer _productId);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PhotoId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPhotoId();
-
- void setPhotoId(java.lang.Integer _photoId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Photo",
- type = "Edm.Binary",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- byte[] getPhoto();
-
- void setPhoto(byte[] _photo);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
- type = "Edm.Int32")
- Annotatable getProductIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PhotoId",
- type = "Edm.Int32")
- Annotatable getPhotoIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Photo",
- type = "Edm.Binary")
- Annotatable getPhotoAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface ProductPhoto
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductId();
+
+ void setProductId(java.lang.Integer _productId);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PhotoId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPhotoId();
+
+ void setPhotoId(java.lang.Integer _photoId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Photo",
+ type = "Edm.Binary",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ byte[] getPhoto();
+
+ void setPhoto(byte[] _photo);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PhotoId",
+ type = "Edm.Int32")
+ Annotatable getPhotoIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Photo",
+ type = "Edm.Binary")
+ Annotatable getPhotoAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java
index ab14959..d1bf7ea 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface ProductPhotoCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto> {
+public interface ProductPhotoCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java
index 0c5caaa..db66bea 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java
@@ -1,74 +1,50 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.AbstractEntityKey;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class ProductPhotoKey extends AbstractEntityKey {
- private java.lang.Integer _photoId;
+ private static final long serialVersionUID = 1L;
+ private java.lang.Integer _photoId;
- @CompoundKeyElement(name = "PhotoId", position = 0)
- public java.lang.Integer getPhotoId() {
- return _photoId;
- }
+ @CompoundKeyElement(name = "PhotoId", position = 0)
+ public java.lang.Integer getPhotoId() {
+ return _photoId;
+ }
- public void setPhotoId(java.lang.Integer _photoId) {
- this._photoId = _photoId;
- }
+ public void setPhotoId(final java.lang.Integer _photoId) {
+ this._photoId = _photoId;
+ }
- private java.lang.Integer _productId;
+ private java.lang.Integer _productId;
- @CompoundKeyElement(name = "ProductId", position = 1)
- public java.lang.Integer getProductId() {
- return _productId;
- }
+ @CompoundKeyElement(name = "ProductId", position = 1)
+ public java.lang.Integer getProductId() {
+ return _productId;
+ }
- public void setProductId(java.lang.Integer _productId) {
- this._productId = _productId;
- }
+ public void setProductId(final java.lang.Integer _productId) {
+ this._productId = _productId;
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java
index e6d2f2e..239037f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java
@@ -1,200 +1,170 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
@KeyRef(ProductReviewKey.class)
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ProductReview",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface ProductReview
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductId();
-
- void setProductId(java.lang.Integer _productId);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReviewId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getReviewId();
-
- void setReviewId(java.lang.Integer _reviewId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Review",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getReview();
-
- void setReview(java.lang.String _review);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "RevisionId",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getRevisionId();
-
- void setRevisionId(java.lang.String _revisionId);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Product",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product getProduct();
-
- void setProduct(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
- type = "Edm.Int32")
- Annotatable getProductIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ReviewId",
- type = "Edm.Int32")
- Annotatable getReviewIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Review",
- type = "Edm.String")
- Annotatable getReviewAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "RevisionId",
- type = "Edm.String")
- Annotatable getRevisionIdAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
- Annotatable getProductAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface ProductReview
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductId();
+
+ void setProductId(java.lang.Integer _productId);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReviewId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getReviewId();
+
+ void setReviewId(java.lang.Integer _reviewId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Review",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getReview();
+
+ void setReview(java.lang.String _review);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "RevisionId",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getRevisionId();
+
+ void setRevisionId(java.lang.String _revisionId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Product",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product
+ getProduct();
+
+ void
+ setProduct(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ReviewId",
+ type = "Edm.Int32")
+ Annotatable getReviewIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Review",
+ type = "Edm.String")
+ Annotatable getReviewAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "RevisionId",
+ type = "Edm.String")
+ Annotatable getRevisionIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getProductAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java
index 055b065..45b588b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface ProductReviewCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview> {
+public interface ProductReviewCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java
index 8303513..ec9d14e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java
@@ -1,85 +1,61 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.AbstractEntityKey;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class ProductReviewKey extends AbstractEntityKey {
- private java.lang.Integer _productId;
+ private static final long serialVersionUID = 1L;
+ private java.lang.Integer _productId;
- @CompoundKeyElement(name = "ProductId", position = 0)
- public java.lang.Integer getProductId() {
- return _productId;
- }
+ @CompoundKeyElement(name = "ProductId", position = 0)
+ public java.lang.Integer getProductId() {
+ return _productId;
+ }
- public void setProductId(java.lang.Integer _productId) {
- this._productId = _productId;
- }
+ public void setProductId(final java.lang.Integer _productId) {
+ this._productId = _productId;
+ }
- private java.lang.Integer _reviewId;
+ private java.lang.Integer _reviewId;
- @CompoundKeyElement(name = "ReviewId", position = 1)
- public java.lang.Integer getReviewId() {
- return _reviewId;
- }
+ @CompoundKeyElement(name = "ReviewId", position = 1)
+ public java.lang.Integer getReviewId() {
+ return _reviewId;
+ }
- public void setReviewId(java.lang.Integer _reviewId) {
- this._reviewId = _reviewId;
- }
+ public void setReviewId(final java.lang.Integer _reviewId) {
+ this._reviewId = _reviewId;
+ }
- private java.lang.String _revisionId;
+ private java.lang.String _revisionId;
- @CompoundKeyElement(name = "RevisionId", position = 2)
- public java.lang.String getRevisionId() {
- return _revisionId;
- }
+ @CompoundKeyElement(name = "RevisionId", position = 2)
+ public java.lang.String getRevisionId() {
+ return _revisionId;
+ }
- public void setRevisionId(java.lang.String _revisionId) {
- this._revisionId = _revisionId;
- }
+ public void setRevisionId(final java.lang.String _revisionId) {
+ this._revisionId = _revisionId;
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java
index 0cabafd..f5f75b8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java
@@ -1,146 +1,114 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "RSAToken",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface RSAToken
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Serial",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getSerial();
-
- void setSerial(java.lang.String _serial);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Issued",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getIssued();
-
- void setIssued(java.util.Calendar _issued);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login getLogin();
-
- void setLogin(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Serial",
- type = "Edm.String")
- Annotatable getSerialAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Issued",
- type = "Edm.DateTime")
- Annotatable getIssuedAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
- Annotatable getLoginAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface RSAToken
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Serial",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getSerial();
+
+ void setSerial(java.lang.String _serial);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Issued",
+ type = "Edm.DateTime",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getIssued();
+
+ void setIssued(java.util.Calendar _issued);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Login",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login
+ getLogin();
+
+ void
+ setLogin(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Serial",
+ type = "Edm.String")
+ Annotatable getSerialAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Issued",
+ type = "Edm.DateTime")
+ Annotatable getIssuedAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getLoginAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java
index 3baa19d..fd93eda 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface RSATokenCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken> {
+public interface RSATokenCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken> {
Object getAnnotation(Class<? extends AbstractTerm> term);
[08/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java
index 3aa96fc..a760670 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java
@@ -1,63 +1,48 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
import org.apache.olingo.ext.proxy.api.OperationType;
import org.apache.olingo.ext.proxy.api.annotations.Operation;
import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface ProductCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product> {
- Operations operations();
+public interface ProductCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product> {
+ Operations operations();
- public interface Operations {
+ public interface Operations {
-
- @Operation(name = "Discount",
- type = OperationType.ACTION,
- returnType = "Collection(Microsoft.Test.OData.Services.ODataWCFService.Product)")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection discount(
- @Parameter(name = "percentage", type = "Edm.Int32", nullable = false) java.lang.Integer percentage
- );
+ @Operation(name = "Discount",
+ type = OperationType.ACTION,
+ returnType = "Collection(Microsoft.Test.OData.Services.ODataWCFService.Product)")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection
+ discount(
+ @Parameter(name = "percentage", type = "Edm.Int32", nullable = false) java.lang.Integer percentage
+ );
- }
+ }
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java
index 2a07981..4d81268 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java
@@ -1,226 +1,200 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
+import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
@KeyRef(ProductDetailKey.class)
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ProductDetail",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface ProductDetail
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductID();
-
- void setProductID(java.lang.Integer _productID);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductDetailID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductDetailID();
-
- void setProductDetailID(java.lang.Integer _productDetailID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductName",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getProductName();
-
- void setProductName(java.lang.String _productName);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getDescription();
-
- void setDescription(java.lang.String _description);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "RelatedProduct",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Product",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "Products",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product getRelatedProduct();
-
- void setRelatedProduct(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product _relatedProduct);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Reviews",
- type = "Microsoft.Test.OData.Services.ODataWCFService.ProductReview",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "ProductReviews",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReviewCollection getReviews();
-
- void setReviews(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReviewCollection _reviews);
-
-
- Operations operations();
-
- interface Operations {
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetRelatedProduct",
- type = OperationType.FUNCTION,
- isComposable = true,
- returnType = "Microsoft.Test.OData.Services.ODataWCFService.Product")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product getRelatedProduct(
- );
-
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductID",
- type = "Edm.Int32")
- Annotatable getProductIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductDetailID",
- type = "Edm.Int32")
- Annotatable getProductDetailIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductName",
- type = "Edm.String")
- Annotatable getProductNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
- type = "Edm.String")
- Annotatable getDescriptionAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "RelatedProduct",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Product")
- Annotatable getRelatedProductAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Reviews",
- type = "Microsoft.Test.OData.Services.ODataWCFService.ProductReview")
- Annotatable getReviewsAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface ProductDetail
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductID();
+
+ void setProductID(java.lang.Integer _productID);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductDetailID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductDetailID();
+
+ void setProductDetailID(java.lang.Integer _productDetailID);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductName",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getProductName();
+
+ void setProductName(java.lang.String _productName);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getDescription();
+
+ void setDescription(java.lang.String _description);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "RelatedProduct",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Product",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "Products",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product
+ getRelatedProduct();
+
+ void
+ setRelatedProduct(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product _relatedProduct);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Reviews",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.ProductReview",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "ProductReviews",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReviewCollection
+ getReviews();
+
+ void
+ setReviews(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReviewCollection _reviews);
+
+ Operations operations();
+
+ interface Operations {
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetRelatedProduct",
+ type = OperationType.FUNCTION,
+ isComposable = true,
+ returnType = "Microsoft.Test.OData.Services.ODataWCFService.Product")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product
+ getRelatedProduct(
+ );
+
+ }
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductID",
+ type = "Edm.Int32")
+ Annotatable getProductIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductDetailID",
+ type = "Edm.Int32")
+ Annotatable getProductDetailIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductName",
+ type = "Edm.String")
+ Annotatable getProductNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
+ type = "Edm.String")
+ Annotatable getDescriptionAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "RelatedProduct",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Product")
+ Annotatable getRelatedProductAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Reviews",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.ProductReview")
+ Annotatable getReviewsAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java
index 44a68a9..f19f9b8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface ProductDetailCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail> {
+public interface ProductDetailCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java
index 44def1b..ce780be 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java
@@ -1,74 +1,50 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.AbstractEntityKey;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class ProductDetailKey extends AbstractEntityKey {
- private java.lang.Integer _productID;
+ private static final long serialVersionUID = 1L;
+ private java.lang.Integer _productID;
- @CompoundKeyElement(name = "ProductID", position = 0)
- public java.lang.Integer getProductID() {
- return _productID;
- }
+ @CompoundKeyElement(name = "ProductID", position = 0)
+ public java.lang.Integer getProductID() {
+ return _productID;
+ }
- public void setProductID(java.lang.Integer _productID) {
- this._productID = _productID;
- }
+ public void setProductID(final java.lang.Integer _productID) {
+ this._productID = _productID;
+ }
- private java.lang.Integer _productDetailID;
+ private java.lang.Integer _productDetailID;
- @CompoundKeyElement(name = "ProductDetailID", position = 1)
- public java.lang.Integer getProductDetailID() {
- return _productDetailID;
- }
+ @CompoundKeyElement(name = "ProductDetailID", position = 1)
+ public java.lang.Integer getProductDetailID() {
+ return _productDetailID;
+ }
- public void setProductDetailID(java.lang.Integer _productDetailID) {
- this._productDetailID = _productDetailID;
- }
+ public void setProductDetailID(final java.lang.Integer _productDetailID) {
+ this._productDetailID = _productDetailID;
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java
index e97ecc7..e46b6ec 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java
@@ -1,240 +1,207 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
@KeyRef(ProductReviewKey.class)
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ProductReview",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface ProductReview
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductID();
-
- void setProductID(java.lang.Integer _productID);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductDetailID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductDetailID();
-
- void setProductDetailID(java.lang.Integer _productDetailID);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReviewTitle",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getReviewTitle();
-
- void setReviewTitle(java.lang.String _reviewTitle);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "RevisionID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getRevisionID();
-
- void setRevisionID(java.lang.Integer _revisionID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Comment",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getComment();
-
- void setComment(java.lang.String _comment);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Author",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getAuthor();
-
- void setAuthor(java.lang.String _author);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductID",
- type = "Edm.Int32")
- Annotatable getProductIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductDetailID",
- type = "Edm.Int32")
- Annotatable getProductDetailIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ReviewTitle",
- type = "Edm.String")
- Annotatable getReviewTitleAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "RevisionID",
- type = "Edm.Int32")
- Annotatable getRevisionIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Comment",
- type = "Edm.String")
- Annotatable getCommentAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Author",
- type = "Edm.String")
- Annotatable getAuthorAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface ProductReview
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductID();
+
+ void setProductID(java.lang.Integer _productID);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductDetailID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductDetailID();
+
+ void setProductDetailID(java.lang.Integer _productDetailID);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReviewTitle",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getReviewTitle();
+
+ void setReviewTitle(java.lang.String _reviewTitle);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "RevisionID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getRevisionID();
+
+ void setRevisionID(java.lang.Integer _revisionID);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Comment",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getComment();
+
+ void setComment(java.lang.String _comment);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Author",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getAuthor();
+
+ void setAuthor(java.lang.String _author);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductID",
+ type = "Edm.Int32")
+ Annotatable getProductIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductDetailID",
+ type = "Edm.Int32")
+ Annotatable getProductDetailIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ReviewTitle",
+ type = "Edm.String")
+ Annotatable getReviewTitleAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "RevisionID",
+ type = "Edm.Int32")
+ Annotatable getRevisionIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Comment",
+ type = "Edm.String")
+ Annotatable getCommentAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Author",
+ type = "Edm.String")
+ Annotatable getAuthorAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java
index 28e9234..3effd5a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface ProductReviewCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReview> {
+public interface ProductReviewCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReview> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java
index 6b1fed3..4684b16 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java
@@ -1,96 +1,72 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.AbstractEntityKey;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class ProductReviewKey extends AbstractEntityKey {
- private java.lang.Integer _productID;
+ private static final long serialVersionUID = 1L;
+ private java.lang.Integer _productID;
- @CompoundKeyElement(name = "ProductID", position = 0)
- public java.lang.Integer getProductID() {
- return _productID;
- }
+ @CompoundKeyElement(name = "ProductID", position = 0)
+ public java.lang.Integer getProductID() {
+ return _productID;
+ }
- public void setProductID(java.lang.Integer _productID) {
- this._productID = _productID;
- }
+ public void setProductID(final java.lang.Integer _productID) {
+ this._productID = _productID;
+ }
- private java.lang.Integer _productDetailID;
+ private java.lang.Integer _productDetailID;
- @CompoundKeyElement(name = "ProductDetailID", position = 1)
- public java.lang.Integer getProductDetailID() {
- return _productDetailID;
- }
+ @CompoundKeyElement(name = "ProductDetailID", position = 1)
+ public java.lang.Integer getProductDetailID() {
+ return _productDetailID;
+ }
- public void setProductDetailID(java.lang.Integer _productDetailID) {
- this._productDetailID = _productDetailID;
- }
+ public void setProductDetailID(final java.lang.Integer _productDetailID) {
+ this._productDetailID = _productDetailID;
+ }
- private java.lang.String _reviewTitle;
+ private java.lang.String _reviewTitle;
- @CompoundKeyElement(name = "ReviewTitle", position = 2)
- public java.lang.String getReviewTitle() {
- return _reviewTitle;
- }
+ @CompoundKeyElement(name = "ReviewTitle", position = 2)
+ public java.lang.String getReviewTitle() {
+ return _reviewTitle;
+ }
- public void setReviewTitle(java.lang.String _reviewTitle) {
- this._reviewTitle = _reviewTitle;
- }
+ public void setReviewTitle(final java.lang.String _reviewTitle) {
+ this._reviewTitle = _reviewTitle;
+ }
- private java.lang.Integer _revisionID;
+ private java.lang.Integer _revisionID;
- @CompoundKeyElement(name = "RevisionID", position = 3)
- public java.lang.Integer getRevisionID() {
- return _revisionID;
- }
+ @CompoundKeyElement(name = "RevisionID", position = 3)
+ public java.lang.Integer getRevisionID() {
+ return _revisionID;
+ }
- public void setRevisionID(java.lang.Integer _revisionID) {
- this._revisionID = _revisionID;
- }
+ public void setRevisionID(final java.lang.Integer _revisionID) {
+ this._revisionID = _revisionID;
+ }
}
[28/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
index 777f8c2..350173c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
@@ -1,537 +1,488 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "AllSpatialTypes",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface AllSpatialTypes
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getId();
-
- void setId(java.lang.Integer _id);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Geog",
- type = "Edm.Geography",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.Geospatial getGeog();
-
- void setGeog(org.apache.olingo.commons.api.edm.geo.Geospatial _geog);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogPoint",
- type = "Edm.GeographyPoint",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.Point getGeogPoint();
-
- void setGeogPoint(org.apache.olingo.commons.api.edm.geo.Point _geogPoint);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogLine",
- type = "Edm.GeographyLineString",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.LineString getGeogLine();
-
- void setGeogLine(org.apache.olingo.commons.api.edm.geo.LineString _geogLine);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogPolygon",
- type = "Edm.GeographyPolygon",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.Polygon getGeogPolygon();
-
- void setGeogPolygon(org.apache.olingo.commons.api.edm.geo.Polygon _geogPolygon);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogCollection",
- type = "Edm.GeographyCollection",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.GeospatialCollection getGeogCollection();
-
- void setGeogCollection(org.apache.olingo.commons.api.edm.geo.GeospatialCollection _geogCollection);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogMultiPoint",
- type = "Edm.GeographyMultiPoint",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.MultiPoint getGeogMultiPoint();
-
- void setGeogMultiPoint(org.apache.olingo.commons.api.edm.geo.MultiPoint _geogMultiPoint);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogMultiLine",
- type = "Edm.GeographyMultiLineString",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.MultiLineString getGeogMultiLine();
-
- void setGeogMultiLine(org.apache.olingo.commons.api.edm.geo.MultiLineString _geogMultiLine);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogMultiPolygon",
- type = "Edm.GeographyMultiPolygon",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.MultiPolygon getGeogMultiPolygon();
-
- void setGeogMultiPolygon(org.apache.olingo.commons.api.edm.geo.MultiPolygon _geogMultiPolygon);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Geom",
- type = "Edm.Geometry",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.Geospatial getGeom();
-
- void setGeom(org.apache.olingo.commons.api.edm.geo.Geospatial _geom);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomPoint",
- type = "Edm.GeometryPoint",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.Point getGeomPoint();
-
- void setGeomPoint(org.apache.olingo.commons.api.edm.geo.Point _geomPoint);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomLine",
- type = "Edm.GeometryLineString",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.LineString getGeomLine();
-
- void setGeomLine(org.apache.olingo.commons.api.edm.geo.LineString _geomLine);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomPolygon",
- type = "Edm.GeometryPolygon",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.Polygon getGeomPolygon();
-
- void setGeomPolygon(org.apache.olingo.commons.api.edm.geo.Polygon _geomPolygon);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomCollection",
- type = "Edm.GeometryCollection",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.GeospatialCollection getGeomCollection();
-
- void setGeomCollection(org.apache.olingo.commons.api.edm.geo.GeospatialCollection _geomCollection);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomMultiPoint",
- type = "Edm.GeometryMultiPoint",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.MultiPoint getGeomMultiPoint();
-
- void setGeomMultiPoint(org.apache.olingo.commons.api.edm.geo.MultiPoint _geomMultiPoint);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomMultiLine",
- type = "Edm.GeometryMultiLineString",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.MultiLineString getGeomMultiLine();
-
- void setGeomMultiLine(org.apache.olingo.commons.api.edm.geo.MultiLineString _geomMultiLine);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomMultiPolygon",
- type = "Edm.GeometryMultiPolygon",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.MultiPolygon getGeomMultiPolygon();
-
- void setGeomMultiPolygon(org.apache.olingo.commons.api.edm.geo.MultiPolygon _geomMultiPolygon);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Int32")
- Annotatable getIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Geog",
- type = "Edm.Geography")
- Annotatable getGeogAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogPoint",
- type = "Edm.GeographyPoint")
- Annotatable getGeogPointAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogLine",
- type = "Edm.GeographyLineString")
- Annotatable getGeogLineAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogPolygon",
- type = "Edm.GeographyPolygon")
- Annotatable getGeogPolygonAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogCollection",
- type = "Edm.GeographyCollection")
- Annotatable getGeogCollectionAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogMultiPoint",
- type = "Edm.GeographyMultiPoint")
- Annotatable getGeogMultiPointAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogMultiLine",
- type = "Edm.GeographyMultiLineString")
- Annotatable getGeogMultiLineAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogMultiPolygon",
- type = "Edm.GeographyMultiPolygon")
- Annotatable getGeogMultiPolygonAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Geom",
- type = "Edm.Geometry")
- Annotatable getGeomAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomPoint",
- type = "Edm.GeometryPoint")
- Annotatable getGeomPointAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomLine",
- type = "Edm.GeometryLineString")
- Annotatable getGeomLineAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomPolygon",
- type = "Edm.GeometryPolygon")
- Annotatable getGeomPolygonAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomCollection",
- type = "Edm.GeometryCollection")
- Annotatable getGeomCollectionAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomMultiPoint",
- type = "Edm.GeometryMultiPoint")
- Annotatable getGeomMultiPointAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomMultiLine",
- type = "Edm.GeometryMultiLineString")
- Annotatable getGeomMultiLineAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomMultiPolygon",
- type = "Edm.GeometryMultiPolygon")
- Annotatable getGeomMultiPolygonAnnotations();
-
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface AllSpatialTypes
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getId();
+
+ void setId(java.lang.Integer _id);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Geog",
+ type = "Edm.Geography",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.Geospatial getGeog();
+
+ void setGeog(org.apache.olingo.commons.api.edm.geo.Geospatial _geog);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogPoint",
+ type = "Edm.GeographyPoint",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.Point getGeogPoint();
+
+ void setGeogPoint(org.apache.olingo.commons.api.edm.geo.Point _geogPoint);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogLine",
+ type = "Edm.GeographyLineString",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.LineString getGeogLine();
+
+ void setGeogLine(org.apache.olingo.commons.api.edm.geo.LineString _geogLine);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogPolygon",
+ type = "Edm.GeographyPolygon",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.Polygon getGeogPolygon();
+
+ void setGeogPolygon(org.apache.olingo.commons.api.edm.geo.Polygon _geogPolygon);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogCollection",
+ type = "Edm.GeographyCollection",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.GeospatialCollection getGeogCollection();
+
+ void setGeogCollection(org.apache.olingo.commons.api.edm.geo.GeospatialCollection _geogCollection);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogMultiPoint",
+ type = "Edm.GeographyMultiPoint",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.MultiPoint getGeogMultiPoint();
+
+ void setGeogMultiPoint(org.apache.olingo.commons.api.edm.geo.MultiPoint _geogMultiPoint);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogMultiLine",
+ type = "Edm.GeographyMultiLineString",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.MultiLineString getGeogMultiLine();
+
+ void setGeogMultiLine(org.apache.olingo.commons.api.edm.geo.MultiLineString _geogMultiLine);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogMultiPolygon",
+ type = "Edm.GeographyMultiPolygon",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.MultiPolygon getGeogMultiPolygon();
+
+ void setGeogMultiPolygon(org.apache.olingo.commons.api.edm.geo.MultiPolygon _geogMultiPolygon);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Geom",
+ type = "Edm.Geometry",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.Geospatial getGeom();
+
+ void setGeom(org.apache.olingo.commons.api.edm.geo.Geospatial _geom);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomPoint",
+ type = "Edm.GeometryPoint",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.Point getGeomPoint();
+
+ void setGeomPoint(org.apache.olingo.commons.api.edm.geo.Point _geomPoint);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomLine",
+ type = "Edm.GeometryLineString",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.LineString getGeomLine();
+
+ void setGeomLine(org.apache.olingo.commons.api.edm.geo.LineString _geomLine);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomPolygon",
+ type = "Edm.GeometryPolygon",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.Polygon getGeomPolygon();
+
+ void setGeomPolygon(org.apache.olingo.commons.api.edm.geo.Polygon _geomPolygon);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomCollection",
+ type = "Edm.GeometryCollection",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.GeospatialCollection getGeomCollection();
+
+ void setGeomCollection(org.apache.olingo.commons.api.edm.geo.GeospatialCollection _geomCollection);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomMultiPoint",
+ type = "Edm.GeometryMultiPoint",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.MultiPoint getGeomMultiPoint();
+
+ void setGeomMultiPoint(org.apache.olingo.commons.api.edm.geo.MultiPoint _geomMultiPoint);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomMultiLine",
+ type = "Edm.GeometryMultiLineString",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.MultiLineString getGeomMultiLine();
+
+ void setGeomMultiLine(org.apache.olingo.commons.api.edm.geo.MultiLineString _geomMultiLine);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomMultiPolygon",
+ type = "Edm.GeometryMultiPolygon",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.MultiPolygon getGeomMultiPolygon();
+
+ void setGeomMultiPolygon(org.apache.olingo.commons.api.edm.geo.MultiPolygon _geomMultiPolygon);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Geog",
+ type = "Edm.Geography")
+ Annotatable getGeogAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogPoint",
+ type = "Edm.GeographyPoint")
+ Annotatable getGeogPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogLine",
+ type = "Edm.GeographyLineString")
+ Annotatable getGeogLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogPolygon",
+ type = "Edm.GeographyPolygon")
+ Annotatable getGeogPolygonAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogCollection",
+ type = "Edm.GeographyCollection")
+ Annotatable getGeogCollectionAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogMultiPoint",
+ type = "Edm.GeographyMultiPoint")
+ Annotatable getGeogMultiPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogMultiLine",
+ type = "Edm.GeographyMultiLineString")
+ Annotatable getGeogMultiLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogMultiPolygon",
+ type = "Edm.GeographyMultiPolygon")
+ Annotatable getGeogMultiPolygonAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Geom",
+ type = "Edm.Geometry")
+ Annotatable getGeomAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomPoint",
+ type = "Edm.GeometryPoint")
+ Annotatable getGeomPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomLine",
+ type = "Edm.GeometryLineString")
+ Annotatable getGeomLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomPolygon",
+ type = "Edm.GeometryPolygon")
+ Annotatable getGeomPolygonAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomCollection",
+ type = "Edm.GeometryCollection")
+ Annotatable getGeomCollectionAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomMultiPoint",
+ type = "Edm.GeometryMultiPoint")
+ Annotatable getGeomMultiPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomMultiLine",
+ type = "Edm.GeometryMultiLineString")
+ Annotatable getGeomMultiLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomMultiPolygon",
+ type = "Edm.GeometryMultiPolygon")
+ Annotatable getGeomMultiPolygonAnnotations();
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
index b63cae6..bff7481 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface AllSpatialTypesCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes> {
+public interface AllSpatialTypesCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
index 8f2b42b..2b31173 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
@@ -1,86 +1,55 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "AuditInfo")
-public interface AuditInfo
+public interface AuditInfo
extends java.io.Serializable {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ModifiedDate", type = "Edm.DateTime", nullable = false)
+ java.util.Calendar getModifiedDate();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ModifiedDate", type = "Edm.DateTime", nullable = false)
- java.util.Calendar getModifiedDate();
-
- void setModifiedDate(java.util.Calendar _modifiedDate);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ModifiedBy", type = "Edm.String", nullable = true)
- java.lang.String getModifiedBy();
-
- void setModifiedBy(java.lang.String _modifiedBy);
+ void setModifiedDate(java.util.Calendar _modifiedDate);
-
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ModifiedBy", type = "Edm.String", nullable = true)
+ java.lang.String getModifiedBy();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo", nullable = true)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getConcurrency();
+ void setModifiedBy(java.lang.String _modifiedBy);
- void setConcurrency(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo", nullable = true)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo
+ getConcurrency();
-
+ void
+ setConcurrency(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency);
- ComplexFactory factory();
+ ComplexFactory factory();
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newConcurrency();
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo
+ newConcurrency();
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
index 8cc1230..d9b46ee 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
@@ -1,242 +1,241 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
@KeyRef(OrderLineKey.class)
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "BackOrderLine",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine")
-public interface BackOrderLine
- extends Annotatable,org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine {
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderLineStream",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.io.InputStream getOrderLineStream();
-
- void setOrderLineStream(java.io.InputStream _orderLineStream);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getOrderId();
-
- void setOrderId(java.lang.Integer _orderId);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductId();
-
- void setProductId(java.lang.Integer _productId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getQuantity();
-
- void setQuantity(java.lang.Integer _quantity);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getConcurrencyToken();
-
- void setConcurrencyToken(java.lang.String _concurrencyToken);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Order",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Order",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order getOrder();
-
- void setOrder(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Product",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product getProduct();
-
- void setProduct(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine.ComplexFactory{
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderLineStream",
- type = "Edm.Stream")
- Annotatable getOrderLineStreamAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
- type = "Edm.Int32")
- Annotatable getOrderIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
- type = "Edm.Int32")
- Annotatable getProductIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Quantity",
- type = "Edm.Int32")
- Annotatable getQuantityAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
- type = "Edm.String")
- Annotatable getConcurrencyTokenAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Order",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
- Annotatable getOrderAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
- Annotatable getProductAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine")
+public interface BackOrderLine
+ extends Annotatable,
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderLineStream",
+ type = "Edm.Stream",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.io.InputStream getOrderLineStream();
+
+ @Override
+ void setOrderLineStream(java.io.InputStream _orderLineStream);
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getOrderId();
+
+ @Override
+ void setOrderId(java.lang.Integer _orderId);
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductId();
+
+ @Override
+ void setProductId(java.lang.Integer _productId);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getQuantity();
+
+ @Override
+ void setQuantity(java.lang.Integer _quantity);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getConcurrencyToken();
+
+ @Override
+ void setConcurrencyToken(java.lang.String _concurrencyToken);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Order",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Order",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order
+ getOrder();
+
+ @Override
+ void
+ setOrder(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Product",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product
+ getProduct();
+
+ @Override
+ void
+ setProduct(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory
+ extends
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine.ComplexFactory {}
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations
+ extends
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderLineStream",
+ type = "Edm.Stream")
+ Annotatable getOrderLineStreamAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
+ type = "Edm.Int32")
+ Annotatable getOrderIdAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Quantity",
+ type = "Edm.Int32")
+ Annotatable getQuantityAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
+ type = "Edm.String")
+ Annotatable getConcurrencyTokenAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Order",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
+ Annotatable getOrderAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getProductAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
index 021b330..eb9f2b3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
@@ -1,242 +1,242 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
@KeyRef(OrderLineKey.class)
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "BackOrderLine2",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.BackOrderLine")
-public interface BackOrderLine2
- extends Annotatable,org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine {
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderLineStream",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.io.InputStream getOrderLineStream();
-
- void setOrderLineStream(java.io.InputStream _orderLineStream);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getOrderId();
-
- void setOrderId(java.lang.Integer _orderId);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductId();
-
- void setProductId(java.lang.Integer _productId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getQuantity();
-
- void setQuantity(java.lang.Integer _quantity);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getConcurrencyToken();
-
- void setConcurrencyToken(java.lang.String _concurrencyToken);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Order",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Order",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order getOrder();
-
- void setOrder(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Product",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product getProduct();
-
- void setProduct(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine.ComplexFactory{
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderLineStream",
- type = "Edm.Stream")
- Annotatable getOrderLineStreamAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
- type = "Edm.Int32")
- Annotatable getOrderIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
- type = "Edm.Int32")
- Annotatable getProductIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Quantity",
- type = "Edm.Int32")
- Annotatable getQuantityAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
- type = "Edm.String")
- Annotatable getConcurrencyTokenAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Order",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
- Annotatable getOrderAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
- Annotatable getProductAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.BackOrderLine")
+public interface BackOrderLine2
+ extends
+ Annotatable,
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderLineStream",
+ type = "Edm.Stream",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.io.InputStream getOrderLineStream();
+
+ @Override
+ void setOrderLineStream(java.io.InputStream _orderLineStream);
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getOrderId();
+
+ @Override
+ void setOrderId(java.lang.Integer _orderId);
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductId();
+
+ @Override
+ void setProductId(java.lang.Integer _productId);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getQuantity();
+
+ @Override
+ void setQuantity(java.lang.Integer _quantity);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getConcurrencyToken();
+
+ @Override
+ void setConcurrencyToken(java.lang.String _concurrencyToken);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Order",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Order",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order
+ getOrder();
+
+ @Override
+ void
+ setOrder(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Product",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product
+ getProduct();
+
+ @Override
+ void
+ setProduct(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory
+ extends
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine.ComplexFactory {}
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations
+ extends
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderLineStream",
+ type = "Edm.Stream")
+ Annotatable getOrderLineStreamAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
+ type = "Edm.Int32")
+ Annotatable getOrderIdAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Quantity",
+ type = "Edm.Int32")
+ Annotatable getQuantityAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
+ type = "Edm.String")
+ Annotatable getConcurrencyTokenAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Order",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
+ Annotatable getOrderAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getProductAnnotations();
+ }
}
[51/51] [abbrv] [partial] git commit: [OLINGO-328] code cleanup and
checkstyle issues
Posted by sk...@apache.org.
[OLINGO-328] code cleanup and checkstyle issues
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/2ab4b2fd
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/2ab4b2fd
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/2ab4b2fd
Branch: refs/heads/master
Commit: 2ab4b2fdbafd2d181c544abdb87673cdfff75adb
Parents: bf96839
Author: Stephan Klevenz <st...@sap.com>
Authored: Mon Jun 30 16:56:39 2014 +0200
Committer: Stephan Klevenz <st...@sap.com>
Committed: Mon Jun 30 16:56:39 2014 +0200
----------------------------------------------------------------------
.../org/apache/olingo/fit/AbstractServices.java | 735 +++++------
.../fit/UnsupportedMediaTypeException.java | 21 +-
.../apache/olingo/fit/V3ActionOverloading.java | 72 +-
.../org/apache/olingo/fit/V3KeyAsSegment.java | 132 +-
.../java/org/apache/olingo/fit/V3OpenType.java | 64 +-
.../org/apache/olingo/fit/V3PrimitiveKeys.java | 19 +-
.../java/org/apache/olingo/fit/V3Services.java | 200 +--
.../main/java/org/apache/olingo/fit/V4Demo.java | 104 +-
.../org/apache/olingo/fit/V4KeyAsSegment.java | 90 +-
.../java/org/apache/olingo/fit/V4NorthWind.java | 17 +-
.../org/apache/olingo/fit/V4NorthWindExt.java | 19 +-
.../java/org/apache/olingo/fit/V4OpenType.java | 60 +-
.../java/org/apache/olingo/fit/V4Services.java | 266 ++--
.../org/apache/olingo/fit/V4Vocabularies.java | 41 +-
.../fit/metadata/AbstractMetadataElement.java | 14 +-
.../apache/olingo/fit/metadata/Association.java | 14 +-
.../olingo/fit/metadata/AssociationSet.java | 14 +-
.../apache/olingo/fit/metadata/Container.java | 14 +-
.../apache/olingo/fit/metadata/EntitySet.java | 23 +-
.../apache/olingo/fit/metadata/EntityType.java | 18 +-
.../apache/olingo/fit/metadata/Metadata.java | 62 +-
.../olingo/fit/metadata/NavigationProperty.java | 24 +-
.../apache/olingo/fit/metadata/Property.java | 20 +-
.../org/apache/olingo/fit/metadata/Schema.java | 18 +-
.../org/apache/olingo/fit/methods/MERGE.java | 20 +-
.../org/apache/olingo/fit/methods/PATCH.java | 20 +-
.../apache/olingo/fit/rproxy/LinkRewrite.java | 17 +-
.../olingo/fit/rproxy/LinkRewriteRenderer.java | 23 +-
.../fit/serializer/FITAtomDeserializer.java | 14 +-
.../olingo/fit/utils/AbstractUtilities.java | 39 +-
.../org/apache/olingo/fit/utils/Accept.java | 25 +-
.../org/apache/olingo/fit/utils/Commons.java | 108 +-
.../apache/olingo/fit/utils/ConstantKey.java | 14 +-
.../org/apache/olingo/fit/utils/Constants.java | 25 +-
.../org/apache/olingo/fit/utils/FSManager.java | 14 +-
.../fit/utils/InjectableSerializerProvider.java | 18 +-
.../apache/olingo/fit/utils/JSONUtilities.java | 80 +-
.../org/apache/olingo/fit/utils/LinkInfo.java | 16 +-
.../olingo/fit/utils/MetadataLinkInfo.java | 35 +-
.../olingo/fit/utils/NavigationLinks.java | 27 +-
.../utils/ResolvingReferencesInterceptor.java | 20 +-
.../fit/utils/XHTTPMethodInterceptor.java | 17 +-
.../org/apache/olingo/fit/utils/XMLElement.java | 18 +-
.../olingo/fit/utils/XMLEventReaderWrapper.java | 42 +-
.../apache/olingo/fit/utils/XMLUtilities.java | 268 ++--
.../olingo/fit/AbstractBaseTestITCase.java | 14 +-
.../olingo/fit/proxy/v3/AbstractTestITCase.java | 56 +-
.../proxy/v3/ActionOverloadingTestITCase.java | 50 +-
.../olingo/fit/proxy/v3/AsyncTestITCase.java | 71 +-
.../olingo/fit/proxy/v3/ContextTestITCase.java | 127 +-
.../fit/proxy/v3/EntityCreateTestITCase.java | 34 +-
.../fit/proxy/v3/EntityRetrieveTestITCase.java | 94 +-
.../fit/proxy/v3/EntitySetTestITCase.java | 15 +-
.../fit/proxy/v3/EntityUpdateTestITCase.java | 154 ++-
.../olingo/fit/proxy/v3/FilterTestITCase.java | 41 +-
.../olingo/fit/proxy/v3/InvokeTestITCase.java | 34 +-
.../fit/proxy/v3/MediaEntityTestITCase.java | 19 +-
.../olingo/fit/proxy/v3/OpenTypeTestITCase.java | 25 +-
.../fit/proxy/v3/PrimitiveKeysTestITCase.java | 27 +-
.../olingo/fit/proxy/v3/PropertyTestITCase.java | 50 +-
.../AllGeoCollectionTypesSet.java | 56 +-
.../astoriadefaultservice/AllGeoTypesSet.java | 50 +-
.../services/astoriadefaultservice/Car.java | 50 +-
.../astoriadefaultservice/Computer.java | 50 +-
.../astoriadefaultservice/ComputerDetail.java | 50 +-
.../astoriadefaultservice/Customer.java | 50 +-
.../astoriadefaultservice/CustomerInfo.java | 50 +-
.../astoriadefaultservice/DefaultContainer.java | 211 ++--
.../services/astoriadefaultservice/Driver.java | 50 +-
.../astoriadefaultservice/LastLogin.java | 50 +-
.../services/astoriadefaultservice/License.java | 50 +-
.../services/astoriadefaultservice/Login.java | 50 +-
.../astoriadefaultservice/MappedEntityType.java | 50 +-
.../services/astoriadefaultservice/Message.java | 51 +-
.../MessageAttachment.java | 50 +-
.../services/astoriadefaultservice/Order.java | 50 +-
.../astoriadefaultservice/OrderLine.java | 69 +-
.../astoriadefaultservice/PageView.java | 56 +-
.../services/astoriadefaultservice/Person.java | 76 +-
.../astoriadefaultservice/PersonMetadata.java | 50 +-
.../services/astoriadefaultservice/Product.java | 56 +-
.../astoriadefaultservice/ProductDetail.java | 50 +-
.../astoriadefaultservice/ProductPhoto.java | 51 +-
.../astoriadefaultservice/ProductReview.java | 51 +-
.../astoriadefaultservice/RSAToken.java | 50 +-
.../astoriadefaultservice/package-info.java | 16 +-
.../astoriadefaultservice/types/Aliases.java | 62 +-
.../types/AllSpatialCollectionTypes.java | 139 +--
.../AllSpatialCollectionTypesCollection.java | 44 +-
.../types/AllSpatialCollectionTypes_Simple.java | 470 ++++---
...SpatialCollectionTypes_SimpleCollection.java | 44 +-
.../types/AllSpatialTypes.java | 985 +++++++--------
.../types/AllSpatialTypesCollection.java | 44 +-
.../astoriadefaultservice/types/AuditInfo.java | 89 +-
.../types/BackOrderLine.java | 457 +++----
.../types/BackOrderLine2.java | 457 +++----
.../types/BackOrderLine2Collection.java | 44 +-
.../types/BackOrderLineCollection.java | 44 +-
.../astoriadefaultservice/types/Car.java | 305 ++---
.../types/CarCollection.java | 44 +-
.../types/ComplexToCategory.java | 77 +-
.../astoriadefaultservice/types/Computer.java | 222 ++--
.../types/ComputerCollection.java | 44 +-
.../types/ComputerDetail.java | 500 ++++----
.../types/ComputerDetailCollection.java | 44 +-
.../types/ConcurrencyInfo.java | 70 +-
.../types/ContactDetails.java | 147 +--
.../astoriadefaultservice/types/Contractor.java | 477 ++++---
.../types/ContractorCollection.java | 44 +-
.../astoriadefaultservice/types/Customer.java | 648 +++++-----
.../types/CustomerCollection.java | 44 +-
.../types/CustomerInfo.java | 199 ++-
.../types/CustomerInfoCollection.java | 44 +-
.../astoriadefaultservice/types/Dimensions.java | 77 +-
.../types/DiscontinuedProduct.java | 901 +++++++-------
.../types/DiscontinuedProductCollection.java | 44 +-
.../astoriadefaultservice/types/Driver.java | 222 ++--
.../types/DriverCollection.java | 44 +-
.../astoriadefaultservice/types/Employee.java | 470 ++++---
.../types/EmployeeCollection.java | 58 +-
.../astoriadefaultservice/types/LastLogin.java | 328 +++--
.../types/LastLoginCollection.java | 44 +-
.../astoriadefaultservice/types/License.java | 381 +++---
.../types/LicenseCollection.java | 44 +-
.../astoriadefaultservice/types/Login.java | 346 +++---
.../types/LoginCollection.java | 44 +-
.../types/MappedEntityType.java | 1173 +++++++++---------
.../types/MappedEntityTypeCollection.java | 44 +-
.../astoriadefaultservice/types/Message.java | 548 ++++----
.../types/MessageAttachment.java | 192 ++-
.../types/MessageAttachmentCollection.java | 44 +-
.../types/MessageCollection.java | 44 +-
.../astoriadefaultservice/types/MessageKey.java | 76 +-
.../astoriadefaultservice/types/Order.java | 319 +++--
.../types/OrderCollection.java | 44 +-
.../astoriadefaultservice/types/OrderLine.java | 435 +++----
.../types/OrderLineCollection.java | 44 +-
.../types/OrderLineKey.java | 76 +-
.../astoriadefaultservice/types/PageView.java | 381 +++---
.../types/PageViewCollection.java | 44 +-
.../astoriadefaultservice/types/Person.java | 242 ++--
.../types/PersonCollection.java | 44 +-
.../types/PersonMetadata.java | 328 +++--
.../types/PersonMetadataCollection.java | 44 +-
.../astoriadefaultservice/types/Phone.java | 69 +-
.../astoriadefaultservice/types/Product.java | 639 +++++-----
.../types/ProductCollection.java | 44 +-
.../types/ProductDetail.java | 222 ++--
.../types/ProductDetailCollection.java | 44 +-
.../types/ProductPageView.java | 514 ++++----
.../types/ProductPageViewCollection.java | 44 +-
.../types/ProductPhoto.java | 244 ++--
.../types/ProductPhotoCollection.java | 44 +-
.../types/ProductPhotoKey.java | 76 +-
.../types/ProductReview.java | 328 +++--
.../types/ProductReviewCollection.java | 44 +-
.../types/ProductReviewKey.java | 92 +-
.../astoriadefaultservice/types/RSAToken.java | 222 ++--
.../types/RSATokenCollection.java | 44 +-
.../types/SpecialEmployee.java | 669 +++++-----
.../types/SpecialEmployeeCollection.java | 58 +-
.../types/package-info.java | 16 +-
.../opentypesservicev3/DefaultContainer.java | 66 +-
.../odata/services/opentypesservicev3/Row.java | 55 +-
.../services/opentypesservicev3/RowIndex.java | 49 +-
.../opentypesservicev3/package-info.java | 16 +-
.../types/ContactDetails.java | 151 +--
.../opentypesservicev3/types/IndexedRow.java | 149 +--
.../types/IndexedRowCollection.java | 44 +-
.../services/opentypesservicev3/types/Row.java | 140 +--
.../opentypesservicev3/types/RowCollection.java | 44 +-
.../opentypesservicev3/types/RowIndex.java | 170 ++-
.../types/RowIndexCollection.java | 44 +-
.../opentypesservicev3/types/package-info.java | 16 +-
.../primitivekeysservice/EdmBinarySet.java | 50 +-
.../primitivekeysservice/EdmBooleanSet.java | 50 +-
.../primitivekeysservice/EdmByteSet.java | 50 +-
.../EdmDateTimeOffsetSet.java | 50 +-
.../primitivekeysservice/EdmDateTimeSet.java | 50 +-
.../primitivekeysservice/EdmDecimalSet.java | 50 +-
.../primitivekeysservice/EdmDoubleSet.java | 50 +-
.../primitivekeysservice/EdmGuidSet.java | 50 +-
.../primitivekeysservice/EdmInt16Set.java | 50 +-
.../primitivekeysservice/EdmInt32Set.java | 50 +-
.../primitivekeysservice/EdmInt64Set.java | 50 +-
.../primitivekeysservice/EdmSingleSet.java | 50 +-
.../primitivekeysservice/EdmStringSet.java | 50 +-
.../primitivekeysservice/EdmTimeSet.java | 50 +-
.../services/primitivekeysservice/Folders.java | 50 +-
.../primitivekeysservice/TestContext.java | 88 +-
.../primitivekeysservice/package-info.java | 16 +-
.../primitivekeysservice/types/EdmBinary.java | 139 +--
.../types/EdmBinaryCollection.java | 44 +-
.../primitivekeysservice/types/EdmBoolean.java | 139 +--
.../types/EdmBooleanCollection.java | 44 +-
.../primitivekeysservice/types/EdmByte.java | 139 +--
.../types/EdmByteCollection.java | 44 +-
.../primitivekeysservice/types/EdmDateTime.java | 139 +--
.../types/EdmDateTimeCollection.java | 44 +-
.../types/EdmDateTimeOffset.java | 139 +--
.../types/EdmDateTimeOffsetCollection.java | 44 +-
.../primitivekeysservice/types/EdmDecimal.java | 139 +--
.../types/EdmDecimalCollection.java | 44 +-
.../primitivekeysservice/types/EdmDouble.java | 139 +--
.../types/EdmDoubleCollection.java | 44 +-
.../primitivekeysservice/types/EdmGuid.java | 139 +--
.../types/EdmGuidCollection.java | 44 +-
.../primitivekeysservice/types/EdmInt16.java | 139 +--
.../types/EdmInt16Collection.java | 44 +-
.../primitivekeysservice/types/EdmInt32.java | 139 +--
.../types/EdmInt32Collection.java | 44 +-
.../primitivekeysservice/types/EdmInt64.java | 139 +--
.../types/EdmInt64Collection.java | 44 +-
.../primitivekeysservice/types/EdmSingle.java | 139 +--
.../types/EdmSingleCollection.java | 44 +-
.../primitivekeysservice/types/EdmString.java | 139 +--
.../types/EdmStringCollection.java | 44 +-
.../primitivekeysservice/types/EdmTime.java | 139 +--
.../types/EdmTimeCollection.java | 44 +-
.../primitivekeysservice/types/Folder.java | 222 ++--
.../types/FolderCollection.java | 44 +-
.../types/package-info.java | 16 +-
.../AllGeoCollectionTypesSet.java | 56 +-
.../astoriadefaultservice/AllGeoTypesSet.java | 50 +-
.../services/astoriadefaultservice/Car.java | 49 +-
.../astoriadefaultservice/Computer.java | 50 +-
.../astoriadefaultservice/ComputerDetail.java | 50 +-
.../astoriadefaultservice/Customer.java | 50 +-
.../astoriadefaultservice/CustomerInfo.java | 50 +-
.../astoriadefaultservice/DefaultContainer.java | 299 ++---
.../services/astoriadefaultservice/Driver.java | 50 +-
.../astoriadefaultservice/LastLogin.java | 50 +-
.../services/astoriadefaultservice/License.java | 50 +-
.../services/astoriadefaultservice/Login.java | 50 +-
.../astoriadefaultservice/MappedEntityType.java | 50 +-
.../services/astoriadefaultservice/Message.java | 51 +-
.../MessageAttachment.java | 50 +-
.../services/astoriadefaultservice/Order.java | 50 +-
.../astoriadefaultservice/OrderLine.java | 69 +-
.../astoriadefaultservice/PageView.java | 56 +-
.../services/astoriadefaultservice/Person.java | 76 +-
.../astoriadefaultservice/PersonMetadata.java | 50 +-
.../services/astoriadefaultservice/Product.java | 56 +-
.../astoriadefaultservice/ProductDetail.java | 50 +-
.../astoriadefaultservice/ProductPhoto.java | 51 +-
.../astoriadefaultservice/ProductReview.java | 51 +-
.../astoriadefaultservice/RSAToken.java | 50 +-
.../astoriadefaultservice/package-info.java | 16 +-
.../astoriadefaultservice/types/Aliases.java | 62 +-
.../types/AllSpatialCollectionTypes.java | 139 +--
.../AllSpatialCollectionTypesCollection.java | 44 +-
.../types/AllSpatialCollectionTypes_Simple.java | 470 ++++---
...SpatialCollectionTypes_SimpleCollection.java | 44 +-
.../types/AllSpatialTypes.java | 985 +++++++--------
.../types/AllSpatialTypesCollection.java | 44 +-
.../astoriadefaultservice/types/AuditInfo.java | 89 +-
.../types/BackOrderLine.java | 441 ++++---
.../types/BackOrderLine2.java | 442 +++----
.../types/BackOrderLine2Collection.java | 44 +-
.../types/BackOrderLineCollection.java | 44 +-
.../astoriadefaultservice/types/Car.java | 305 ++---
.../types/CarCollection.java | 44 +-
.../types/ComplexToCategory.java | 77 +-
.../types/ComplexWithAllPrimitiveTypes.java | 167 +--
.../astoriadefaultservice/types/Computer.java | 245 ++--
.../types/ComputerCollection.java | 44 +-
.../types/ComputerDetail.java | 526 ++++----
.../types/ComputerDetailCollection.java | 44 +-
.../types/ConcurrencyInfo.java | 70 +-
.../types/ContactDetails.java | 147 +--
.../astoriadefaultservice/types/Contractor.java | 452 ++++---
.../types/ContractorCollection.java | 44 +-
.../astoriadefaultservice/types/Customer.java | 648 +++++-----
.../types/CustomerCollection.java | 44 +-
.../types/CustomerInfo.java | 199 ++-
.../types/CustomerInfoCollection.java | 44 +-
.../astoriadefaultservice/types/Dimensions.java | 77 +-
.../types/DiscontinuedProduct.java | 901 +++++++-------
.../types/DiscontinuedProductCollection.java | 44 +-
.../astoriadefaultservice/types/Driver.java | 222 ++--
.../types/DriverCollection.java | 44 +-
.../astoriadefaultservice/types/Employee.java | 450 ++++---
.../types/EmployeeCollection.java | 58 +-
.../astoriadefaultservice/types/LastLogin.java | 328 +++--
.../types/LastLoginCollection.java | 44 +-
.../astoriadefaultservice/types/License.java | 381 +++---
.../types/LicenseCollection.java | 44 +-
.../astoriadefaultservice/types/Login.java | 346 +++---
.../types/LoginCollection.java | 44 +-
.../types/MappedEntityType.java | 1173 +++++++++---------
.../types/MappedEntityTypeCollection.java | 44 +-
.../astoriadefaultservice/types/Message.java | 548 ++++----
.../types/MessageAttachment.java | 192 ++-
.../types/MessageAttachmentCollection.java | 44 +-
.../types/MessageCollection.java | 44 +-
.../astoriadefaultservice/types/MessageKey.java | 76 +-
.../astoriadefaultservice/types/Order.java | 319 +++--
.../types/OrderCollection.java | 44 +-
.../astoriadefaultservice/types/OrderLine.java | 411 +++---
.../types/OrderLineCollection.java | 44 +-
.../types/OrderLineKey.java | 76 +-
.../astoriadefaultservice/types/PageView.java | 381 +++---
.../types/PageViewCollection.java | 44 +-
.../astoriadefaultservice/types/Person.java | 222 ++--
.../types/PersonCollection.java | 44 +-
.../types/PersonMetadata.java | 328 +++--
.../types/PersonMetadataCollection.java | 44 +-
.../astoriadefaultservice/types/Phone.java | 69 +-
.../astoriadefaultservice/types/Product.java | 642 +++++-----
.../types/ProductCollection.java | 44 +-
.../types/ProductDetail.java | 222 ++--
.../types/ProductDetailCollection.java | 44 +-
.../types/ProductPageView.java | 514 ++++----
.../types/ProductPageViewCollection.java | 44 +-
.../types/ProductPhoto.java | 244 ++--
.../types/ProductPhotoCollection.java | 44 +-
.../types/ProductPhotoKey.java | 76 +-
.../types/ProductReview.java | 328 +++--
.../types/ProductReviewCollection.java | 44 +-
.../types/ProductReviewKey.java | 92 +-
.../astoriadefaultservice/types/RSAToken.java | 222 ++--
.../types/RSATokenCollection.java | 44 +-
.../types/SpecialEmployee.java | 645 +++++-----
.../types/SpecialEmployeeCollection.java | 44 +-
.../types/package-info.java | 16 +-
.../olingo/fit/proxy/v4/AbstractTestITCase.java | 25 +-
.../olingo/fit/proxy/v4/AsyncTestITCase.java | 34 +-
.../proxy/v4/AuthEntityCreateTestITCase.java | 22 +-
.../proxy/v4/AuthEntityRetrieveTestITCase.java | 17 +-
.../v4/BoundOperationInvokeTestITCase.java | 28 +-
.../fit/proxy/v4/DerivedTypeTestITCase.java | 32 +-
.../fit/proxy/v4/EntityCreateTestITCase.java | 44 +-
.../fit/proxy/v4/EntityRetrieveTestITCase.java | 29 +-
.../fit/proxy/v4/EntitySetTestITCase.java | 14 +-
.../fit/proxy/v4/EntityUpdateTestITCase.java | 39 +-
.../olingo/fit/proxy/v4/FilterTestITCase.java | 28 +-
.../fit/proxy/v4/KeyAsSegmentTestITCase.java | 14 +-
.../fit/proxy/v4/MediaEntityTestITCase.java | 15 +-
...TransactionalAuthEntityCreateTestITCase.java | 22 +-
.../NonTransactionalEntityCreateTestITCase.java | 17 +-
.../NonTransactionalEntityUpdateTestITCase.java | 17 +-
.../NonTransactionalMediaEntityTestITCase.java | 14 +-
.../olingo/fit/proxy/v4/OpenTypeTestITCase.java | 27 +-
.../v4/OperationImportInvokeTestITCase.java | 22 +-
.../olingo/fit/proxy/v4/PropertyTestITCase.java | 14 +-
.../fit/proxy/v4/SingletonTestITCase.java | 14 +-
.../v4/UnauthorizedEntityCreateTestITCase.java | 19 +-
.../proxy/v4/demo/odatademo/Advertisements.java | 48 +-
.../fit/proxy/v4/demo/odatademo/Categories.java | 48 +-
.../proxy/v4/demo/odatademo/DemoService.java | 97 +-
.../proxy/v4/demo/odatademo/PersonDetails.java | 48 +-
.../fit/proxy/v4/demo/odatademo/Persons.java | 62 +-
.../proxy/v4/demo/odatademo/ProductDetails.java | 48 +-
.../fit/proxy/v4/demo/odatademo/Products.java | 52 +-
.../fit/proxy/v4/demo/odatademo/Suppliers.java | 48 +-
.../proxy/v4/demo/odatademo/package-info.java | 16 +-
.../proxy/v4/demo/odatademo/types/Address.java | 272 ++--
.../v4/demo/odatademo/types/Advertisement.java | 279 ++---
.../types/AdvertisementCollection.java | 43 +-
.../proxy/v4/demo/odatademo/types/Category.java | 220 ++--
.../odatademo/types/CategoryCollection.java | 43 +-
.../proxy/v4/demo/odatademo/types/Customer.java | 285 ++---
.../odatademo/types/CustomerCollection.java | 43 +-
.../proxy/v4/demo/odatademo/types/Employee.java | 391 +++---
.../odatademo/types/EmployeeCollection.java | 43 +-
.../demo/odatademo/types/FeaturedProduct.java | 615 +++++----
.../types/FeaturedProductCollection.java | 43 +-
.../proxy/v4/demo/odatademo/types/Person.java | 219 ++--
.../demo/odatademo/types/PersonCollection.java | 43 +-
.../v4/demo/odatademo/types/PersonDetail.java | 440 +++----
.../odatademo/types/PersonDetailCollection.java | 43 +-
.../proxy/v4/demo/odatademo/types/Product.java | 566 ++++-----
.../demo/odatademo/types/ProductCollection.java | 43 +-
.../v4/demo/odatademo/types/ProductDetail.java | 219 ++--
.../types/ProductDetailCollection.java | 43 +-
.../proxy/v4/demo/odatademo/types/Supplier.java | 387 +++---
.../odatademo/types/SupplierCollection.java | 43 +-
.../v4/demo/odatademo/types/package-info.java | 16 +-
.../opentypesservicev4/DefaultContainer.java | 72 +-
.../odata/services/opentypesservicev4/Row.java | 55 +-
.../services/opentypesservicev4/RowIndex.java | 49 +-
.../opentypesservicev4/package-info.java | 16 +-
.../opentypesservicev4/types/AccountInfo.java | 155 +--
.../opentypesservicev4/types/Color.java | 45 +-
.../types/ContactDetails.java | 552 ++++-----
.../opentypesservicev4/types/IndexedRow.java | 149 +--
.../types/IndexedRowCollection.java | 44 +-
.../services/opentypesservicev4/types/Row.java | 140 +--
.../opentypesservicev4/types/RowCollection.java | 44 +-
.../opentypesservicev4/types/RowIndex.java | 168 +--
.../types/RowIndexCollection.java | 44 +-
.../opentypesservicev4/types/package-info.java | 16 +-
.../services/odatawcfservice/Accounts.java | 49 +-
.../odata/services/odatawcfservice/Boss.java | 44 +-
.../odata/services/odatawcfservice/Company.java | 44 +-
.../services/odatawcfservice/Customers.java | 50 +-
.../odatawcfservice/DefaultStoredPI.java | 44 +-
.../services/odatawcfservice/Departments.java | 50 +-
.../services/odatawcfservice/Employees.java | 50 +-
.../odatawcfservice/InMemoryEntities.java | 294 ++---
.../services/odatawcfservice/LabourUnion.java | 44 +-
.../services/odatawcfservice/OrderDetails.java | 51 +-
.../odata/services/odatawcfservice/Orders.java | 49 +-
.../odata/services/odatawcfservice/People.java | 67 +-
.../odatawcfservice/ProductDetails.java | 51 +-
.../odatawcfservice/ProductReviews.java | 51 +-
.../services/odatawcfservice/Products.java | 49 +-
.../services/odatawcfservice/PublicCompany.java | 44 +-
.../services/odatawcfservice/StoredPIs.java | 50 +-
.../odatawcfservice/SubscriptionTemplates.java | 50 +-
.../services/odatawcfservice/VipCustomer.java | 44 +-
.../services/odatawcfservice/package-info.java | 16 +-
.../odatawcfservice/types/AccessLevel.java | 49 +-
.../services/odatawcfservice/types/Account.java | 488 ++++----
.../types/AccountCollection.java | 44 +-
.../odatawcfservice/types/AccountInfo.java | 155 +--
.../services/odatawcfservice/types/Address.java | 192 ++-
.../services/odatawcfservice/types/Asset.java | 245 ++--
.../odatawcfservice/types/AssetCollection.java | 44 +-
.../services/odatawcfservice/types/Club.java | 192 ++-
.../odatawcfservice/types/ClubCollection.java | 44 +-
.../services/odatawcfservice/types/Color.java | 45 +-
.../services/odatawcfservice/types/Company.java | 528 ++++----
.../odatawcfservice/types/CompanyAddress.java | 254 ++--
.../odatawcfservice/types/CompanyCategory.java | 47 +-
.../types/CompanyCollection.java | 44 +-
.../odatawcfservice/types/CreditCardPI.java | 658 +++++-----
.../types/CreditCardPICollection.java | 44 +-
.../odatawcfservice/types/CreditRecord.java | 298 ++---
.../types/CreditRecordCollection.java | 44 +-
.../odatawcfservice/types/Customer.java | 823 ++++++------
.../types/CustomerCollection.java | 44 +-
.../odatawcfservice/types/Department.java | 274 ++--
.../types/DepartmentCollection.java | 44 +-
.../odatawcfservice/types/Employee.java | 739 +++++------
.../types/EmployeeCollection.java | 44 +-
.../odatawcfservice/types/GiftCard.java | 377 +++---
.../types/GiftCardCollection.java | 44 +-
.../odatawcfservice/types/HomeAddress.java | 254 ++--
.../services/odatawcfservice/types/IsBoss.java | 25 +-
.../odatawcfservice/types/LabourUnion.java | 192 ++-
.../types/LabourUnionCollection.java | 44 +-
.../services/odatawcfservice/types/Order.java | 390 +++---
.../odatawcfservice/types/OrderCollection.java | 44 +-
.../odatawcfservice/types/OrderDetail.java | 411 +++---
.../types/OrderDetailCollection.java | 44 +-
.../odatawcfservice/types/OrderDetailKey.java | 76 +-
.../types/PaymentInstrument.java | 359 +++---
.../types/PaymentInstrumentCollection.java | 44 +-
.../services/odatawcfservice/types/Person.java | 594 +++++----
.../odatawcfservice/types/PersonCollection.java | 44 +-
.../services/odatawcfservice/types/Product.java | 644 +++++-----
.../types/ProductCollection.java | 61 +-
.../odatawcfservice/types/ProductDetail.java | 384 +++---
.../types/ProductDetailCollection.java | 44 +-
.../odatawcfservice/types/ProductDetailKey.java | 76 +-
.../odatawcfservice/types/ProductReview.java | 405 +++---
.../types/ProductReviewCollection.java | 44 +-
.../odatawcfservice/types/ProductReviewKey.java | 108 +-
.../odatawcfservice/types/PublicCompany.java | 700 ++++++-----
.../types/PublicCompanyCollection.java | 44 +-
.../odatawcfservice/types/Statement.java | 298 ++---
.../types/StatementCollection.java | 44 +-
.../odatawcfservice/types/StoredPI.java | 298 ++---
.../types/StoredPICollection.java | 44 +-
.../odatawcfservice/types/Subscription.java | 351 +++---
.../types/SubscriptionCollection.java | 44 +-
.../odatawcfservice/types/package-info.java | 16 +-
.../olingo/fit/v3/AbstractTestITCase.java | 128 +-
.../fit/v3/ActionOverloadingTestITCase.java | 57 +-
.../apache/olingo/fit/v3/AsyncTestITCase.java | 33 +-
.../fit/v3/AuthEntityRetrieveTestITCase.java | 14 +-
.../apache/olingo/fit/v3/BatchTestITCase.java | 115 +-
.../apache/olingo/fit/v3/CountTestITCase.java | 18 +-
.../olingo/fit/v3/EntityCreateTestITCase.java | 120 +-
.../olingo/fit/v3/EntityRetrieveTestITCase.java | 30 +-
.../olingo/fit/v3/EntitySetTestITCase.java | 18 +-
.../olingo/fit/v3/EntityUpdateTestITCase.java | 60 +-
.../apache/olingo/fit/v3/ErrorTestITCase.java | 18 +-
.../olingo/fit/v3/FilterFactoryTestITCase.java | 70 +-
.../apache/olingo/fit/v3/FilterTestITCase.java | 18 +-
.../apache/olingo/fit/v3/InvokeTestITCase.java | 73 +-
.../olingo/fit/v3/KeyAsSegmentTestITCase.java | 20 +-
.../apache/olingo/fit/v3/LinkTestITCase.java | 37 +-
.../olingo/fit/v3/MediaEntityTestITCase.java | 30 +-
.../olingo/fit/v3/MetadataTestITCase.java | 19 +-
.../olingo/fit/v3/OpenTypeTestITCase.java | 96 +-
.../olingo/fit/v3/PrimitiveKeysTestITCase.java | 16 +-
.../fit/v3/PropertyRetrieveTestITCase.java | 124 +-
.../olingo/fit/v3/PropertyTestITCase.java | 68 +-
.../olingo/fit/v3/PropertyValueTestITCase.java | 44 +-
.../olingo/fit/v3/QueryOptionsTestITCase.java | 32 +-
.../fit/v3/ServiceDocumentTestITCase.java | 19 +-
.../v3/XHTTPMethodEntityUpdateTestITCase.java | 14 +-
.../v3/XHTTPMethodPropertyUpdateTestITCase.java | 14 +-
.../olingo/fit/v4/AbstractTestITCase.java | 38 +-
.../apache/olingo/fit/v4/AsyncTestITCase.java | 44 +-
.../olingo/fit/v4/AuthBatchTestITCase.java | 16 +-
.../apache/olingo/fit/v4/BatchTestITCase.java | 112 +-
.../fit/v4/BoundOperationInvokeTestITCase.java | 232 ++--
.../olingo/fit/v4/ConformanceTestITCase.java | 106 +-
.../apache/olingo/fit/v4/DeltaTestITCase.java | 18 +-
.../olingo/fit/v4/DerivedTypeTestITCase.java | 66 +-
.../olingo/fit/v4/EntityCreateTestITCase.java | 76 +-
.../olingo/fit/v4/EntityRetrieveTestITCase.java | 60 +-
.../olingo/fit/v4/EntitySetTestITCase.java | 22 +-
.../olingo/fit/v4/EntityUpdateTestITCase.java | 50 +-
.../olingo/fit/v4/ErrorResponseTestITCase.java | 22 +-
.../olingo/fit/v4/FilterFactoryTestITCase.java | 20 +-
.../fit/v4/JSONFormatConformanceTestITCase.java | 164 +--
.../olingo/fit/v4/KeyAsSegmentTestITCase.java | 24 +-
.../olingo/fit/v4/MediaEntityTestITCase.java | 40 +-
.../olingo/fit/v4/MetadataTestITCase.java | 34 +-
.../olingo/fit/v4/OpenTypeTestITCase.java | 98 +-
.../fit/v4/OperationImportInvokeTestITCase.java | 128 +-
.../olingo/fit/v4/PropertyTestITCase.java | 55 +-
.../olingo/fit/v4/PropertyValueTestITCase.java | 38 +-
.../olingo/fit/v4/QueryOptionsTestITCase.java | 54 +-
.../fit/v4/ServiceDocumentTestITCase.java | 23 +-
.../olingo/fit/v4/SingletonTestITCase.java | 36 +-
.../apache/olingo/commons/api/Constants.java | 14 +-
.../commons/api/ODataApplicationException.java | 16 +-
.../olingo/commons/api/ODataException.java | 16 +-
.../api/ODataNotImplementedException.java | 16 +-
.../commons/api/ODataRuntimeException.java | 6 +-
.../olingo/commons/api/data/Annotatable.java | 14 +-
.../olingo/commons/api/data/Annotation.java | 14 +-
.../olingo/commons/api/data/ContextURL.java | 25 +-
.../olingo/commons/api/data/DeletedEntity.java | 14 +-
.../apache/olingo/commons/api/data/Delta.java | 14 +-
.../olingo/commons/api/data/DeltaLink.java | 14 +-
.../apache/olingo/commons/api/data/Entity.java | 61 +-
.../olingo/commons/api/data/EntitySet.java | 32 +-
.../olingo/commons/api/data/GeoUtils.java | 70 +-
.../apache/olingo/commons/api/data/Link.java | 42 +-
.../apache/olingo/commons/api/data/Linked.java | 22 +-
.../commons/api/data/LinkedComplexValue.java | 14 +-
.../olingo/commons/api/data/Property.java | 14 +-
.../apache/olingo/commons/api/data/ResWrap.java | 22 +-
.../olingo/commons/api/data/Valuable.java | 27 +-
.../olingo/commons/api/data/ValueType.java | 16 +-
.../commons/api/data/v3/LinkCollection.java | 22 +-
.../api/domain/AbstractODataPayload.java | 16 +-
.../commons/api/domain/AbstractODataValue.java | 26 +-
.../commons/api/domain/CommonODataEntity.java | 53 +-
.../api/domain/CommonODataEntitySet.java | 22 +-
.../api/domain/CommonODataObjectFactory.java | 37 +-
.../commons/api/domain/CommonODataProperty.java | 28 +-
.../api/domain/ODataCollectionValue.java | 24 +-
.../commons/api/domain/ODataComplexValue.java | 24 +-
.../olingo/commons/api/domain/ODataError.java | 24 +-
.../commons/api/domain/ODataErrorDetail.java | 20 +-
.../commons/api/domain/ODataInlineEntity.java | 25 +-
.../api/domain/ODataInlineEntitySet.java | 25 +-
.../commons/api/domain/ODataInvokeResult.java | 19 +-
.../olingo/commons/api/domain/ODataItem.java | 19 +-
.../olingo/commons/api/domain/ODataLink.java | 60 +-
.../commons/api/domain/ODataLinkType.java | 20 +-
.../olingo/commons/api/domain/ODataLinked.java | 26 +-
.../commons/api/domain/ODataOperation.java | 26 +-
.../commons/api/domain/ODataPrimitiveValue.java | 21 +-
.../commons/api/domain/ODataPropertyType.java | 14 +-
.../api/domain/ODataServiceDocument.java | 38 +-
.../olingo/commons/api/domain/ODataValue.java | 28 +-
.../commons/api/domain/v3/ODataEntity.java | 15 +-
.../commons/api/domain/v3/ODataEntitySet.java | 15 +-
.../api/domain/v3/ODataObjectFactory.java | 17 +-
.../commons/api/domain/v3/ODataProperty.java | 18 +-
.../commons/api/domain/v4/ODataAnnotatable.java | 14 +-
.../commons/api/domain/v4/ODataAnnotation.java | 16 +-
.../api/domain/v4/ODataDeletedEntity.java | 14 +-
.../commons/api/domain/v4/ODataDelta.java | 14 +-
.../commons/api/domain/v4/ODataDeltaLink.java | 14 +-
.../commons/api/domain/v4/ODataEntity.java | 17 +-
.../commons/api/domain/v4/ODataEntitySet.java | 19 +-
.../commons/api/domain/v4/ODataEnumValue.java | 14 +-
.../olingo/commons/api/domain/v4/ODataLink.java | 15 +-
.../api/domain/v4/ODataLinkedComplexValue.java | 16 +-
.../api/domain/v4/ODataObjectFactory.java | 17 +-
.../commons/api/domain/v4/ODataProperty.java | 17 +-
.../commons/api/domain/v4/ODataSingleton.java | 17 +-
.../commons/api/domain/v4/ODataValuable.java | 36 +-
.../commons/api/domain/v4/ODataValue.java | 22 +-
.../org/apache/olingo/commons/api/edm/Edm.java | 54 +-
.../olingo/commons/api/edm/EdmAction.java | 16 +-
.../olingo/commons/api/edm/EdmActionImport.java | 18 +-
.../commons/api/edm/EdmActionImportInfo.java | 18 +-
.../olingo/commons/api/edm/EdmAnnotatable.java | 16 +-
.../olingo/commons/api/edm/EdmAnnotation.java | 14 +-
.../olingo/commons/api/edm/EdmAnnotations.java | 16 +-
.../commons/api/edm/EdmAnnotationsTarget.java | 18 +-
.../commons/api/edm/EdmBindingTarget.java | 22 +-
.../olingo/commons/api/edm/EdmComplexType.java | 16 +-
.../olingo/commons/api/edm/EdmElement.java | 16 +-
.../commons/api/edm/EdmEntityContainer.java | 20 +-
.../olingo/commons/api/edm/EdmEntitySet.java | 16 +-
.../commons/api/edm/EdmEntitySetInfo.java | 18 +-
.../olingo/commons/api/edm/EdmEntityType.java | 26 +-
.../olingo/commons/api/edm/EdmEnumType.java | 16 +-
.../olingo/commons/api/edm/EdmException.java | 16 +-
.../olingo/commons/api/edm/EdmFunction.java | 16 +-
.../commons/api/edm/EdmFunctionImport.java | 20 +-
.../commons/api/edm/EdmFunctionImportInfo.java | 18 +-
.../commons/api/edm/EdmKeyPropertyRef.java | 16 +-
.../olingo/commons/api/edm/EdmMappable.java | 18 +-
.../olingo/commons/api/edm/EdmMapping.java | 24 +-
.../olingo/commons/api/edm/EdmMember.java | 16 +-
.../apache/olingo/commons/api/edm/EdmNamed.java | 16 +-
.../api/edm/EdmNavigationPropertyBinding.java | 8 +-
.../olingo/commons/api/edm/EdmOperation.java | 24 +-
.../commons/api/edm/EdmOperationImport.java | 16 +-
.../commons/api/edm/EdmOperationImportInfo.java | 16 +-
.../olingo/commons/api/edm/EdmParameter.java | 16 +-
.../commons/api/edm/EdmPrimitiveType.java | 40 +-
.../api/edm/EdmPrimitiveTypeException.java | 16 +-
.../commons/api/edm/EdmPrimitiveTypeKind.java | 39 +-
.../olingo/commons/api/edm/EdmProperty.java | 20 +-
.../olingo/commons/api/edm/EdmReturnType.java | 16 +-
.../olingo/commons/api/edm/EdmSchema.java | 20 +-
.../commons/api/edm/EdmServiceMetadata.java | 17 +-
.../olingo/commons/api/edm/EdmSingleton.java | 16 +-
.../commons/api/edm/EdmSingletonInfo.java | 18 +-
.../commons/api/edm/EdmStructuredType.java | 36 +-
.../apache/olingo/commons/api/edm/EdmTerm.java | 19 +-
.../apache/olingo/commons/api/edm/EdmType.java | 18 +-
.../commons/api/edm/EdmTypeDefinition.java | 16 +-
.../apache/olingo/commons/api/edm/EdmTyped.java | 18 +-
.../commons/api/edm/FullQualifiedName.java | 10 +-
.../apache/olingo/commons/api/edm/Target.java | 4 +-
.../commons/api/edm/annotation/EdmAnd.java | 14 +-
.../edm/annotation/EdmAnnotationExpression.java | 14 +-
.../api/edm/annotation/EdmAnnotationPath.java | 14 +-
.../commons/api/edm/annotation/EdmApply.java | 17 +-
.../commons/api/edm/annotation/EdmCast.java | 14 +-
.../api/edm/annotation/EdmCollection.java | 14 +-
.../EdmConstantAnnotationExpression.java | 14 +-
.../EdmDynamicAnnotationExpression.java | 14 +-
.../commons/api/edm/annotation/EdmEq.java | 14 +-
.../commons/api/edm/annotation/EdmGe.java | 14 +-
.../commons/api/edm/annotation/EdmGt.java | 14 +-
.../commons/api/edm/annotation/EdmIf.java | 14 +-
.../commons/api/edm/annotation/EdmIsOf.java | 14 +-
.../api/edm/annotation/EdmLabeledElement.java | 14 +-
.../annotation/EdmLabeledElementReference.java | 14 +-
.../commons/api/edm/annotation/EdmLe.java | 14 +-
.../commons/api/edm/annotation/EdmLt.java | 14 +-
.../annotation/EdmNavigationPropertyPath.java | 14 +-
.../commons/api/edm/annotation/EdmNe.java | 14 +-
.../commons/api/edm/annotation/EdmNot.java | 14 +-
.../commons/api/edm/annotation/EdmNull.java | 14 +-
.../commons/api/edm/annotation/EdmOr.java | 14 +-
.../commons/api/edm/annotation/EdmPath.java | 14 +-
.../api/edm/annotation/EdmPropertyPath.java | 14 +-
.../api/edm/annotation/EdmPropertyValue.java | 14 +-
.../commons/api/edm/annotation/EdmRecord.java | 15 +-
...mTwoParamsOpDynamicAnnotationExpression.java | 14 +-
.../commons/api/edm/annotation/EdmUrlRef.java | 14 +-
.../api/edm/constants/EdmContentKind.java | 14 +-
.../commons/api/edm/constants/EdmOnDelete.java | 16 +-
.../commons/api/edm/constants/EdmTypeKind.java | 16 +-
.../api/edm/constants/ODataServiceVersion.java | 35 +-
.../commons/api/edm/geo/ComposedGeospatial.java | 18 +-
.../olingo/commons/api/edm/geo/Geospatial.java | 26 +-
.../api/edm/geo/GeospatialCollection.java | 19 +-
.../olingo/commons/api/edm/geo/LineString.java | 19 +-
.../commons/api/edm/geo/MultiLineString.java | 19 +-
.../olingo/commons/api/edm/geo/MultiPoint.java | 19 +-
.../commons/api/edm/geo/MultiPolygon.java | 19 +-
.../olingo/commons/api/edm/geo/Point.java | 24 +-
.../olingo/commons/api/edm/geo/Polygon.java | 29 +-
.../apache/olingo/commons/api/edm/geo/SRID.java | 24 +-
.../olingo/commons/api/edm/package-info.java | 17 +-
.../olingo/commons/api/format/AcceptType.java | 30 +-
.../olingo/commons/api/format/ContentType.java | 53 +-
.../olingo/commons/api/format/ODataFormat.java | 46 +-
.../olingo/commons/api/http/HttpHeader.java | 2 +-
.../olingo/commons/api/http/HttpMethod.java | 14 +-
.../api/serialization/ODataDeserializer.java | 22 +-
.../ODataDeserializerException.java | 14 +-
.../api/serialization/ODataSerializer.java | 14 +-
.../serialization/ODataSerializerException.java | 14 +-
.../olingo/commons/api/data/ContextURLTest.java | 37 +-
.../commons/api/format/AcceptTypeTest.java | 6 +-
.../core/data/AbstractAnnotatedObject.java | 14 +-
.../commons/core/data/AbstractODataObject.java | 18 +-
.../commons/core/data/AbstractValuable.java | 16 +-
.../commons/core/data/AnnotationImpl.java | 14 +-
.../commons/core/data/DeletedEntityImpl.java | 15 +-
.../olingo/commons/core/data/DeltaLinkImpl.java | 15 +-
.../olingo/commons/core/data/EntityImpl.java | 25 +-
.../olingo/commons/core/data/EntitySetImpl.java | 15 +-
.../olingo/commons/core/data/LinkImpl.java | 14 +-
.../core/data/LinkedComplexValueImpl.java | 14 +-
.../commons/core/data/ODataErrorDetailImpl.java | 14 +-
.../commons/core/data/ODataErrorImpl.java | 16 +-
.../olingo/commons/core/data/PropertyImpl.java | 23 +-
.../core/data/v3/LinkCollectionImpl.java | 21 +-
.../olingo/commons/core/data/v4/DeltaImpl.java | 15 +-
.../domain/AbstractODataCollectionValue.java | 31 +-
.../core/domain/AbstractODataComplexValue.java | 31 +-
.../core/domain/AbstractODataEntity.java | 49 +-
.../core/domain/AbstractODataEntitySet.java | 17 +-
.../core/domain/AbstractODataObjectFactory.java | 20 +-
.../domain/AbstractODataPrimitiveValue.java | 22 +-
.../core/domain/AbstractODataProperty.java | 42 +-
.../domain/v3/ODataCollectionValueImpl.java | 14 +-
.../core/domain/v3/ODataComplexValueImpl.java | 14 +-
.../commons/core/domain/v3/ODataEntityImpl.java | 15 +-
.../core/domain/v3/ODataEntitySetImpl.java | 18 +-
.../core/domain/v3/ODataObjectFactoryImpl.java | 29 +-
.../core/domain/v3/ODataPrimitiveValueImpl.java | 16 +-
.../core/domain/v3/ODataPropertyImpl.java | 18 +-
.../core/domain/v4/ODataAnnotationImpl.java | 22 +-
.../domain/v4/ODataCollectionValueImpl.java | 17 +-
.../core/domain/v4/ODataComplexValueImpl.java | 37 +-
.../core/domain/v4/ODataDeletedEntityImpl.java | 15 +-
.../commons/core/domain/v4/ODataDeltaImpl.java | 17 +-
.../core/domain/v4/ODataDeltaLinkImpl.java | 15 +-
.../commons/core/domain/v4/ODataEntityImpl.java | 15 +-
.../core/domain/v4/ODataEntitySetImpl.java | 15 +-
.../core/domain/v4/ODataEnumValueImpl.java | 16 +-
.../core/domain/v4/ODataObjectFactoryImpl.java | 33 +-
.../core/domain/v4/ODataPrimitiveValueImpl.java | 18 +-
.../core/domain/v4/ODataPropertyImpl.java | 25 +-
.../core/domain/v4/ODataValuableImpl.java | 40 +-
.../olingo/commons/core/edm/AbstractEdm.java | 42 +-
.../core/edm/AbstractEdmBindingTarget.java | 23 +-
.../core/edm/AbstractEdmComplexType.java | 8 +-
.../core/edm/AbstractEdmEntityContainer.java | 2 +-
.../commons/core/edm/AbstractEdmEntityType.java | 23 +-
.../commons/core/edm/AbstractEdmEnumType.java | 40 +-
.../core/edm/AbstractEdmKeyPropertyRef.java | 22 +-
.../commons/core/edm/AbstractEdmMember.java | 16 +-
.../core/edm/AbstractEdmNavigationProperty.java | 2 +-
.../commons/core/edm/AbstractEdmOperation.java | 22 +-
.../core/edm/AbstractEdmOperationImport.java | 24 +-
.../commons/core/edm/AbstractEdmParameter.java | 16 +-
.../commons/core/edm/AbstractEdmProperty.java | 14 +-
.../commons/core/edm/AbstractEdmReturnType.java | 16 +-
.../commons/core/edm/AbstractEdmSchema.java | 24 +-
.../core/edm/AbstractEdmStructuredType.java | 10 +-
.../core/edm/AbstractEdmTypeDefinition.java | 30 +-
.../olingo/commons/core/edm/ActionMapKey.java | 24 +-
.../core/edm/EdmActionImportInfoImpl.java | 16 +-
.../commons/core/edm/EdmAnnotationHelper.java | 17 +-
.../olingo/commons/core/edm/EdmElementImpl.java | 16 +-
.../commons/core/edm/EdmEntitySetInfoImpl.java | 16 +-
.../core/edm/EdmFunctionImportInfoImpl.java | 16 +-
.../olingo/commons/core/edm/EdmNamedImpl.java | 14 +-
.../edm/EdmNavigationPropertyBindingImpl.java | 4 +-
.../core/edm/EdmOperationImportInfoImpl.java | 16 +-
.../commons/core/edm/EdmSingletonInfoImpl.java | 16 +-
.../core/edm/EdmStructuredTypeHelper.java | 14 +-
.../olingo/commons/core/edm/EdmTypeInfo.java | 73 +-
.../olingo/commons/core/edm/FunctionMapKey.java | 34 +-
...mAnnotatableDynamicAnnotationExpression.java | 17 +-
.../AbstractEdmAnnotationEspression.java | 14 +-
.../AbstractEdmDynamicAnnotationExpression.java | 16 +-
.../AbstractEdmElementOrAttributeNotation.java | 14 +-
...mTwoParamsOpDynamicAnnotationExpression.java | 18 +-
.../commons/core/edm/annotation/EdmAndImpl.java | 14 +-
.../edm/annotation/EdmAnnotationPathImpl.java | 14 +-
.../core/edm/annotation/EdmApplyImpl.java | 15 +-
.../core/edm/annotation/EdmCollectionImpl.java | 15 +-
.../commons/core/edm/annotation/EdmEqImpl.java | 14 +-
.../commons/core/edm/annotation/EdmGeImpl.java | 14 +-
.../commons/core/edm/annotation/EdmGtImpl.java | 14 +-
.../commons/core/edm/annotation/EdmIfImpl.java | 16 +-
.../edm/annotation/EdmLabeledElementImpl.java | 16 +-
.../EdmLabeledElementReferenceImpl.java | 16 +-
.../commons/core/edm/annotation/EdmLeImpl.java | 14 +-
.../commons/core/edm/annotation/EdmLtImpl.java | 14 +-
.../EdmNavigationPropertyPathImpl.java | 16 +-
.../commons/core/edm/annotation/EdmNeImpl.java | 14 +-
.../commons/core/edm/annotation/EdmNotImpl.java | 14 +-
.../core/edm/annotation/EdmNullImpl.java | 14 +-
.../commons/core/edm/annotation/EdmOrImpl.java | 14 +-
.../core/edm/annotation/EdmPathImpl.java | 14 +-
.../edm/annotation/EdmPropertyPathImpl.java | 14 +-
.../edm/annotation/EdmPropertyValueImpl.java | 16 +-
.../core/edm/annotation/EdmUrlRefImpl.java | 14 +-
.../primitivetype/AbstractGeospatialType.java | 345 +++---
.../primitivetype/AbstractPrimitiveType.java | 44 +-
.../core/edm/primitivetype/EdmBinary.java | 42 +-
.../core/edm/primitivetype/EdmBoolean.java | 34 +-
.../commons/core/edm/primitivetype/EdmByte.java | 40 +-
.../commons/core/edm/primitivetype/EdmDate.java | 34 +-
.../core/edm/primitivetype/EdmDateTime.java | 34 +-
.../edm/primitivetype/EdmDateTimeOffset.java | 76 +-
.../core/edm/primitivetype/EdmDecimal.java | 74 +-
.../core/edm/primitivetype/EdmDouble.java | 54 +-
.../core/edm/primitivetype/EdmDuration.java | 52 +-
.../core/edm/primitivetype/EdmGeography.java | 24 +-
.../primitivetype/EdmGeographyCollection.java | 26 +-
.../primitivetype/EdmGeographyLineString.java | 24 +-
.../EdmGeographyMultiLineString.java | 26 +-
.../primitivetype/EdmGeographyMultiPoint.java | 24 +-
.../primitivetype/EdmGeographyMultiPolygon.java | 24 +-
.../edm/primitivetype/EdmGeographyPoint.java | 24 +-
.../edm/primitivetype/EdmGeographyPolygon.java | 24 +-
.../core/edm/primitivetype/EdmGeometry.java | 24 +-
.../primitivetype/EdmGeometryCollection.java | 26 +-
.../primitivetype/EdmGeometryLineString.java | 24 +-
.../EdmGeometryMultiLineString.java | 26 +-
.../primitivetype/EdmGeometryMultiPoint.java | 24 +-
.../primitivetype/EdmGeometryMultiPolygon.java | 26 +-
.../edm/primitivetype/EdmGeometryPoint.java | 24 +-
.../edm/primitivetype/EdmGeometryPolygon.java | 24 +-
.../commons/core/edm/primitivetype/EdmGuid.java | 36 +-
.../core/edm/primitivetype/EdmInt16.java | 42 +-
.../core/edm/primitivetype/EdmInt32.java | 42 +-
.../core/edm/primitivetype/EdmInt64.java | 48 +-
.../primitivetype/EdmPrimitiveTypeFactory.java | 160 +--
.../core/edm/primitivetype/EdmSByte.java | 36 +-
.../core/edm/primitivetype/EdmSingle.java | 48 +-
.../core/edm/primitivetype/EdmStream.java | 31 +-
.../core/edm/primitivetype/EdmString.java | 30 +-
.../commons/core/edm/primitivetype/EdmTime.java | 16 +-
.../core/edm/primitivetype/EdmTimeOfDay.java | 34 +-
.../primitivetype/SingletonPrimitiveType.java | 16 +-
.../commons/core/edm/primitivetype/Uint7.java | 28 +-
.../core/serialization/AbstractAtomDealer.java | 105 +-
.../core/serialization/AtomDeserializer.java | 34 +-
.../serialization/AtomGeoValueDeserializer.java | 114 +-
.../serialization/AtomGeoValueSerializer.java | 164 +--
.../core/serialization/AtomSerializer.java | 32 +-
.../serialization/JsonDeltaDeserializer.java | 21 +-
.../core/serialization/JsonDeserializer.java | 26 +-
.../serialization/JsonEntityDeserializer.java | 14 +-
.../serialization/JsonEntitySerializer.java | 14 +-
.../JsonEntitySetDeserializer.java | 18 +-
.../serialization/JsonEntitySetSerializer.java | 14 +-
.../serialization/JsonGeoValueDeserializer.java | 122 +-
.../serialization/JsonGeoValueSerializer.java | 140 +--
.../JsonLinkCollectionDeserializer.java | 16 +-
.../JsonODataErrorDeserializer.java | 18 +-
.../JsonODataErrorDetailDeserializer.java | 14 +-
.../serialization/JsonPropertyDeserializer.java | 16 +-
.../serialization/JsonPropertySerializer.java | 26 +-
.../core/serialization/JsonSerializer.java | 22 +-
.../apache/olingo/commons/core/EncoderTest.java | 2 +-
.../commons/core/edm/ActionMapKeyTest.java | 19 +-
.../commons/core/edm/EdmImplCachingTest.java | 24 +-
.../commons/core/edm/EdmImplCallCreateTest.java | 24 +-
.../commons/core/edm/FunctionMapKeyTest.java | 17 +-
.../primitivetype/CommonPrimitiveTypeTest.java | 40 +-
.../core/edm/primitivetype/EdmBinaryTest.java | 42 +-
.../core/edm/primitivetype/EdmBooleanTest.java | 16 +-
.../core/edm/primitivetype/EdmByteTest.java | 16 +-
.../core/edm/primitivetype/EdmDateTest.java | 16 +-
.../primitivetype/EdmDateTimeOffsetTest.java | 26 +-
.../core/edm/primitivetype/EdmDecimalTest.java | 16 +-
.../core/edm/primitivetype/EdmDoubleTest.java | 16 +-
.../core/edm/primitivetype/EdmDurationTest.java | 16 +-
.../core/edm/primitivetype/EdmGeoTest.java | 49 +-
.../core/edm/primitivetype/EdmGuidTest.java | 16 +-
.../core/edm/primitivetype/EdmInt16Test.java | 16 +-
.../core/edm/primitivetype/EdmInt32Test.java | 16 +-
.../core/edm/primitivetype/EdmInt64Test.java | 16 +-
.../core/edm/primitivetype/EdmNullTest.java | 16 +-
.../core/edm/primitivetype/EdmSByteTest.java | 16 +-
.../core/edm/primitivetype/EdmSingleTest.java | 28 +-
.../core/edm/primitivetype/EdmStringTest.java | 16 +-
.../edm/primitivetype/EdmTimeOfDayTest.java | 18 +-
.../primitivetype/PrimitiveTypeBaseTest.java | 54 +-
.../core/edm/primitivetype/UInt7Test.java | 20 +-
lib/server-api/pom.xml | 1 -
.../apache/olingo/server/api/ODataRequest.java | 14 +-
.../server/api/processor/DefaultProcessor.java | 8 +-
.../api/processor/FormatContentTypeMapping.java | 6 +-
.../olingo/server/core/ContentNegotiator.java | 21 +-
.../server/core/DefaultRedirectProcessor.java | 8 +-
.../apache/olingo/server/core/ODataHandler.java | 24 +-
.../server/core/ODataHttpHandlerImpl.java | 12 +-
.../apache/olingo/server/core/ODataImpl.java | 2 +-
.../core/serializer/ODataXmlSerializerImpl.java | 5 +-
.../serializer/json/ODataJsonSerializer.java | 11 +-
.../json/ServiceDocumentJsonSerializer.java | 2 +-
.../server/core/ContentNegotiatorTest.java | 27 +-
.../server/core/ODataHttpHandlerImplTest.java | 2 -
.../server/core/edm/provider/EdmEnumTest.java | 2 +-
.../core/edm/provider/EdmMemberImplTest.java | 6 +-
.../json/ODataJsonSerializerTest.java | 16 +-
.../olingo/server/tecsvc/TechnicalServlet.java | 15 +-
.../server/tecsvc/data/model/EtAllPrim.java | 36 +-
.../server/tecsvc/data/model/EtTwoPrim.java | 8 +-
.../tecsvc/processor/SampleJsonProcessor.java | 136 +-
.../tecsvc/processor/TechnicalProcessor.java | 21 +-
.../tecsvc/provider/ContainerProvider.java | 4 +-
.../src/main/webapp/META-INF/MANIFEST.MF | 8 +-
.../olingo/server/core/ODataHandlerTest.java | 18 +-
.../core/uri/testutil/ResourceValidator.java | 2 +-
.../core/uri/validator/UriValidatorTest.java | 7 +-
893 files changed, 33987 insertions(+), 41887 deletions(-)
----------------------------------------------------------------------
[21/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java
index 218c569..53a9532 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java
@@ -1,200 +1,166 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "PersonMetadata",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface PersonMetadata
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonMetadataId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPersonMetadataId();
-
- void setPersonMetadataId(java.lang.Integer _personMetadataId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPersonId();
-
- void setPersonId(java.lang.Integer _personId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PropertyName",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getPropertyName();
-
- void setPropertyName(java.lang.String _propertyName);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PropertyValue",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getPropertyValue();
-
- void setPropertyValue(java.lang.String _propertyValue);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Person",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Person",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person getPerson();
-
- void setPerson(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person _person);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonMetadataId",
- type = "Edm.Int32")
- Annotatable getPersonMetadataIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
- type = "Edm.Int32")
- Annotatable getPersonIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PropertyName",
- type = "Edm.String")
- Annotatable getPropertyNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PropertyValue",
- type = "Edm.String")
- Annotatable getPropertyValueAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Person",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person")
- Annotatable getPersonAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface PersonMetadata
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonMetadataId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPersonMetadataId();
+
+ void setPersonMetadataId(java.lang.Integer _personMetadataId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPersonId();
+
+ void setPersonId(java.lang.Integer _personId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PropertyName",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getPropertyName();
+
+ void setPropertyName(java.lang.String _propertyName);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PropertyValue",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getPropertyValue();
+
+ void setPropertyValue(java.lang.String _propertyValue);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Person",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Person",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person
+ getPerson();
+
+ void
+ setPerson(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person _person);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonMetadataId",
+ type = "Edm.Int32")
+ Annotatable getPersonMetadataIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
+ type = "Edm.Int32")
+ Annotatable getPersonIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PropertyName",
+ type = "Edm.String")
+ Annotatable getPropertyNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PropertyValue",
+ type = "Edm.String")
+ Annotatable getPropertyValueAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Person",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person")
+ Annotatable getPersonAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java
index c73a84d..8882472 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface PersonMetadataCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata> {
+public interface PersonMetadataCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
index 6902a88..c57d398 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
@@ -1,75 +1,40 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Phone")
-public interface Phone
+public interface Phone
extends java.io.Serializable {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PhoneNumber", type = "Edm.String", nullable = true)
+ java.lang.String getPhoneNumber();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PhoneNumber", type = "Edm.String", nullable = true)
- java.lang.String getPhoneNumber();
-
- void setPhoneNumber(java.lang.String _phoneNumber);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Extension", type = "Edm.String", nullable = true)
- java.lang.String getExtension();
+ void setPhoneNumber(java.lang.String _phoneNumber);
- void setExtension(java.lang.String _extension);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Extension", type = "Edm.String", nullable = true)
+ java.lang.String getExtension();
-
+ void setExtension(java.lang.String _extension);
- ComplexFactory factory();
+ ComplexFactory factory();
- interface ComplexFactory {
- }
+ interface ComplexFactory {}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
index d73fdaf..f224d9a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
@@ -1,346 +1,336 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.ext.proxy.api.annotations.Key;
+import org.apache.olingo.ext.proxy.api.annotations.Parameter;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Product",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Product
- extends Annotatable,java.io.Serializable {
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Picture",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.io.InputStream getPicture();
-
- void setPicture(java.io.InputStream _picture);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductId();
-
- void setProductId(java.lang.Integer _productId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getDescription();
-
- void setDescription(java.lang.String _description);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions getDimensions();
-
- void setDimensions(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BaseConcurrency",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getBaseConcurrency();
-
- void setBaseConcurrency(java.lang.String _baseConcurrency);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getComplexConcurrency();
-
- void setComplexConcurrency(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _complexConcurrency);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "NestedComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo getNestedComplexConcurrency();
-
- void setNestedComplexConcurrency(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _nestedComplexConcurrency);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "RelatedProducts",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Product",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection getRelatedProducts();
-
- void setRelatedProducts(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection _relatedProducts);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Detail",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "ProductDetail",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail getDetail();
-
- void setDetail(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail _detail);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Reviews",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "ProductReview",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection getReviews();
-
- void setReviews(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection _reviews);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Photos",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "ProductPhoto",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection getPhotos();
-
- void setPhotos(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection _photos);
-
-
- Operations operations();
-
- interface Operations {
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ChangeProductDimensions",
- type = OperationType.ACTION)
- void changeProductDimensions(
- @Parameter(name = "dimensions", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions", nullable = true) org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions dimensions
- );
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newComplexConcurrency();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "NestedComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newNestedComplexConcurrency();
-
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Picture",
- type = "Edm.Stream")
- Annotatable getPictureAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
- type = "Edm.Int32")
- Annotatable getProductIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
- type = "Edm.String")
- Annotatable getDescriptionAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
- Annotatable getDimensionsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BaseConcurrency",
- type = "Edm.String")
- Annotatable getBaseConcurrencyAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
- Annotatable getComplexConcurrencyAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "NestedComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
- Annotatable getNestedComplexConcurrencyAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "RelatedProducts",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
- Annotatable getRelatedProductsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Detail",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail")
- Annotatable getDetailAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Reviews",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview")
- Annotatable getReviewsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Photos",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto")
- Annotatable getPhotosAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Product
+ extends Annotatable, java.io.Serializable {
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Picture",
+ type = "Edm.Stream",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.io.InputStream getPicture();
+
+ void setPicture(java.io.InputStream _picture);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductId();
+
+ void setProductId(java.lang.Integer _productId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getDescription();
+
+ void setDescription(java.lang.String _description);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions
+ getDimensions();
+
+ void
+ setDimensions(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BaseConcurrency",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getBaseConcurrency();
+
+ void setBaseConcurrency(java.lang.String _baseConcurrency);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo
+ getComplexConcurrency();
+
+ void
+ setComplexConcurrency(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _complexConcurrency);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "NestedComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo
+ getNestedComplexConcurrency();
+
+ void
+ setNestedComplexConcurrency(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _nestedComplexConcurrency);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "RelatedProducts",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Product",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection
+ getRelatedProducts();
+
+ void
+ setRelatedProducts(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection _relatedProducts);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Detail",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "ProductDetail",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail
+ getDetail();
+
+ void
+ setDetail(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail _detail);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Reviews",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "ProductReview",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection
+ getReviews();
+
+ void
+ setReviews(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection _reviews);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Photos",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "ProductPhoto",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection
+ getPhotos();
+
+ void
+ setPhotos(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection _photos);
+
+ Operations operations();
+
+ interface Operations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ChangeProductDimensions",
+ type = OperationType.ACTION)
+ void
+ changeProductDimensions(
+ @Parameter(name = "dimensions", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions",
+ nullable = true) org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions dimensions
+ );
+
+ }
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions
+ newDimensions();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo
+ newComplexConcurrency();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "NestedComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo
+ newNestedComplexConcurrency();
+
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Picture",
+ type = "Edm.Stream")
+ Annotatable getPictureAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
+ type = "Edm.String")
+ Annotatable getDescriptionAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Dimensions",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
+ Annotatable getDimensionsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BaseConcurrency",
+ type = "Edm.String")
+ Annotatable getBaseConcurrencyAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
+ Annotatable getComplexConcurrencyAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "NestedComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
+ Annotatable getNestedComplexConcurrencyAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "RelatedProducts",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getRelatedProductsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Detail",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail")
+ Annotatable getDetailAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Reviews",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview")
+ Annotatable getReviewsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Photos",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto")
+ Annotatable getPhotosAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java
index 2b447d5..1a797fc 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface ProductCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product> {
+public interface ProductCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java
index 3c9696c..5ee2588 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java
@@ -1,146 +1,114 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ProductDetail",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface ProductDetail
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductId();
-
- void setProductId(java.lang.Integer _productId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Details",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getDetails();
-
- void setDetails(java.lang.String _details);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Product",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product getProduct();
-
- void setProduct(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
- type = "Edm.Int32")
- Annotatable getProductIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Details",
- type = "Edm.String")
- Annotatable getDetailsAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
- Annotatable getProductAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface ProductDetail
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductId();
+
+ void setProductId(java.lang.Integer _productId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Details",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getDetails();
+
+ void setDetails(java.lang.String _details);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Product",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product
+ getProduct();
+
+ void
+ setProduct(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Details",
+ type = "Edm.String")
+ Annotatable getDetailsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getProductAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java
index 9779703..7986a1e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface ProductDetailCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail> {
+public interface ProductDetailCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail> {
Object getAnnotation(Class<? extends AbstractTerm> term);
[45/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
index bcb0322..9d0a8a7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "AllGeoTypesSet")
-public interface AllGeoTypesSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection> {
+public interface AllGeoTypesSet
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection> {
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes
+ newAllSpatialTypes();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes newAllSpatialTypes();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection newAllSpatialTypesCollection();
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection
+ newAllSpatialTypesCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java
index a84a9ac..ca64269 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Car")
-public interface Car
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Car, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection> {
+public interface Car
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Car, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection> {
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Car
+ newCar();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Car newCar();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection newCarCollection();
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection
+ newCarCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java
index d6c94d6..68bdd9c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Computer")
-public interface Computer
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerCollection> {
+public interface Computer
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerCollection> {
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer
+ newComputer();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer newComputer();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerCollection newComputerCollection();
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerCollection
+ newComputerCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
index 27a2df4..f5c682a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ComputerDetail")
-public interface ComputerDetail
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetailCollection> {
+public interface ComputerDetail
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetailCollection> {
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail
+ newComputerDetail();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail newComputerDetail();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetailCollection newComputerDetailCollection();
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetailCollection
+ newComputerDetailCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java
index 18bf4c5..fc0273c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Customer")
-public interface Customer
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection> {
+public interface Customer
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection> {
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer
+ newCustomer();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer newCustomer();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection newCustomerCollection();
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection
+ newCustomerCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
index 249878f..2435361 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "CustomerInfo")
-public interface CustomerInfo
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfoCollection> {
+public interface CustomerInfo
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfoCollection> {
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo
+ newCustomerInfo();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo newCustomerInfo();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfoCollection newCustomerInfoCollection();
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfoCollection
+ newCustomerInfoCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
index 13d370c..cde3b20 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
@@ -1,130 +1,135 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.PersistenceManager;
import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+import org.apache.olingo.ext.proxy.api.PersistenceManager;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "DefaultContainer",
- namespace = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- isDefaultEntityContainer = true)
+ namespace = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ isDefaultEntityContainer = true)
public interface DefaultContainer extends PersistenceManager {
- Customer getCustomer();
- Login getLogin();
- OrderLine getOrderLine();
- ComputerDetail getComputerDetail();
- Product getProduct();
- Message getMessage();
- ProductDetail getProductDetail();
- ProductPhoto getProductPhoto();
- Order getOrder();
- Computer getComputer();
- MappedEntityType getMappedEntityType();
- PageView getPageView();
- Driver getDriver();
- AllGeoCollectionTypesSet getAllGeoCollectionTypesSet();
- Car getCar();
- CustomerInfo getCustomerInfo();
- License getLicense();
- ProductReview getProductReview();
- LastLogin getLastLogin();
- MessageAttachment getMessageAttachment();
- AllGeoTypesSet getAllGeoTypesSet();
- PersonMetadata getPersonMetadata();
- RSAToken getRSAToken();
- Person getPerson();
+ Customer getCustomer();
+
+ Login getLogin();
+
+ OrderLine getOrderLine();
+
+ ComputerDetail getComputerDetail();
+
+ Product getProduct();
+
+ Message getMessage();
+
+ ProductDetail getProductDetail();
+
+ ProductPhoto getProductPhoto();
+
+ Order getOrder();
+
+ Computer getComputer();
+
+ MappedEntityType getMappedEntityType();
+
+ PageView getPageView();
+
+ Driver getDriver();
+
+ AllGeoCollectionTypesSet getAllGeoCollectionTypesSet();
+
+ Car getCar();
+
+ CustomerInfo getCustomerInfo();
+
+ License getLicense();
+ ProductReview getProductReview();
+ LastLogin getLastLogin();
+ MessageAttachment getMessageAttachment();
+
+ AllGeoTypesSet getAllGeoTypesSet();
+
+ PersonMetadata getPersonMetadata();
+
+ RSAToken getRSAToken();
+
+ Person getPerson();
Operations operations();
public interface Operations {
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "UpdatePersonInfo",
- type = OperationType.ACTION)
- void updatePersonInfo(
- );
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "RetrieveProduct",
- type = OperationType.ACTION,
- returnType = "Edm.Int32")
- java.lang.Integer retrieveProduct(
- );
-
- }
-
- ComplexFactory complexFactory();
-
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactDetails",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newContactDetails();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Aliases",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases newAliases();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Phone",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone newPhone();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AuditInfo",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newAuditInfo();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyInfo",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newConcurrencyInfo();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexToCategory",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory newComplexToCategory();
-
- }
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "UpdatePersonInfo",
+ type = OperationType.ACTION)
+ void updatePersonInfo(
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "RetrieveProduct",
+ type = OperationType.ACTION,
+ returnType = "Edm.Int32")
+ java.lang.Integer retrieveProduct(
+ );
+
+ }
+
+ ComplexFactory complexFactory();
+
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactDetails",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails
+ newContactDetails();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Aliases",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases
+ newAliases();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Phone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone
+ newPhone();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AuditInfo",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo
+ newAuditInfo();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyInfo",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo
+ newConcurrencyInfo();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions
+ newDimensions();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexToCategory",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory
+ newComplexToCategory();
+
}
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java
index 834fdf5..0c831fb 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Driver")
-public interface Driver
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Driver, java.lang.String, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.DriverCollection> {
+public interface Driver
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Driver, java.lang.String, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.DriverCollection> {
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Driver
+ newDriver();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Driver newDriver();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.DriverCollection newDriverCollection();
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.DriverCollection
+ newDriverCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
index 5df97e3..f175520 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "LastLogin")
-public interface LastLogin
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin, java.lang.String, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLoginCollection> {
+public interface LastLogin
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin, java.lang.String, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLoginCollection> {
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin
+ newLastLogin();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin newLastLogin();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLoginCollection newLastLoginCollection();
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLoginCollection
+ newLastLoginCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java
index dec3606..203226e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "License")
-public interface License
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.License, java.lang.String, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LicenseCollection> {
+public interface License
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.License, java.lang.String, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LicenseCollection> {
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.License
+ newLicense();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.License newLicense();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LicenseCollection newLicenseCollection();
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LicenseCollection
+ newLicenseCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java
index 220bcd5..a0428c8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Login")
-public interface Login
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login, java.lang.String, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection> {
+public interface Login
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login, java.lang.String, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection> {
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login
+ newLogin();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login newLogin();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection newLoginCollection();
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection
+ newLoginCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
index 5ed0e94..97428d0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "MappedEntityType")
-public interface MappedEntityType
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityTypeCollection> {
+public interface MappedEntityType
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityTypeCollection> {
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType
+ newMappedEntityType();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType newMappedEntityType();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityTypeCollection newMappedEntityTypeCollection();
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityTypeCollection
+ newMappedEntityTypeCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Message.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Message.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Message.java
index e23927d..8c6a35e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Message.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Message.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,16 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
+import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageKey;
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Message")
-public interface Message
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Message, MessageKey, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection> {
+public interface Message
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Message, MessageKey, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection> {
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Message
+ newMessage();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Message newMessage();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection newMessageCollection();
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection
+ newMessageCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
index 3a9f4da..cba9c2b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "MessageAttachment")
-public interface MessageAttachment
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment, java.util.UUID, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection> {
+public interface MessageAttachment
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment, java.util.UUID, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection> {
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment
+ newMessageAttachment();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment newMessageAttachment();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection newMessageAttachmentCollection();
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection
+ newMessageAttachmentCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Order.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Order.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Order.java
index 4b3241a..ac8e165 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Order.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Order.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Order")
-public interface Order
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection> {
+public interface Order
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection> {
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order
+ newOrder();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order newOrder();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection newOrderCollection();
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection
+ newOrderCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
index 42b45b6..cdea148 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,37 +20,28 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
+import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineKey;
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "OrderLine")
-public interface OrderLine
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine, OrderLineKey, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineCollection> {
-
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine newOrderLine();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineCollection newOrderLineCollection();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine newBackOrderLine();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLineCollection newBackOrderLineCollection();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2 newBackOrderLine2();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2Collection newBackOrderLine2Collection();
+public interface OrderLine
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine, OrderLineKey, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineCollection> {
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine
+ newOrderLine();
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineCollection
+ newOrderLineCollection();
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine
+ newBackOrderLine();
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLineCollection
+ newBackOrderLineCollection();
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2
+ newBackOrderLine2();
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2Collection
+ newBackOrderLine2Collection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PageView.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PageView.java
index 728e7d4..9478a08 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PageView.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PageView.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,35 +20,21 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "PageView")
+public interface PageView
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageViewCollection> {
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView
+ newPageView();
-@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "PageView")
-public interface PageView
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageViewCollection> {
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageViewCollection
+ newPageViewCollection();
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPageView
+ newProductPageView();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView newPageView();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageViewCollection newPageViewCollection();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPageView newProductPageView();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPageViewCollection newProductPageViewCollection();
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPageViewCollection
+ newProductPageViewCollection();
}
[46/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTestITCase.java
index f2de82a..cf19a12 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTestITCase.java
@@ -1,42 +1,42 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
+
import org.apache.olingo.client.api.v3.EdmEnabledODataClient;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.ext.proxy.EntityContainerFactory;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- DefaultContainer;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.
- ContactDetails;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer;
+//CHECKSTYLE:OFF (Maven checkstyle)
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.DefaultContainer;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone;
-
+//CHECKSTYLE:ON (Maven checkstyle)
import org.junit.BeforeClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -83,9 +83,9 @@ public abstract class AbstractTestITCase {
}
protected Customer getSampleCustomerProfile(
- final Integer id,
- final String sampleName,
- final DefaultContainer container) {
+ final Integer id,
+ final String sampleName,
+ final DefaultContainer container) {
final Customer customer = container.getCustomer().newCustomer();
@@ -97,27 +97,27 @@ public abstract class AbstractTestITCase {
final ContactDetails cd = customer.factory().newPrimaryContactInfo();
cd.setAlternativeNames(Arrays.asList("alternative1", "alternative2"));
- cd.setEmailBag(Collections.<String>singleton("myname@mydomain.org"));
- cd.setMobilePhoneBag(Collections.<Phone>emptySet());
+ cd.setEmailBag(Collections.<String> singleton("myname@mydomain.org"));
+ cd.setMobilePhoneBag(Collections.<Phone> emptySet());
customer.setPrimaryContactInfo(cd);
final Aliases aliases = cd.factory().newContactAlias();
- aliases.setAlternativeNames(Collections.<String>singleton("myAlternativeName"));
+ aliases.setAlternativeNames(Collections.<String> singleton("myAlternativeName"));
cd.setContactAlias(aliases);
final ContactDetails bcd = customer.factory().newBackupContactInfo();
bcd.setAlternativeNames(Arrays.asList("alternative3", "alternative4"));
- bcd.setEmailBag(Collections.<String>emptySet());
- bcd.setMobilePhoneBag(Collections.<Phone>emptySet());
- customer.setBackupContactInfo(Collections.<ContactDetails>singleton(bcd));
+ bcd.setEmailBag(Collections.<String> emptySet());
+ bcd.setMobilePhoneBag(Collections.<Phone> emptySet());
+ customer.setBackupContactInfo(Collections.<ContactDetails> singleton(bcd));
return customer;
}
protected void checkSampleCustomerProfile(
- final Customer customer,
- final Integer id,
- final String sampleName) {
+ final Customer customer,
+ final Integer id,
+ final String sampleName) {
assertEquals(id, customer.getCustomerId());
assertNotNull(customer.getPrimaryContactInfo());
@@ -138,7 +138,7 @@ public abstract class AbstractTestITCase {
assertTrue(bcd.getMobilePhoneBag().isEmpty());
}
- protected Customer readCustomer(final DefaultContainer container, int id) {
+ protected Customer readCustomer(final DefaultContainer container, final int id) {
final Customer customer = container.getCustomer().get(id);
assertNotNull(customer);
assertEquals(Integer.valueOf(id), customer.getCustomerId());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ActionOverloadingTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ActionOverloadingTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ActionOverloadingTestITCase.java
index 5c8019b..b43c842 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ActionOverloadingTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ActionOverloadingTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -25,18 +25,14 @@ import static org.junit.Assert.assertNotNull;
import org.apache.olingo.client.api.v3.EdmEnabledODataClient;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.ext.proxy.EntityContainerFactory;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.
- DefaultContainer;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.
- Employee;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.
- EmployeeCollection;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.
- OrderLineKey;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.
- SpecialEmployee;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.
- SpecialEmployeeCollection;
+//CHECKSTYLE:OFF (Maven checkstyle)
+import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.DefaultContainer;
+import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee;
+import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection;
+import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineKey;
+import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee;
+import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployeeCollection;
+//CHECKSTYLE:ON (Maven checkstyle)
import org.junit.Test;
/**
@@ -45,8 +41,8 @@ import org.junit.Test;
public class ActionOverloadingTestITCase extends AbstractTestITCase {
private DefaultContainer getContainer() {
- final EntityContainerFactory<EdmEnabledODataClient> ecf =
- EntityContainerFactory.getV3(testActionOverloadingServiceRootURL);
+ final EntityContainerFactory<EdmEnabledODataClient> ecf =
+ EntityContainerFactory.getV3(testActionOverloadingServiceRootURL);
ecf.getClient().getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
return ecf.getEntityContainer(DefaultContainer.class);
}
@@ -83,16 +79,16 @@ public class ActionOverloadingTestITCase extends AbstractTestITCase {
Employee empl = ecoll.iterator().next();
assertNotNull(empl);
- int key = empl.getPersonId();
+ empl.getPersonId();
int salary = empl.getSalary();
ecoll.operations().increaseSalaries(5);
// the invoke above changed the local entities, re-read
- containerFactory.getContext().detachAll();
+ containerFactory.getContext().detachAll();
ecoll = aocontainer.getPerson().getAll(EmployeeCollection.class);
empl = ecoll.iterator().next();
-
+
assertEquals(salary + 5, empl.getSalary(), 0);
SpecialEmployeeCollection secoll = aocontainer.getPerson().getAll(SpecialEmployeeCollection.class);
@@ -101,16 +97,16 @@ public class ActionOverloadingTestITCase extends AbstractTestITCase {
SpecialEmployee sempl = secoll.toArray(new SpecialEmployee[secoll.size()])[1];
assertNotNull(sempl);
- key = sempl.getPersonId();
+ sempl.getPersonId();
salary = sempl.getSalary();
secoll.operations().increaseSalaries(5);
// the invoke above changed the local entities, re-read
- containerFactory.getContext().detachAll();
+ containerFactory.getContext().detachAll();
secoll = aocontainer.getPerson().getAll(SpecialEmployeeCollection.class);
sempl = secoll.toArray(new SpecialEmployee[secoll.size()])[1];
-
+
assertEquals(salary + 5, sempl.getSalary(), 0);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AsyncTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AsyncTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AsyncTestITCase.java
index 70346f7..951e499 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AsyncTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AsyncTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -26,18 +26,17 @@ import static org.junit.Assert.assertTrue;
import java.util.UUID;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
+
import org.apache.olingo.ext.proxy.api.AsyncCall;
import org.apache.olingo.ext.proxy.api.Filter;
+//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.
- EmployeeCollection;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.
- ProductCollection;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.
- SpecialEmployee;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.
- SpecialEmployeeCollection;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployeeCollection;
+//CHECKSTYLE:ON (Maven checkstyle)
import org.junit.Test;
public class AsyncTestITCase extends AbstractTestITCase {
@@ -45,13 +44,13 @@ public class AsyncTestITCase extends AbstractTestITCase {
@Test
public void retrieveEntitySet() throws InterruptedException, ExecutionException {
final Future<ProductCollection> futureProds =
- new AsyncCall<ProductCollection>(containerFactory.getClient().getConfiguration()) {
+ new AsyncCall<ProductCollection>(containerFactory.getClient().getConfiguration()) {
- @Override
- public ProductCollection call() {
- return container.getProduct().getAll();
- }
- };
+ @Override
+ public ProductCollection call() {
+ return container.getProduct().getAll();
+ }
+ };
assertNotNull(futureProds);
while (!futureProds.isDone()) {
@@ -101,27 +100,27 @@ public class AsyncTestITCase extends AbstractTestITCase {
@Test
public void polymorphQuery() throws Exception {
final Future<Filter<Employee, EmployeeCollection>> queryEmployee =
- new AsyncCall<Filter<Employee, EmployeeCollection>>(containerFactory.getClient().getConfiguration()) {
+ new AsyncCall<Filter<Employee, EmployeeCollection>>(containerFactory.getClient().getConfiguration()) {
- @Override
- public Filter<Employee, EmployeeCollection> call() {
- return container.getPerson().createFilter(EmployeeCollection.class);
- }
- };
+ @Override
+ public Filter<Employee, EmployeeCollection> call() {
+ return container.getPerson().createFilter(EmployeeCollection.class);
+ }
+ };
assertFalse(queryEmployee.get().getResult().isEmpty());
final Future<Filter<SpecialEmployee, SpecialEmployeeCollection>> querySpecialEmployee =
- new AsyncCall<Filter<SpecialEmployee, SpecialEmployeeCollection>>(
- containerFactory.getClient().getConfiguration()) {
-
- @Override
- public Filter<SpecialEmployee, SpecialEmployeeCollection> call() {
- return container.getPerson().createFilter(SpecialEmployeeCollection.class);
- }
- };
+ new AsyncCall<Filter<SpecialEmployee, SpecialEmployeeCollection>>(
+ containerFactory.getClient().getConfiguration()) {
+
+ @Override
+ public Filter<SpecialEmployee, SpecialEmployeeCollection> call() {
+ return container.getPerson().createFilter(SpecialEmployeeCollection.class);
+ }
+ };
assertFalse(querySpecialEmployee.get().getResult().isEmpty());
assertTrue(container.getPerson().getAll().size()
- > queryEmployee.get().getResult().size() + querySpecialEmployee.get().getResult().size());
+ > queryEmployee.get().getResult().size() + querySpecialEmployee.get().getResult().size());
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ContextTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ContextTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ContextTestITCase.java
index 8db857a..9caab38 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ContextTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ContextTestITCase.java
@@ -1,30 +1,30 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3;
-import static org.junit.Assert.fail;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.lang.reflect.Proxy;
import java.util.ArrayList;
@@ -33,23 +33,19 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler;
import org.apache.olingo.ext.proxy.context.AttachedEntityStatus;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.
- ContactDetails;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.
- Customer;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.
- CustomerInfo;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.
- Login;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.
- Order;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.
- OrderCollection;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.
- Phone;
+//CHECKSTYLE:OFF (Maven checkstyle)
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone;
+//CHECKSTYLE:ON (Maven checkstyle)
import org.junit.Test;
/**
@@ -63,9 +59,9 @@ public class ContextTestITCase extends AbstractTestITCase {
final Customer customer2 = container.getCustomer().newCustomer();
final EntityInvocationHandler source1 =
- (EntityInvocationHandler) Proxy.getInvocationHandler(customer1);
+ (EntityInvocationHandler) Proxy.getInvocationHandler(customer1);
final EntityInvocationHandler source2 =
- (EntityInvocationHandler) Proxy.getInvocationHandler(customer2);
+ (EntityInvocationHandler) Proxy.getInvocationHandler(customer2);
assertTrue(containerFactory.getContext().entityContext().isAttached(source1));
assertTrue(containerFactory.getContext().entityContext().isAttached(source2));
@@ -86,11 +82,11 @@ public class ContextTestITCase extends AbstractTestITCase {
final Customer customer3 = container.getCustomer().get(-10);
final EntityInvocationHandler source1 =
- (EntityInvocationHandler) Proxy.getInvocationHandler(customer1);
+ (EntityInvocationHandler) Proxy.getInvocationHandler(customer1);
final EntityInvocationHandler source2 =
- (EntityInvocationHandler) Proxy.getInvocationHandler(customer2);
+ (EntityInvocationHandler) Proxy.getInvocationHandler(customer2);
final EntityInvocationHandler source3 =
- (EntityInvocationHandler) Proxy.getInvocationHandler(customer3);
+ (EntityInvocationHandler) Proxy.getInvocationHandler(customer3);
assertFalse(containerFactory.getContext().entityContext().isAttached(source1));
assertFalse(containerFactory.getContext().entityContext().isAttached(source2));
@@ -134,9 +130,9 @@ public class ContextTestITCase extends AbstractTestITCase {
assertNotNull(customer.getInfo());
final EntityInvocationHandler source =
- (EntityInvocationHandler) Proxy.getInvocationHandler(customer);
+ (EntityInvocationHandler) Proxy.getInvocationHandler(customer);
final EntityInvocationHandler target =
- (EntityInvocationHandler) Proxy.getInvocationHandler(customerInfo);
+ (EntityInvocationHandler) Proxy.getInvocationHandler(customerInfo);
assertTrue(containerFactory.getContext().entityContext().isAttached(source));
assertEquals(AttachedEntityStatus.NEW, containerFactory.getContext().entityContext().getStatus(source));
@@ -153,7 +149,8 @@ public class ContextTestITCase extends AbstractTestITCase {
@Test
public void linkSourceExisting() {
- final Customer customer = container.getCustomer().get(-10);;
+ final Customer customer = container.getCustomer().get(-10);
+ ;
final CustomerInfo customerInfo = container.getCustomerInfo().newCustomerInfo();
customer.setInfo(customerInfo);
@@ -161,9 +158,9 @@ public class ContextTestITCase extends AbstractTestITCase {
assertNotNull(customer.getInfo());
final EntityInvocationHandler source =
- (EntityInvocationHandler) Proxy.getInvocationHandler(customer);
+ (EntityInvocationHandler) Proxy.getInvocationHandler(customer);
final EntityInvocationHandler target =
- (EntityInvocationHandler) Proxy.getInvocationHandler(customerInfo);
+ (EntityInvocationHandler) Proxy.getInvocationHandler(customerInfo);
assertTrue(containerFactory.getContext().entityContext().isAttached(source));
assertEquals(AttachedEntityStatus.CHANGED, containerFactory.getContext().entityContext().getStatus(source));
@@ -188,9 +185,9 @@ public class ContextTestITCase extends AbstractTestITCase {
assertNotNull(customer.getInfo());
final EntityInvocationHandler source =
- (EntityInvocationHandler) Proxy.getInvocationHandler(customer);
+ (EntityInvocationHandler) Proxy.getInvocationHandler(customer);
final EntityInvocationHandler target =
- (EntityInvocationHandler) Proxy.getInvocationHandler(customerInfo);
+ (EntityInvocationHandler) Proxy.getInvocationHandler(customerInfo);
assertTrue(containerFactory.getContext().entityContext().isAttached(source));
assertEquals(AttachedEntityStatus.CHANGED, containerFactory.getContext().entityContext().getStatus(source));
@@ -238,7 +235,7 @@ public class ContextTestITCase extends AbstractTestITCase {
for (Order order : toBeLinked) {
assertFalse(containerFactory.getContext().entityContext().
- isAttached((EntityInvocationHandler) Proxy.getInvocationHandler(order)));
+ isAttached((EntityInvocationHandler) Proxy.getInvocationHandler(order)));
}
}
@@ -253,7 +250,7 @@ public class ContextTestITCase extends AbstractTestITCase {
cd.setAlternativeNames(Arrays.asList("alternative1", "alternative2"));
final ContactDetails bcd = customer.factory().newBackupContactInfo();
- customer.setBackupContactInfo(Collections.<ContactDetails>singletonList(bcd));
+ customer.setBackupContactInfo(Collections.<ContactDetails> singletonList(bcd));
bcd.setAlternativeNames(Arrays.asList("alternative3", "alternative4"));
@@ -377,35 +374,35 @@ public class ContextTestITCase extends AbstractTestITCase {
final ContactDetails cd = customer.factory().newPrimaryContactInfo();
cd.setAlternativeNames(Arrays.asList("alternative1", "alternative2"));
- cd.setEmailBag(Collections.<String>singleton("myemail@mydomain.org"));
- cd.setMobilePhoneBag(Collections.<Phone>emptySet());
+ cd.setEmailBag(Collections.<String> singleton("myemail@mydomain.org"));
+ cd.setMobilePhoneBag(Collections.<Phone> emptySet());
final ContactDetails bcd = customer.factory().newBackupContactInfo();
bcd.setAlternativeNames(Arrays.asList("alternative3", "alternative4"));
- bcd.setEmailBag(Collections.<String>emptySet());
- bcd.setMobilePhoneBag(Collections.<Phone>emptySet());
+ bcd.setEmailBag(Collections.<String> emptySet());
+ bcd.setMobilePhoneBag(Collections.<Phone> emptySet());
customer.setPrimaryContactInfo(cd);
- customer.setBackupContactInfo(Collections.<ContactDetails>singletonList(bcd));
+ customer.setBackupContactInfo(Collections.<ContactDetails> singletonList(bcd));
assertTrue(containerFactory.getContext().entityContext().
- isAttached((EntityInvocationHandler) Proxy.getInvocationHandler(customerInfo)));
+ isAttached((EntityInvocationHandler) Proxy.getInvocationHandler(customerInfo)));
assertTrue(containerFactory.getContext().entityContext().
- isAttached((EntityInvocationHandler) Proxy.getInvocationHandler(customer)));
+ isAttached((EntityInvocationHandler) Proxy.getInvocationHandler(customer)));
for (Order linked : toBeLinked) {
assertTrue(containerFactory.getContext().entityContext().
- isAttached((EntityInvocationHandler) Proxy.getInvocationHandler(linked)));
+ isAttached((EntityInvocationHandler) Proxy.getInvocationHandler(linked)));
}
container.flush();
assertFalse(containerFactory.getContext().entityContext().
- isAttached((EntityInvocationHandler) Proxy.getInvocationHandler(customerInfo)));
+ isAttached((EntityInvocationHandler) Proxy.getInvocationHandler(customerInfo)));
assertFalse(containerFactory.getContext().entityContext().
- isAttached((EntityInvocationHandler) Proxy.getInvocationHandler(customer)));
+ isAttached((EntityInvocationHandler) Proxy.getInvocationHandler(customer)));
for (Order linked : toBeLinked) {
assertFalse(containerFactory.getContext().entityContext().
- isAttached((EntityInvocationHandler) Proxy.getInvocationHandler(linked)));
+ isAttached((EntityInvocationHandler) Proxy.getInvocationHandler(linked)));
}
assertEquals("some new info ...", container.getCustomerInfo().get(16).getInformation());
@@ -414,25 +411,25 @@ public class ContextTestITCase extends AbstractTestITCase {
container.getCustomer().delete(customer.getCustomerId());
assertTrue(containerFactory.getContext().entityContext().
- isAttached((EntityInvocationHandler) Proxy.getInvocationHandler(customer)));
+ isAttached((EntityInvocationHandler) Proxy.getInvocationHandler(customer)));
for (Order linked : toBeLinked) {
assertTrue(containerFactory.getContext().entityContext().
- isAttached((EntityInvocationHandler) Proxy.getInvocationHandler(linked)));
+ isAttached((EntityInvocationHandler) Proxy.getInvocationHandler(linked)));
}
container.flush();
assertFalse(containerFactory.getContext().entityContext().
- isAttached((EntityInvocationHandler) Proxy.getInvocationHandler(customer)));
+ isAttached((EntityInvocationHandler) Proxy.getInvocationHandler(customer)));
for (Order linked : toBeLinked) {
assertFalse(containerFactory.getContext().entityContext().
- isAttached((EntityInvocationHandler) Proxy.getInvocationHandler(linked)));
+ isAttached((EntityInvocationHandler) Proxy.getInvocationHandler(linked)));
}
}
private void checkUnlink(
- final String sourceName,
- final EntityInvocationHandler source) {
+ final String sourceName,
+ final EntityInvocationHandler source) {
boolean found = false;
for (Map.Entry<NavigationProperty, Object> property : source.getLinkChanges().entrySet()) {
@@ -444,10 +441,10 @@ public class ContextTestITCase extends AbstractTestITCase {
}
private void checkLink(
- final String sourceName,
- final EntityInvocationHandler source,
- final EntityInvocationHandler target,
- final boolean isCollection) {
+ final String sourceName,
+ final EntityInvocationHandler source,
+ final EntityInvocationHandler target,
+ final boolean isCollection) {
boolean found = false;
for (Map.Entry<NavigationProperty, Object> property : source.getLinkChanges().entrySet()) {
@@ -461,7 +458,7 @@ public class ContextTestITCase extends AbstractTestITCase {
}
} else {
found = target.equals(
- (EntityInvocationHandler) Proxy.getInvocationHandler(property.getValue()));
+ (EntityInvocationHandler) Proxy.getInvocationHandler(property.getValue()));
}
}
}
@@ -469,11 +466,11 @@ public class ContextTestITCase extends AbstractTestITCase {
}
private void checkUnidirectional(
- final String sourceName,
- final EntityInvocationHandler source,
- final String targetName,
- final EntityInvocationHandler target,
- final boolean isCollection) {
+ final String sourceName,
+ final EntityInvocationHandler source,
+ final String targetName,
+ final EntityInvocationHandler target,
+ final boolean isCollection) {
checkLink(sourceName, source, target, isCollection);
checkUnlink(targetName, target);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java
index 75e583d..766db4f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -23,18 +23,14 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.Customer;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.Employee;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.Message;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.MessageKey;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.Order;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.OrderCollection;
+//CHECKSTYLE:OFF (Maven checkstyle)
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Message;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageKey;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection;
+//CHECKSTYLE:ON (Maven checkstyle)
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java
index 0ea8ad5..2c95dcf 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -27,54 +27,36 @@ import static org.junit.Assert.fail;
import java.lang.reflect.Proxy;
import java.util.Calendar;
import java.util.Collection;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.Geospatial.Type;
import org.apache.olingo.commons.api.edm.geo.MultiLineString;
import org.apache.olingo.commons.api.edm.geo.Point;
import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- DefaultContainer;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.AllSpatialTypes;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.ComputerDetail;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.ConcurrencyInfo;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.ContactDetails;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.Contractor;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.ContractorCollection;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.CustomerInfo;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.Message;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.MessageKey;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.Order;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.OrderCollection;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.Product;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.SpecialEmployee;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.SpecialEmployeeCollection;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.Customer;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.Employee;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.EmployeeCollection;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.Person;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.PersonCollection;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.Phone;
+//CHECKSTYLE:OFF (Maven checkstyle)
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.DefaultContainer;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Contractor;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContractorCollection;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Message;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageKey;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployeeCollection;
+//CHECKSTYLE:ON (Maven checkstyle)
import org.junit.Test;
/**
@@ -114,7 +96,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
}
final SpecialEmployeeCollection specialEmployees =
- getContainer().getPerson().getAll(SpecialEmployeeCollection.class);
+ getContainer().getPerson().getAll(SpecialEmployeeCollection.class);
assertNotNull(specialEmployees);
assertFalse(specialEmployees.isEmpty());
for (SpecialEmployee employee : specialEmployees) {
@@ -189,9 +171,8 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
assertEquals(-10, computerDetail.getComputerDetailId(), 0);
try {
- assertNotNull(
- computerDetail.operations().getClass().getMethod(
- "resetComputerDetailsSpecifications", Collection.class, Calendar.class));
+ assertNotNull(computerDetail.operations().getClass().getMethod(
+ "resetComputerDetailsSpecifications", Collection.class, Calendar.class));
} catch (Exception e) {
fail();
}
@@ -212,7 +193,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
public void checkForETag() {
Product product = getContainer().getProduct().get(-10);
assertTrue(StringUtils.isNotBlank(
- ((EntityInvocationHandler) Proxy.getInvocationHandler(product)).getETag()));
+ ((EntityInvocationHandler) Proxy.getInvocationHandler(product)).getETag()));
}
@Test
@@ -221,14 +202,13 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
boolean found = false;
assertTrue(customer.getPrimaryContactInfo().getEmailBag().contains("psgdkmxamznjulzbsohqjytbxhnojbufe"));
-
+
final Collection<ContactDetails> backupContactInfo = customer.getBackupContactInfo();
assertEquals(9, backupContactInfo.size());
-
for (ContactDetails contact : backupContactInfo) {
if (contact.getContactAlias() != null && contact.getContactAlias().getAlternativeNames() != null && contact.
- getContactAlias().getAlternativeNames().contains("vxiefursgkqzptijhincpdm")) {
+ getContactAlias().getAlternativeNames().contains("vxiefursgkqzptijhincpdm")) {
found = true;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntitySetTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntitySetTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntitySetTestITCase.java
index 29049b1..a86f7ba 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntitySetTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntitySetTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.util.Iterator;
+
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityUpdateTestITCase.java
index 9450d29..464204c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityUpdateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityUpdateTestITCase.java
@@ -1,44 +1,40 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.lang.reflect.Proxy;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.ConcurrencyInfo;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.Customer;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.Message;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.MessageKey;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.Order;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.OrderCollection;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
- types.Product;
+//CHECKSTYLE:OFF (Maven checkstyle)
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Message;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageKey;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product;
+//CHECKSTYLE:ON (Maven checkstyle)
import org.junit.Test;
/**
@@ -46,82 +42,82 @@ import org.junit.Test;
*/
public class EntityUpdateTestITCase extends AbstractTestITCase {
- @Test
- public void update() {
- Order order = container.getOrder().get(-9);
+ @Test
+ public void update() {
+ Order order = container.getOrder().get(-9);
- final ConcurrencyInfo ci = order.getConcurrency();
- ci.setToken("XXX");
+ final ConcurrencyInfo ci = order.getConcurrency();
+ ci.setToken("XXX");
- container.flush();
+ container.flush();
- order = container.getOrder().get(-9);
- assertEquals("XXX", order.getConcurrency().getToken());
- }
+ order = container.getOrder().get(-9);
+ assertEquals("XXX", order.getConcurrency().getToken());
+ }
- @Test
- public void multiKey() {
- final MessageKey key = new MessageKey();
- key.setFromUsername("1");
- key.setMessageId(-10);
+ @Test
+ public void multiKey() {
+ final MessageKey key = new MessageKey();
+ key.setFromUsername("1");
+ key.setMessageId(-10);
- Message message = container.getMessage().get(key);
- assertNotNull(message);
+ Message message = container.getMessage().get(key);
+ assertNotNull(message);
- message.setBody("XXX");
+ message.setBody("XXX");
- container.flush();
+ container.flush();
- message = container.getMessage().get(key);
- assertNotNull(message);
- assertEquals("XXX", message.getBody());
- }
+ message = container.getMessage().get(key);
+ assertNotNull(message);
+ assertEquals("XXX", message.getBody());
+ }
- @Test
- public void patchLink() {
- Order order = container.getOrder().newOrder();
- order.setOrderId(400);
- order.setCustomerId(-9);
+ @Test
+ public void patchLink() {
+ Order order = container.getOrder().newOrder();
+ order.setOrderId(400);
+ order.setCustomerId(-9);
- OrderCollection orders = container.getOrder().newOrderCollection();
- orders.add(order);
+ OrderCollection orders = container.getOrder().newOrderCollection();
+ orders.add(order);
- Customer customer = container.getCustomer().get(-9);
- customer.setOrders(orders);
- order.setCustomer(customer);
+ Customer customer = container.getCustomer().get(-9);
+ customer.setOrders(orders);
+ order.setCustomer(customer);
- container.flush();
+ container.flush();
- order = container.getOrder().get(400);
- assertEquals(400, order.getOrderId().intValue());
- assertEquals(-9, order.getCustomerId().intValue());
+ order = container.getOrder().get(400);
+ assertEquals(400, order.getOrderId().intValue());
+ assertEquals(-9, order.getCustomerId().intValue());
- customer = container.getCustomer().get(-9);
+ customer = container.getCustomer().get(-9);
- assertEquals(2, customer.getOrders().size());
+ assertEquals(2, customer.getOrders().size());
- int count = 0;
- for (Order inside : customer.getOrders()) {
- if (inside.getOrderId() == 400) {
- count++;
- }
- }
- assertEquals(1, count);
- assertEquals(-9, order.getCustomer().getCustomerId(), 0);
+ int count = 0;
+ for (Order inside : customer.getOrders()) {
+ if (inside.getOrderId() == 400) {
+ count++;
+ }
}
+ assertEquals(1, count);
+ assertEquals(-9, order.getCustomer().getCustomerId(), 0);
+ }
- @Test
- public void concurrentModification() {
- Product product = container.getProduct().get(-10);
- final String etag = ((EntityInvocationHandler) Proxy.getInvocationHandler(product)).getETag();
- assertTrue(StringUtils.isNotBlank(etag));
+ @Test
+ public void concurrentModification() {
+ Product product = container.getProduct().get(-10);
+ final String etag = ((EntityInvocationHandler) Proxy.getInvocationHandler(product)).getETag();
+ assertTrue(StringUtils.isNotBlank(etag));
- final String baseConcurrency = String.valueOf(System.currentTimeMillis());
- product.setBaseConcurrency(baseConcurrency);
+ final String baseConcurrency = String.valueOf(System.currentTimeMillis());
+ product.setBaseConcurrency(baseConcurrency);
- container.flush();
+ container.flush();
- product = container.getProduct().get(-10);
- assertEquals(baseConcurrency, product.getBaseConcurrency());
- }
+ product = container.getProduct().get(-10);
+ assertEquals(baseConcurrency, product.getBaseConcurrency());
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/FilterTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/FilterTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/FilterTestITCase.java
index 2ceb3c7..d015141 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/FilterTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/FilterTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -27,19 +27,18 @@ import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.olingo.ext.proxy.api.NonUniqueResultException;
+
import org.apache.olingo.ext.proxy.api.Filter;
+import org.apache.olingo.ext.proxy.api.NonUniqueResultException;
import org.apache.olingo.ext.proxy.api.Sort;
+//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.
- CarCollection;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.
- EmployeeCollection;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.
- SpecialEmployee;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.
- SpecialEmployeeCollection;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployeeCollection;
+//CHECKSTYLE:ON (Maven checkstyle)
import org.junit.Test;
public class FilterTestITCase extends AbstractTestITCase {
@@ -47,7 +46,7 @@ public class FilterTestITCase extends AbstractTestITCase {
@Test
public void filterOrderby() {
final Filter<Car, CarCollection> filter = container.getCar().createFilter().
- setFilter(containerFactory.getClient().getFilterFactory().lt("VIN", 16));
+ setFilter(containerFactory.getClient().getFilterFactory().lt("VIN", 16));
CarCollection result = filter.getResult();
assertNotNull(result);
@@ -81,7 +80,7 @@ public class FilterTestITCase extends AbstractTestITCase {
@Test
public void single() {
final Filter<Car, CarCollection> filter = container.getCar().createFilter().
- setFilter(containerFactory.getClient().getFilterFactory().lt("VIN", 16));
+ setFilter(containerFactory.getClient().getFilterFactory().lt("VIN", 16));
Exception exception = null;
try {
@@ -100,14 +99,14 @@ public class FilterTestITCase extends AbstractTestITCase {
@Test
public void derived() {
final Filter<Employee, EmployeeCollection> filterEmployee =
- container.getPerson().createFilter(EmployeeCollection.class);
+ container.getPerson().createFilter(EmployeeCollection.class);
assertFalse(filterEmployee.getResult().isEmpty());
final Filter<SpecialEmployee, SpecialEmployeeCollection> filterSpecialEmployee =
- container.getPerson().createFilter(SpecialEmployeeCollection.class);
+ container.getPerson().createFilter(SpecialEmployeeCollection.class);
assertFalse(filterSpecialEmployee.getResult().isEmpty());
assertTrue(container.getPerson().getAll().size()
- > filterEmployee.getResult().size() + filterSpecialEmployee.getResult().size());
+ > filterEmployee.getResult().size() + filterSpecialEmployee.getResult().size());
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/InvokeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/InvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/InvokeTestITCase.java
index a91fb68..e8c5946 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/InvokeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/InvokeTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -33,20 +33,18 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+
import org.apache.commons.lang3.StringUtils;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.
- ComputerDetail;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.
- ContactDetails;
+//CHECKSTYLE:OFF (Maven checkstyle)
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.
- CustomerCollection;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.
- Dimensions;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.
- EmployeeCollection;
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product;
+//CHECKSTYLE:ON (Maven checkstyle)
import org.junit.Test;
public class InvokeTestITCase extends AbstractTestITCase {
@@ -212,7 +210,7 @@ public class InvokeTestITCase extends AbstractTestITCase {
try {
// 1. invoke action bound to the computer detail just created
computerDetail.operations().resetComputerDetailsSpecifications(
- Collections.singleton("Second spec"), Calendar.getInstance());
+ Collections.singleton("Second spec"), Calendar.getInstance());
// 2. check that invoked action has effectively run
computerDetail = container.getComputerDetail().get(id);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/MediaEntityTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/MediaEntityTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/MediaEntityTestITCase.java
index c20b056..d5af7fb 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/MediaEntityTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/MediaEntityTestITCase.java
@@ -1,31 +1,32 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+
import org.apache.commons.io.IOUtils;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java
index 3ee02ba..adda881 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java
@@ -1,33 +1,34 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.UUID;
+
import org.apache.olingo.client.api.v3.EdmEnabledODataClient;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.ext.proxy.EntityContainerFactory;
@@ -52,7 +53,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
public static void initContainer() {
otcontainerFactory = EntityContainerFactory.getV3(testOpenTypeServiceRootURL);
otcontainerFactory.getClient().getConfiguration().
- setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
+ setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
otcontainer = otcontainerFactory.getEntityContainer(DefaultContainer.class);
assertNotNull(otcontainer);
}
@@ -60,11 +61,11 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
@Test
public void checkOpenTypeEntityTypesExist() {
assertTrue(otcontainer.getRow().newRow().getClass().getInterfaces()[0].
- getAnnotation(EntityType.class).openType());
+ getAnnotation(EntityType.class).openType());
assertTrue(otcontainer.getRowIndex().newRowIndex().getClass().getInterfaces()[0].
- getAnnotation(EntityType.class).openType());
+ getAnnotation(EntityType.class).openType());
assertTrue(otcontainer.getRow().newIndexedRow().getClass().getInterfaces()[0].
- getAnnotation(EntityType.class).openType());
+ getAnnotation(EntityType.class).openType());
otcontainerFactory.getContext().detachAll();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PrimitiveKeysTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PrimitiveKeysTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PrimitiveKeysTestITCase.java
index f0a4912..b9d85c9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PrimitiveKeysTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PrimitiveKeysTestITCase.java
@@ -1,28 +1,29 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3;
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import java.math.BigDecimal;
import java.util.UUID;
+
import org.apache.olingo.client.api.v3.EdmEnabledODataClient;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.ext.proxy.EntityContainerFactory;
@@ -46,10 +47,10 @@ public class PrimitiveKeysTestITCase extends AbstractTestITCase {
@Test
public void readPrimitiveKeys() {
- final EntityContainerFactory<EdmEnabledODataClient> testContainerFactory =
- EntityContainerFactory.getV3(testPrimitiveKeysServiceRootURL);
+ final EntityContainerFactory<EdmEnabledODataClient> testContainerFactory =
+ EntityContainerFactory.getV3(testPrimitiveKeysServiceRootURL);
testContainerFactory.getClient().getConfiguration().
- setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
+ setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
final TestContext testContainer = testContainerFactory.getEntityContainer(TestContext.class);
assertNotNull(testContainer);
@@ -62,7 +63,7 @@ public class PrimitiveKeysTestITCase extends AbstractTestITCase {
assertEquals(Short.valueOf("255"), edmByteSet.getId());
final EdmDecimal edmDecimalSet =
- testContainer.getEdmDecimalSet().get(new BigDecimal("79228162514264337593543950335"));
+ testContainer.getEdmDecimalSet().get(new BigDecimal("79228162514264337593543950335"));
assertNotNull(edmDecimalSet);
assertEquals(new BigDecimal("79228162514264337593543950335"), edmDecimalSet.getId());
@@ -75,7 +76,7 @@ public class PrimitiveKeysTestITCase extends AbstractTestITCase {
assertEquals(3.4028235E+38F, edmSingleSet.getId(), 0);
final EdmGuid edmGuidSet =
- testContainer.getEdmGuidSet().get(UUID.fromString("00000000-0000-0000-0000-000000000000"));
+ testContainer.getEdmGuidSet().get(UUID.fromString("00000000-0000-0000-0000-000000000000"));
assertNotNull(edmGuidSet);
assertEquals(UUID.fromString("00000000-0000-0000-0000-000000000000"), edmGuidSet.getId());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PropertyTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PropertyTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PropertyTestITCase.java
index e0aec63..9d94d2c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PropertyTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PropertyTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -30,26 +30,26 @@ import org.junit.Test;
*/
public class PropertyTestITCase extends AbstractTestITCase {
- @Test
- public void nullNullableProperty() {
- Order order = container.getOrder().get(-8);
- order.setCustomerId(null);
- container.flush();
+ @Test
+ public void nullNullableProperty() {
+ Order order = container.getOrder().get(-8);
+ order.setCustomerId(null);
+ container.flush();
- assertNull(container.getOrder().get(-8).getCustomerId());
- }
+ assertNull(container.getOrder().get(-8).getCustomerId());
+ }
- @Test
- public void nullNonNullableProperty() {
- Driver driver = container.getDriver().get("2");
- driver.setBirthDate(null);
+ @Test
+ public void nullNonNullableProperty() {
+ Driver driver = container.getDriver().get("2");
+ driver.setBirthDate(null);
- try {
- container.flush();
- fail();
- } catch (IllegalStateException e) {
- // ignore and detach all
- containerFactory.getContext().detachAll();
- }
+ try {
+ container.flush();
+ fail();
+ } catch (IllegalStateException e) {
+ // ignore and detach all
+ containerFactory.getContext().detachAll();
}
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
index 8965f17..8c34849 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,35 +20,21 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "AllGeoCollectionTypesSet")
+public interface AllGeoCollectionTypesSet
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypesCollection> {
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes
+ newAllSpatialCollectionTypes();
-@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "AllGeoCollectionTypesSet")
-public interface AllGeoCollectionTypesSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypesCollection> {
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypesCollection
+ newAllSpatialCollectionTypesCollection();
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes_Simple
+ newAllSpatialCollectionTypes_Simple();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes newAllSpatialCollectionTypes();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypesCollection newAllSpatialCollectionTypesCollection();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes_Simple newAllSpatialCollectionTypes_Simple();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes_SimpleCollection newAllSpatialCollectionTypes_SimpleCollection();
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes_SimpleCollection
+ newAllSpatialCollectionTypes_SimpleCollection();
}
[07/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java
index 0abf5a9..8e1e667 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java
@@ -1,358 +1,386 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "PublicCompany",
- openType = true,
- hasStream = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.ODataWCFService.Company")
-public interface PublicCompany
- extends Annotatable,org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CompanyID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getCompanyID();
-
- void setCompanyID(java.lang.Integer _companyID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CompanyCategory",
- type = "Microsoft.Test.OData.Services.ODataWCFService.CompanyCategory",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory getCompanyCategory();
-
- void setCompanyCategory(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory _companyCategory);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Revenue",
- type = "Edm.Int64",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Long getRevenue();
-
- void setRevenue(java.lang.Long _revenue);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Address",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address getAddress();
-
- void setAddress(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _address);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "StockExchange",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getStockExchange();
-
- void setStockExchange(java.lang.String _stockExchange);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Employees",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Employee",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "Employees",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection getEmployees();
-
- void setEmployees(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection _employees);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "VipCustomer",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Customer",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "VipCustomer",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer getVipCustomer();
-
- void setVipCustomer(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer _vipCustomer);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Departments",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Department",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "Departments",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection getDepartments();
-
- void setDepartments(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection _departments);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "CoreDepartment",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Department",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "Departments",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department getCoreDepartment();
-
- void setCoreDepartment(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department _coreDepartment);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Club",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Club",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "",
- targetEntitySet = "",
- containsTarget = true)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Club getClub();
-
- void setClub(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Club _club);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "LabourUnion",
- type = "Microsoft.Test.OData.Services.ODataWCFService.LabourUnion",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "LabourUnion",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnion getLabourUnion();
-
- void setLabourUnion(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnion _labourUnion);
-
-
- @Override
- Operations operations();
-
- interface Operations extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company.Operations{
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company.ComplexFactory{
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newAddress();
-
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CompanyID",
- type = "Edm.Int32")
- Annotatable getCompanyIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CompanyCategory",
- type = "Microsoft.Test.OData.Services.ODataWCFService.CompanyCategory")
- Annotatable getCompanyCategoryAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Revenue",
- type = "Edm.Int64")
- Annotatable getRevenueAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Address",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
- Annotatable getAddressAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "StockExchange",
- type = "Edm.String")
- Annotatable getStockExchangeAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Employees",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Employee")
- Annotatable getEmployeesAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "VipCustomer",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Customer")
- Annotatable getVipCustomerAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Departments",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Department")
- Annotatable getDepartmentsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "CoreDepartment",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Department")
- Annotatable getCoreDepartmentAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Assets",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Asset")
- Annotatable getAssetsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Club",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Club")
- Annotatable getClubAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "LabourUnion",
- type = "Microsoft.Test.OData.Services.ODataWCFService.LabourUnion")
- Annotatable getLabourUnionAnnotations();
- }
+ openType = true,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.ODataWCFService.Company")
+public interface PublicCompany
+ extends Annotatable,
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company {
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CompanyID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getCompanyID();
+
+ @Override
+ void setCompanyID(java.lang.Integer _companyID);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CompanyCategory",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.CompanyCategory",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory
+ getCompanyCategory();
+
+ @Override
+ void
+ setCompanyCategory(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory _companyCategory);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Revenue",
+ type = "Edm.Int64",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Long getRevenue();
+
+ @Override
+ void setRevenue(java.lang.Long _revenue);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ @Override
+ void setName(java.lang.String _name);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Address",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address getAddress();
+
+ @Override
+ void
+ setAddress(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _address);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "StockExchange",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getStockExchange();
+
+ void setStockExchange(java.lang.String _stockExchange);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Employees",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Employee",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "Employees",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection
+ getEmployees();
+
+ @Override
+ void
+ setEmployees(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection _employees);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "VipCustomer",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Customer",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "VipCustomer",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer
+ getVipCustomer();
+
+ @Override
+ void
+ setVipCustomer(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer _vipCustomer);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Departments",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Department",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "Departments",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection
+ getDepartments();
+
+ @Override
+ void
+ setDepartments(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection _departments);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "CoreDepartment",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Department",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "Departments",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department
+ getCoreDepartment();
+
+ @Override
+ void
+ setCoreDepartment(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department _coreDepartment);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Club",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Club",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "",
+ targetEntitySet = "",
+ containsTarget = true)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Club getClub();
+
+ void setClub(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Club _club);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "LabourUnion",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.LabourUnion",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "LabourUnion",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnion
+ getLabourUnion();
+
+ void
+ setLabourUnion(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnion _labourUnion);
+
+ @Override
+ Operations operations();
+
+ interface Operations
+ extends
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company.Operations {
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Assets",
- type = "Microsoft.Test.OData.Services.ODataWCFService.LabourUnion",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "LabourUnion",
- containsTarget = true)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PublicCompany.Assets getAssets();
- void setAssets(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PublicCompany.Assets _assets);
+ }
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory
+ extends
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company.ComplexFactory {
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address
+ newAddress();
+
+ }
-
- @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Assets", contained = true)
- interface Assets
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Asset, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AssetCollection> {
+ @Override
+ Annotations annotations();
+
+ interface Annotations
+ extends
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CompanyID",
+ type = "Edm.Int32")
+ Annotatable getCompanyIDAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CompanyCategory",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.CompanyCategory")
+ Annotatable getCompanyCategoryAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Revenue",
+ type = "Edm.Int64")
+ Annotatable getRevenueAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Address",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
+ Annotatable getAddressAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "StockExchange",
+ type = "Edm.String")
+ Annotatable getStockExchangeAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Employees",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Employee")
+ Annotatable getEmployeesAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "VipCustomer",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Customer")
+ Annotatable getVipCustomerAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Departments",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Department")
+ Annotatable getDepartmentsAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "CoreDepartment",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Department")
+ Annotatable getCoreDepartmentAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Assets",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Asset")
+ Annotatable getAssetsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Club",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Club")
+ Annotatable getClubAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "LabourUnion",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.LabourUnion")
+ Annotatable getLabourUnionAnnotations();
+ }
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Assets",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.LabourUnion",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "LabourUnion",
+ containsTarget = true)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PublicCompany.Assets
+ getAssets();
+
+ void
+ setAssets(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PublicCompany.Assets _assets);
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Asset newAsset();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AssetCollection newAssetCollection();
- }
+ @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Assets", contained = true)
+ interface Assets
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Asset, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AssetCollection> {
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Asset newAsset();
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AssetCollection
+ newAssetCollection();
}
+
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java
index 8ebe7ef..edae2ae 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface PublicCompanyCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PublicCompany> {
+public interface PublicCompanyCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PublicCompany> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java
index fdc4156..3356c13 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java
@@ -1,186 +1,150 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Statement",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Statement
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "StatementID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getStatementID();
-
- void setStatementID(java.lang.Integer _statementID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TransactionType",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getTransactionType();
-
- void setTransactionType(java.lang.String _transactionType);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TransactionDescription",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getTransactionDescription();
-
- void setTransactionDescription(java.lang.String _transactionDescription);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Amount",
- type = "Edm.Double",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Double getAmount();
-
- void setAmount(java.lang.Double _amount);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "StatementID",
- type = "Edm.Int32")
- Annotatable getStatementIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TransactionType",
- type = "Edm.String")
- Annotatable getTransactionTypeAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TransactionDescription",
- type = "Edm.String")
- Annotatable getTransactionDescriptionAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Amount",
- type = "Edm.Double")
- Annotatable getAmountAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Statement
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "StatementID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getStatementID();
+
+ void setStatementID(java.lang.Integer _statementID);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TransactionType",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getTransactionType();
+
+ void setTransactionType(java.lang.String _transactionType);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TransactionDescription",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getTransactionDescription();
+
+ void setTransactionDescription(java.lang.String _transactionDescription);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Amount",
+ type = "Edm.Double",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Double getAmount();
+
+ void setAmount(java.lang.Double _amount);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "StatementID",
+ type = "Edm.Int32")
+ Annotatable getStatementIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TransactionType",
+ type = "Edm.String")
+ Annotatable getTransactionTypeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TransactionDescription",
+ type = "Edm.String")
+ Annotatable getTransactionDescriptionAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Amount",
+ type = "Edm.Double")
+ Annotatable getAmountAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java
index fb9b0a9..59d1955 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface StatementCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Statement> {
+public interface StatementCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Statement> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java
index 699bf10..33532dd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java
@@ -1,186 +1,150 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "StoredPI",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface StoredPI
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "StoredPIID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getStoredPIID();
-
- void setStoredPIID(java.lang.Integer _storedPIID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PIName",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getPIName();
-
- void setPIName(java.lang.String _pIName);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PIType",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getPIType();
-
- void setPIType(java.lang.String _pIType);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CreatedDate",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getCreatedDate();
-
- void setCreatedDate(java.util.Calendar _createdDate);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "StoredPIID",
- type = "Edm.Int32")
- Annotatable getStoredPIIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PIName",
- type = "Edm.String")
- Annotatable getPINameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PIType",
- type = "Edm.String")
- Annotatable getPITypeAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CreatedDate",
- type = "Edm.DateTimeOffset")
- Annotatable getCreatedDateAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface StoredPI
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "StoredPIID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getStoredPIID();
+
+ void setStoredPIID(java.lang.Integer _storedPIID);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PIName",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getPIName();
+
+ void setPIName(java.lang.String _pIName);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PIType",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getPIType();
+
+ void setPIType(java.lang.String _pIType);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CreatedDate",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getCreatedDate();
+
+ void setCreatedDate(java.util.Calendar _createdDate);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "StoredPIID",
+ type = "Edm.Int32")
+ Annotatable getStoredPIIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PIName",
+ type = "Edm.String")
+ Annotatable getPINameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PIType",
+ type = "Edm.String")
+ Annotatable getPITypeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CreatedDate",
+ type = "Edm.DateTimeOffset")
+ Annotatable getCreatedDateAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java
index e4d71dc..6372cef 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface StoredPICollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI> {
+public interface StoredPICollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java
index a5dd8cf..4ba4eba 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java
@@ -1,213 +1,176 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Subscription",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Subscription
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SubscriptionID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getSubscriptionID();
-
- void setSubscriptionID(java.lang.Integer _subscriptionID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TemplateGuid",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getTemplateGuid();
-
- void setTemplateGuid(java.lang.String _templateGuid);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Title",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getTitle();
-
- void setTitle(java.lang.String _title);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Category",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getCategory();
-
- void setCategory(java.lang.String _category);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CreatedDate",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getCreatedDate();
-
- void setCreatedDate(java.util.Calendar _createdDate);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "SubscriptionID",
- type = "Edm.Int32")
- Annotatable getSubscriptionIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TemplateGuid",
- type = "Edm.String")
- Annotatable getTemplateGuidAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Title",
- type = "Edm.String")
- Annotatable getTitleAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Category",
- type = "Edm.String")
- Annotatable getCategoryAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CreatedDate",
- type = "Edm.DateTimeOffset")
- Annotatable getCreatedDateAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Subscription
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SubscriptionID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getSubscriptionID();
+
+ void setSubscriptionID(java.lang.Integer _subscriptionID);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TemplateGuid",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getTemplateGuid();
+
+ void setTemplateGuid(java.lang.String _templateGuid);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Title",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getTitle();
+
+ void setTitle(java.lang.String _title);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Category",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getCategory();
+
+ void setCategory(java.lang.String _category);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CreatedDate",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getCreatedDate();
+
+ void setCreatedDate(java.util.Calendar _createdDate);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "SubscriptionID",
+ type = "Edm.Int32")
+ Annotatable getSubscriptionIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TemplateGuid",
+ type = "Edm.String")
+ Annotatable getTemplateGuidAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Title",
+ type = "Edm.String")
+ Annotatable getTitleAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Category",
+ type = "Edm.String")
+ Annotatable getCategoryAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CreatedDate",
+ type = "Edm.DateTimeOffset")
+ Annotatable getCreatedDateAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java
index 41bfc0b..eafc44c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface SubscriptionCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription> {
+public interface SubscriptionCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java
index 1b20c6b..a310a98 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
[06/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/AbstractTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/AbstractTestITCase.java
index 6e694e2..a26e4b6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/AbstractTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/AbstractTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -71,7 +71,7 @@ import org.junit.BeforeClass;
public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
protected static final FullQualifiedName TEST_PRODUCT_TYPE =
- new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService.Product");
+ new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService.Product");
protected static ODataClient client;
@@ -95,7 +95,7 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
testOpenTypeServiceRootURL = "http://localhost:9080/stub/StaticService/V30/OpenType.svc";
testLargeModelServiceRootURL = "http://localhost:9080/stub/StaticService/V30/Static.svc/large";
testAuthServiceRootURL = "http://localhost:9080/stub/DefaultService.svc/V30/Static.svc";
-
+
client.getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
}
@@ -119,9 +119,9 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
for (ODataLink actualLink : actual) {
if (actualLink.getType() == originalLink.getType()
- && (originalLink.getLink() == null
- || actualLink.getLink().toASCIIString().endsWith(originalLink.getLink().toASCIIString()))
- && actualLink.getName().equals(originalLink.getName())) {
+ && (originalLink.getLink() == null
+ || actualLink.getLink().toASCIIString().endsWith(originalLink.getLink().toASCIIString()))
+ && actualLink.getName().equals(originalLink.getName())) {
foundOriginal = originalLink;
foundActual = actualLink;
@@ -144,7 +144,7 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
}
protected void checkProperties(final Collection<? extends CommonODataProperty> original,
- final Collection<? extends CommonODataProperty> actual) {
+ final Collection<? extends CommonODataProperty> actual) {
assertTrue(original.size() <= actual.size());
@@ -175,23 +175,23 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
}
protected void checkPropertyValue(final String propertyName,
- final ODataValue original, final ODataValue actual) {
+ final ODataValue original, final ODataValue actual) {
assertNotNull("Null original value for " + propertyName, original);
assertNotNull("Null actual value for " + propertyName, actual);
assertEquals("Type mismatch for '" + propertyName + "': "
- + original.getClass().getSimpleName() + "-" + actual.getClass().getSimpleName(),
- original.getClass().getSimpleName(), actual.getClass().getSimpleName());
+ + original.getClass().getSimpleName() + "-" + actual.getClass().getSimpleName(),
+ original.getClass().getSimpleName(), actual.getClass().getSimpleName());
if (original.isComplex()) {
final List<ODataProperty> originalFileds = new ArrayList<ODataProperty>();
- for (ODataProperty prop : original.<ODataProperty>asComplex()) {
+ for (ODataProperty prop : original.<ODataProperty> asComplex()) {
originalFileds.add(prop);
}
final List<ODataProperty> actualFileds = new ArrayList<ODataProperty>();
- for (ODataProperty prop : actual.<ODataProperty>asComplex()) {
+ for (ODataProperty prop : actual.<ODataProperty> asComplex()) {
actualFileds.add(prop);
}
@@ -215,81 +215,81 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
assertTrue("Found " + actual + " but expected " + original, found);
} else {
assertTrue("Primitive value for '" + propertyName + "' type mismatch: " + original.asPrimitive().
- getTypeKind() + "-" + actual.asPrimitive().getTypeKind(),
- original.asPrimitive().getTypeKind().equals(actual.asPrimitive().getTypeKind()));
+ getTypeKind() + "-" + actual.asPrimitive().getTypeKind(),
+ original.asPrimitive().getTypeKind().equals(actual.asPrimitive().getTypeKind()));
assertEquals("Primitive value for '" + propertyName + "' mismatch: " + original.asPrimitive().toString()
- + "-" + actual.asPrimitive().toString(),
- original.asPrimitive().toString(), actual.asPrimitive().toString());
+ + "-" + actual.asPrimitive().toString(),
+ original.asPrimitive().toString(), actual.asPrimitive().toString());
}
}
protected ODataEntity getSampleCustomerInfo(final String sampleinfo) {
final ODataEntity entity = getClient().getObjectFactory().newEntity(new FullQualifiedName(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo"));
+ "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo"));
entity.setMediaEntity(true);
getClient().getBinder().add(entity,
- getClient().getObjectFactory().newPrimitiveProperty("Information",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildString(sampleinfo)));
+ getClient().getObjectFactory().newPrimitiveProperty("Information",
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildString(sampleinfo)));
return entity;
}
protected ODataEntity getSampleCustomerProfile(
- final int id, final String sampleName, final boolean withInlineInfo) {
+ final int id, final String sampleName, final boolean withInlineInfo) {
final ODataEntity entity = getClient().getObjectFactory().
- newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService.Customer"));
+ newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService.Customer"));
// add name attribute
getClient().getBinder().add(entity,
- getClient().getObjectFactory().newPrimitiveProperty("Name",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildString(sampleName)));
+ getClient().getObjectFactory().newPrimitiveProperty("Name",
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildString(sampleName)));
// add key attribute
getClient().getBinder().add(entity,
- getClient().getObjectFactory().newPrimitiveProperty("CustomerId",
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
+ getClient().getObjectFactory().newPrimitiveProperty("CustomerId",
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
// add BackupContactInfo attribute (collection)
final ODataCollectionValue<ODataValue> backupContactInfoValue = getClient().getObjectFactory().newCollectionValue(
- "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)");
+ "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)");
getClient().getBinder().add(entity,
- getClient().getObjectFactory().newCollectionProperty("BackupContactInfo", backupContactInfoValue));
+ getClient().getObjectFactory().newCollectionProperty("BackupContactInfo", backupContactInfoValue));
// add BackupContactInfo.ContactDetails attribute (complex)
final ODataComplexValue<ODataProperty> contactDetails = getClient().getObjectFactory().newComplexValue(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails");
+ "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails");
backupContactInfoValue.add(contactDetails);
// add BackupContactInfo.ContactDetails.AlternativeNames attribute (collection)
final ODataCollectionValue<ODataValue> altNamesValue = getClient().getObjectFactory().
- newCollectionValue("Collection(Edm.String)");
+ newCollectionValue("Collection(Edm.String)");
altNamesValue.add(getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("myname"));
contactDetails.add(getClient().getObjectFactory().newCollectionProperty("AlternativeNames", altNamesValue));
// add BackupContactInfo.ContactDetails.EmailBag attribute (collection)
final ODataCollectionValue<ODataValue> emailBagValue = getClient().getObjectFactory().
- newCollectionValue("Collection(Edm.String)");
+ newCollectionValue("Collection(Edm.String)");
emailBagValue.add(getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("myname@mydomain.com"));
contactDetails.add(getClient().getObjectFactory().newCollectionProperty("EmailBag", emailBagValue));
// add BackupContactInfo.ContactDetails.ContactAlias attribute (complex)
final ODataComplexValue<ODataProperty> contactAliasValue = getClient().getObjectFactory().newComplexValue(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases");
+ "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases");
contactDetails.add(getClient().getObjectFactory().newComplexProperty("ContactAlias", contactAliasValue));
// add BackupContactInfo.ContactDetails.ContactAlias.AlternativeNames attribute (collection)
final ODataCollectionValue<ODataValue> aliasAltNamesValue = getClient().getObjectFactory().
- newCollectionValue("Collection(Edm.String)");
+ newCollectionValue("Collection(Edm.String)");
aliasAltNamesValue.add(getClient().getObjectFactory().newPrimitiveValueBuilder().buildString("myAlternativeName"));
contactAliasValue.add(getClient().getObjectFactory().newCollectionProperty("AlternativeNames", aliasAltNamesValue));
if (withInlineInfo) {
final ODataInlineEntity inlineInfo = getClient().getObjectFactory().newDeepInsertEntity(
- "Info",
- getSampleCustomerInfo(sampleName + "_Info"));
+ "Info",
+ getSampleCustomerInfo(sampleName + "_Info"));
inlineInfo.getEntity().setMediaEntity(true);
entity.addLink(inlineInfo);
}
@@ -299,7 +299,7 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
protected String getETag(final URI uri) {
final ODataRetrieveResponse<ODataEntity> res = getClient().getRetrieveRequestFactory().
- getEntityRequest(uri).execute();
+ getEntityRequest(uri).execute();
try {
return res.getETag();
} finally {
@@ -309,7 +309,7 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
protected ODataEntity read(final ODataFormat format, final URI editLink) {
final ODataEntityRequest<ODataEntity> req = getClient().getRetrieveRequestFactory().
- getEntityRequest(editLink);
+ getEntityRequest(editLink);
req.setFormat(format);
final ODataRetrieveResponse<ODataEntity> res = req.execute();
@@ -325,18 +325,18 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
}
protected ODataEntity createEntity(
- final String serviceRootURL,
- final ODataFormat format,
- final ODataEntity original,
- final String entitySetName) {
+ final String serviceRootURL,
+ final ODataFormat format,
+ final ODataEntity original,
+ final String entitySetName) {
final URIBuilder uriBuilder = getClient().newURIBuilder(serviceRootURL).
- appendEntitySetSegment(entitySetName);
+ appendEntitySetSegment(entitySetName);
debugODataEntity(original, "About to create");
final ODataEntityCreateRequest<ODataEntity> createReq =
- getClient().getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), original);
+ getClient().getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), original);
createReq.setFormat(format);
final ODataEntityCreateResponse<ODataEntity> createRes = createReq.execute();
@@ -352,13 +352,13 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
}
protected ODataEntity compareEntities(final String serviceRootURL,
- final ODataFormat format,
- final ODataEntity original,
- final int actualObjectId,
- final Collection<String> expands) {
+ final ODataFormat format,
+ final ODataEntity original,
+ final int actualObjectId,
+ final Collection<String> expands) {
final URIBuilder uriBuilder = getClient().newURIBuilder(serviceRootURL).
- appendEntitySetSegment("Customer").appendKeySegment(actualObjectId);
+ appendEntitySetSegment("Customer").appendKeySegment(actualObjectId);
// search expanded
if (expands != null) {
@@ -368,7 +368,7 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
}
final ODataEntityRequest<ODataEntity> req = getClient().getRetrieveRequestFactory().
- getEntityRequest(uriBuilder.build());
+ getEntityRequest(uriBuilder.build());
req.setFormat(format);
final ODataRetrieveResponse<ODataEntity> res = req.execute();
@@ -389,10 +389,10 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
}
protected void cleanAfterCreate(
- final ODataFormat format,
- final ODataEntity created,
- final boolean includeInline,
- final String baseUri) {
+ final ODataFormat format,
+ final ODataEntity created,
+ final boolean includeInline,
+ final String baseUri) {
final Set<URI> toBeDeleted = new HashSet<URI>();
toBeDeleted.add(created.getEditLink());
@@ -429,7 +429,7 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
deleteRes.close();
final ODataEntityRequest<ODataEntity> retrieveReq = getClient().getRetrieveRequestFactory().
- getEntityRequest(link);
+ getEntityRequest(link);
// bug that needs to be fixed on the SampleService - cannot get entity not found with header
// Accept: application/json;odata=minimalmetadata
retrieveReq.setFormat(format == ODataFormat.JSON_FULL_METADATA ? ODataFormat.JSON : format);
@@ -447,13 +447,13 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
}
protected void updateEntityDescription(
- final ODataFormat format, final ODataEntity changes, final UpdateType type) {
+ final ODataFormat format, final ODataEntity changes, final UpdateType type) {
updateEntityDescription(format, changes, type, null);
}
protected void updateEntityDescription(
- final ODataFormat format, final ODataEntity changes, final UpdateType type, final String etag) {
+ final ODataFormat format, final ODataEntity changes, final UpdateType type, final String etag) {
updateEntityStringProperty("Description", format, changes, type, etag);
}
@@ -478,8 +478,8 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
assertNotEquals(newm, oldm);
getClient().getBinder().add(changes,
- getClient().getObjectFactory().newPrimitiveProperty(propertyName,
- getClient().getObjectFactory().newPrimitiveValueBuilder().buildString(newm)));
+ getClient().getObjectFactory().newPrimitiveProperty(propertyName,
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildString(newm)));
update(type, changes, format, etag);
@@ -501,7 +501,7 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
final UpdateType type, final ODataEntity changes, final ODataFormat format, final String etag) {
final ODataEntityUpdateRequest<ODataEntity> req =
- getClient().getCUDRequestFactory().getEntityUpdateRequest(type, changes);
+ getClient().getCUDRequestFactory().getEntityUpdateRequest(type, changes);
if (getClient().getConfiguration().isUseXHTTPMethod()) {
assertEquals(HttpMethod.POST, req.getMethod());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/ActionOverloadingTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/ActionOverloadingTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/ActionOverloadingTestITCase.java
index d9e617b..7f607c3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/ActionOverloadingTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/ActionOverloadingTestITCase.java
@@ -1,28 +1,29 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.fit.v3;
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import java.util.LinkedHashMap;
import java.util.Map;
+
import org.apache.olingo.client.api.communication.request.invoke.ODataNoContent;
import org.apache.olingo.client.api.communication.response.ODataInvokeResponse;
import org.apache.olingo.client.api.uri.v3.URIBuilder;
@@ -41,23 +42,23 @@ public class ActionOverloadingTestITCase extends AbstractTestITCase {
// 1. unbound
final URIBuilder builder = getClient().newURIBuilder(testActionOverloadingServiceRootURL).
- appendOperationCallSegment(actionImportName);
+ appendOperationCallSegment(actionImportName);
final ODataInvokeResponse<ODataProperty> unboundRes = getClient().getInvokeRequestFactory().
- getActionInvokeRequest(builder.build(), ODataProperty.class).execute();
+ getActionInvokeRequest(builder.build(), ODataProperty.class).execute();
assertNotNull(unboundRes);
assertEquals(200, unboundRes.getStatusCode());
assertEquals(Integer.valueOf(-10), unboundRes.getBody().getPrimitiveValue().toCastValue(Integer.class));
// 2. bound to Product
final ODataEntity product = getClient().getRetrieveRequestFactory().getEntityRequest(
- getClient().newURIBuilder(testActionOverloadingServiceRootURL).
+ getClient().newURIBuilder(testActionOverloadingServiceRootURL).
appendEntitySetSegment("Product").appendKeySegment(-10).build()).
- execute().getBody();
+ execute().getBody();
assertNotNull(product);
final ODataInvokeResponse<ODataProperty> productBoundRes = getClient().getInvokeRequestFactory().
- getActionInvokeRequest(product.getOperation(actionImportName).getTarget(), ODataProperty.class).
- execute();
+ getActionInvokeRequest(product.getOperation(actionImportName).getTarget(), ODataProperty.class).
+ execute();
assertNotNull(productBoundRes);
assertEquals(200, productBoundRes.getStatusCode());
assertEquals(Integer.valueOf(-10), productBoundRes.getBody().getPrimitiveValue().toCastValue(Integer.class));
@@ -67,14 +68,14 @@ public class ActionOverloadingTestITCase extends AbstractTestITCase {
key.put("OrderId", -10);
key.put("ProductId", -10);
final ODataEntity orderLine = getClient().getRetrieveRequestFactory().getEntityRequest(
- getClient().newURIBuilder(testActionOverloadingServiceRootURL).
+ getClient().newURIBuilder(testActionOverloadingServiceRootURL).
appendEntitySetSegment("OrderLine").appendKeySegment(key).build()).
- execute().getBody();
+ execute().getBody();
assertNotNull(orderLine);
final ODataInvokeResponse<ODataProperty> orderLineBoundRes = getClient().getInvokeRequestFactory().
- getActionInvokeRequest(orderLine.getOperation(actionImportName).getTarget(), ODataProperty.class).
- execute();
+ getActionInvokeRequest(orderLine.getOperation(actionImportName).getTarget(), ODataProperty.class).
+ execute();
assertNotNull(orderLineBoundRes);
assertEquals(200, orderLineBoundRes.getStatusCode());
assertEquals(Integer.valueOf(-10), orderLineBoundRes.getBody().getPrimitiveValue().toCastValue(Integer.class));
@@ -89,29 +90,29 @@ public class ActionOverloadingTestITCase extends AbstractTestITCase {
// 1. bound to employees
final URIBuilder employeeBuilder = getClient().newURIBuilder(testActionOverloadingServiceRootURL).
- appendEntitySetSegment("Person").
- appendDerivedEntityTypeSegment("Microsoft.Test.OData.Services.AstoriaDefaultService.Employee");
+ appendEntitySetSegment("Person").
+ appendDerivedEntityTypeSegment("Microsoft.Test.OData.Services.AstoriaDefaultService.Employee");
final ODataEntitySet employees = getClient().getRetrieveRequestFactory().getEntitySetRequest(
- employeeBuilder.build()).execute().getBody();
+ employeeBuilder.build()).execute().getBody();
assertNotNull(employees);
final ODataInvokeResponse<ODataNoContent> employeeRes = getClient().getInvokeRequestFactory().
- getActionInvokeRequest(employeeBuilder.appendOperationCallSegment(actionImportName).build(),
- ODataNoContent.class, parameters).execute();
+ getActionInvokeRequest(employeeBuilder.appendOperationCallSegment(actionImportName).build(),
+ ODataNoContent.class, parameters).execute();
assertNotNull(employeeRes);
assertEquals(204, employeeRes.getStatusCode());
// 2. bound to special employees
final URIBuilder specEmpBuilder = getClient().newURIBuilder(testActionOverloadingServiceRootURL).
- appendEntitySetSegment("Person").
- appendDerivedEntityTypeSegment("Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee");
+ appendEntitySetSegment("Person").
+ appendDerivedEntityTypeSegment("Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee");
final ODataEntitySet specEmps = getClient().getRetrieveRequestFactory().getEntitySetRequest(
- specEmpBuilder.build()).execute().getBody();
+ specEmpBuilder.build()).execute().getBody();
assertNotNull(specEmps);
final ODataInvokeResponse<ODataNoContent> specEmpsRes = getClient().getInvokeRequestFactory().
- getActionInvokeRequest(specEmpBuilder.appendOperationCallSegment(actionImportName).build(),
- ODataNoContent.class, parameters).execute();
+ getActionInvokeRequest(specEmpBuilder.appendOperationCallSegment(actionImportName).build(),
+ ODataNoContent.class, parameters).execute();
assertNotNull(specEmpsRes);
assertEquals(204, specEmpsRes.getStatusCode());
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/AsyncTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/AsyncTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/AsyncTestITCase.java
index 1482545..254782a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/AsyncTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/AsyncTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -26,6 +26,7 @@ import java.io.InputStream;
import java.net.URI;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
+
import org.apache.commons.io.IOUtils;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest;
import org.apache.olingo.client.api.communication.request.cud.v3.UpdateType;
@@ -45,9 +46,9 @@ public class AsyncTestITCase extends AbstractTestITCase {
@Test
public void retrieveEntitySet() throws InterruptedException, ExecutionException {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Product");
+ appendEntitySetSegment("Product");
final Future<ODataRetrieveResponse<ODataEntitySet>> futureRes =
- client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build()).asyncExecute();
+ client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build()).asyncExecute();
assertNotNull(futureRes);
while (!futureRes.isDone()) {
@@ -63,10 +64,10 @@ public class AsyncTestITCase extends AbstractTestITCase {
@Test
public void updateEntity() throws InterruptedException, ExecutionException {
final URI uri = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Product").appendKeySegment(-10).build();
+ appendEntitySetSegment("Product").appendKeySegment(-10).build();
final ODataRetrieveResponse<ODataEntity> entityRes = client.getRetrieveRequestFactory().
- getEntityRequest(uri).execute();
+ getEntityRequest(uri).execute();
final ODataEntity entity = entityRes.getBody();
entity.getAssociationLinks().clear();
entity.getNavigationLinks().clear();
@@ -74,11 +75,11 @@ public class AsyncTestITCase extends AbstractTestITCase {
entity.getProperties().remove(entity.getProperty("Description"));
getClient().getBinder().add(entity,
- client.getObjectFactory().newPrimitiveProperty("Description",
+ client.getObjectFactory().newPrimitiveProperty("Description",
client.getObjectFactory().newPrimitiveValueBuilder().setValue("AsyncTest#updateEntity").build()));
final ODataEntityUpdateRequest<ODataEntity> updateReq =
- client.getCUDRequestFactory().getEntityUpdateRequest(uri, UpdateType.MERGE, entity);
+ client.getCUDRequestFactory().getEntityUpdateRequest(uri, UpdateType.MERGE, entity);
updateReq.setIfMatch(entityRes.getETag());
final Future<ODataEntityUpdateResponse<ODataEntity>> futureRes = updateReq.asyncExecute();
@@ -99,7 +100,7 @@ public class AsyncTestITCase extends AbstractTestITCase {
final InputStream input = IOUtils.toInputStream(TO_BE_UPDATED);
final ODataMediaEntityCreateRequest<ODataEntity> createReq =
- client.getCUDRequestFactory().getMediaEntityCreateRequest(builder.build(), input);
+ client.getCUDRequestFactory().getMediaEntityCreateRequest(builder.build(), input);
final MediaEntityCreateStreamManager<ODataEntity> streamManager = createReq.payloadManager();
final Future<ODataMediaEntityCreateResponse<ODataEntity>> futureCreateRes = streamManager.getAsyncResponse();
@@ -116,8 +117,8 @@ public class AsyncTestITCase extends AbstractTestITCase {
assertEquals(2, created.getProperties().size());
final int id = "VIN".equals(created.getProperties().get(0).getName())
- ? created.getProperties().get(0).getPrimitiveValue().toCastValue(Integer.class)
- : created.getProperties().get(1).getPrimitiveValue().toCastValue(Integer.class);
+ ? created.getProperties().get(0).getPrimitiveValue().toCastValue(Integer.class)
+ : created.getProperties().get(1).getPrimitiveValue().toCastValue(Integer.class);
builder = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car").appendKeySegment(id);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/AuthEntityRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/AuthEntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/AuthEntityRetrieveTestITCase.java
index a991de1..cdb9ded 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/AuthEntityRetrieveTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/AuthEntityRetrieveTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java
index 88bbfb9..ea38100 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -114,16 +114,16 @@ public class BatchTestITCase extends AbstractTestITCase {
for (int i = 1; i <= 2; i++) {
// Create Customer into the changeset
createReq = client.getCUDRequestFactory().getEntityCreateRequest(
- targetURI.build(),
- getSampleCustomerProfile(100 + i, "Sample customer", false));
+ targetURI.build(),
+ getSampleCustomerProfile(100 + i, "Sample customer", false));
createReq.setFormat(ODataFormat.JSON);
changeset.addRequest(createReq);
}
targetURI = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("WrongEntitySet");
createReq = client.getCUDRequestFactory().getEntityCreateRequest(
- targetURI.build(),
- getSampleCustomerProfile(105, "Sample customer", false));
+ targetURI.build(),
+ getSampleCustomerProfile(105, "Sample customer", false));
createReq.setFormat(ODataFormat.JSON);
changeset.addRequest(createReq);
@@ -131,8 +131,8 @@ public class BatchTestITCase extends AbstractTestITCase {
for (int i = 3; i <= 4; i++) {
// Create Customer into the changeset
createReq = client.getCUDRequestFactory().getEntityCreateRequest(
- targetURI.build(),
- getSampleCustomerProfile(100 + i, "Sample customer", false));
+ targetURI.build(),
+ getSampleCustomerProfile(100 + i, "Sample customer", false));
createReq.setFormat(ODataFormat.ATOM);
changeset.addRequest(createReq);
}
@@ -148,7 +148,7 @@ public class BatchTestITCase extends AbstractTestITCase {
assertEquals(404, res.getStatusCode());
assertEquals("Not Found", res.getStatusMessage());
assertEquals(Integer.valueOf(3), Integer.valueOf(
- res.getHeader(ODataBatchConstants.CHANGESET_CONTENT_ID_NAME).iterator().next()));
+ res.getHeader(ODataBatchConstants.CHANGESET_CONTENT_ID_NAME).iterator().next()));
assertFalse(chgResponseItem.hasNext());
}
@@ -166,7 +166,7 @@ public class BatchTestITCase extends AbstractTestITCase {
// add create request
final ODataEntityCreateRequest<ODataEntity> createReq =
- client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), customer);
+ client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), customer);
changeset.addRequest(createReq);
@@ -176,12 +176,12 @@ public class BatchTestITCase extends AbstractTestITCase {
// add update request: link CustomerInfo(17) to the new customer
final ODataEntity customerChanges = client.getObjectFactory().newEntity(customer.getTypeName());
customerChanges.addLink(client.getObjectFactory().newEntityNavigationLink(
- "Info",
- client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("CustomerInfo").
+ "Info",
+ client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("CustomerInfo").
appendKeySegment(17).build()));
final ODataEntityUpdateRequest<ODataEntity> updateReq = client.getCUDRequestFactory().getEntityUpdateRequest(
- URI.create("$" + createRequestRef), UpdateType.PATCH, customerChanges);
+ URI.create("$" + createRequestRef), UpdateType.PATCH, customerChanges);
changeset.addRequest(updateReq);
@@ -204,10 +204,10 @@ public class BatchTestITCase extends AbstractTestITCase {
customer = ((ODataEntityCreateResponse<ODataEntity>) res).getBody();
ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(
- URIUtils.getURI(testStaticServiceRootURL, customer.getEditLink().toASCIIString() + "/Info"));
+ URIUtils.getURI(testStaticServiceRootURL, customer.getEditLink().toASCIIString() + "/Info"));
assertEquals(Integer.valueOf(17),
- req.execute().getBody().getProperty("CustomerInfoId").getPrimitiveValue().toCastValue(Integer.class));
+ req.execute().getBody().getProperty("CustomerInfoId").getPrimitiveValue().toCastValue(Integer.class));
res = chgitem.next();
assertEquals(204, res.getStatusCode());
@@ -215,13 +215,13 @@ public class BatchTestITCase extends AbstractTestITCase {
// clean ...
assertEquals(204, client.getCUDRequestFactory().getDeleteRequest(
- URIUtils.getURI(testStaticServiceRootURL, customer.getEditLink().toASCIIString())).execute().
- getStatusCode());
+ URIUtils.getURI(testStaticServiceRootURL, customer.getEditLink().toASCIIString())).execute().
+ getStatusCode());
try {
client.getRetrieveRequestFactory().getEntityRequest(
- URIUtils.getURI(testStaticServiceRootURL, customer.getEditLink().toASCIIString())).
- execute().getBody();
+ URIUtils.getURI(testStaticServiceRootURL, customer.getEditLink().toASCIIString())).
+ execute().getBody();
fail();
} catch (Exception e) {
// ignore
@@ -238,16 +238,16 @@ public class BatchTestITCase extends AbstractTestITCase {
final ODataChangeset changeset = streamManager.addChangeset();
final ODataEntity info =
- client.getObjectFactory().newEntity(
+ client.getObjectFactory().newEntity(
new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo"));
info.getProperties().add(client.getObjectFactory().newPrimitiveProperty("Information",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("Sample information about customer 30")));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("Sample information about customer 30")));
URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("CustomerInfo");
ODataEntityCreateRequest<ODataEntity> createReq =
- client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), info);
+ client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), info);
changeset.addRequest(createReq);
@@ -256,7 +256,7 @@ public class BatchTestITCase extends AbstractTestITCase {
ODataEntity customer = getSampleCustomerProfile(30, "sample customer", false);
customer.getNavigationLinks().add(
- client.getObjectFactory().newEntityNavigationLink("Info", URI.create("$" + createRequestRef)));
+ client.getObjectFactory().newEntityNavigationLink("Info", URI.create("$" + createRequestRef)));
uriBuilder = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customer");
@@ -292,12 +292,12 @@ public class BatchTestITCase extends AbstractTestITCase {
uriBuilder = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customer").appendKeySegment(30);
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(
- URIUtils.getURI(testStaticServiceRootURL, uriBuilder.build() + "/Info"));
+ URIUtils.getURI(testStaticServiceRootURL, uriBuilder.build() + "/Info"));
final ODataEntity navigatedInfo = req.execute().getBody();
assertEquals(infoEntity.getProperty("CustomerInfoId").getPrimitiveValue().toCastValue(Integer.class),
- navigatedInfo.getProperty("CustomerInfoId").getPrimitiveValue().toCastValue(Integer.class));
+ navigatedInfo.getProperty("CustomerInfoId").getPrimitiveValue().toCastValue(Integer.class));
}
@Test
@@ -314,7 +314,7 @@ public class BatchTestITCase extends AbstractTestITCase {
// prepare URI
URIBuilder targetURI = client.newURIBuilder(testStaticServiceRootURL);
targetURI.appendEntitySetSegment("Customer").appendKeySegment(-10).
- expand("Logins").select("CustomerId,Logins/Username");
+ expand("Logins").select("CustomerId,Logins/Username");
// create new request
ODataEntityRequest<ODataEntity> queryReq = client.getRetrieveRequestFactory().getEntityRequest(targetURI.build());
@@ -330,18 +330,18 @@ public class BatchTestITCase extends AbstractTestITCase {
// Update Product into the changeset
targetURI = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Product").appendKeySegment(-10);
+ appendEntitySetSegment("Product").appendKeySegment(-10);
final URI editLink = targetURI.build();
final ODataEntity merge = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
merge.setEditLink(editLink);
merge.getProperties().add(client.getObjectFactory().newPrimitiveProperty(
- "Description",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("new description from batch")));
+ "Description",
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("new description from batch")));
final ODataEntityUpdateRequest<?> changeReq =
- client.getCUDRequestFactory().getEntityUpdateRequest(UpdateType.MERGE, merge);
+ client.getCUDRequestFactory().getEntityUpdateRequest(UpdateType.MERGE, merge);
changeReq.setFormat(ODataFormat.JSON_FULL_METADATA);
changeReq.setIfMatch(getETag(editLink));
@@ -351,13 +351,13 @@ public class BatchTestITCase extends AbstractTestITCase {
targetURI = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customer");
final ODataEntity original = getSampleCustomerProfile(1000, "Sample customer", false);
final ODataEntityCreateRequest<ODataEntity> createReq =
- client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), original);
+ client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), original);
createReq.setFormat(ODataFormat.ATOM);
changeset.addRequest(createReq);
// Delete customer created above
targetURI =
- client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customer").appendKeySegment(1000);
+ client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customer").appendKeySegment(1000);
final ODataDeleteRequest deleteReq = client.getCUDRequestFactory().getDeleteRequest(targetURI.build());
changeset.addRequest(deleteReq);
// -------------------------------------------
@@ -368,7 +368,7 @@ public class BatchTestITCase extends AbstractTestITCase {
// prepare URI
targetURI = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Product").appendKeySegment(-10);
+ appendEntitySetSegment("Product").appendKeySegment(-10);
// create new request
queryReq = client.getRetrieveRequestFactory().getEntityRequest(targetURI.build());
@@ -392,7 +392,7 @@ public class BatchTestITCase extends AbstractTestITCase {
assertEquals("OK", res.getStatusMessage());
ODataEntityRequestImpl<ODataEntity>.ODataEntityResponseImpl entres =
- (ODataEntityRequestImpl.ODataEntityResponseImpl) res;
+ (ODataEntityRequestImpl.ODataEntityResponseImpl) res;
ODataEntity entity = entres.getBody();
assertEquals(-10, entity.getProperty("CustomerId").getPrimitiveValue().toCastValue(Integer.class), 0);
@@ -433,7 +433,7 @@ public class BatchTestITCase extends AbstractTestITCase {
entres = (ODataEntityRequestImpl.ODataEntityResponseImpl) res;
entity = entres.getBody();
assertEquals("new description from batch",
- entity.getProperty("Description").getPrimitiveValue().toCastValue(String.class));
+ entity.getProperty("Description").getPrimitiveValue().toCastValue(String.class));
assertFalse(iter.hasNext());
}
@@ -444,13 +444,13 @@ public class BatchTestITCase extends AbstractTestITCase {
super(new Wrapper<Future<HttpResponse>>());
}
- public ODataPayloadManager<ODataBatchResponse> addObject(byte[] src) {
+ public ODataPayloadManager<ODataBatchResponse> addObject(final byte[] src) {
stream(src);
return this;
}
@Override
- protected ODataBatchResponse getResponse(long timeout, TimeUnit unit) {
+ protected ODataBatchResponse getResponse(final long timeout, final TimeUnit unit) {
throw new UnsupportedOperationException("Not supported yet.");
}
};
@@ -492,35 +492,4 @@ public class BatchTestITCase extends AbstractTestITCase {
}
}
}
-
- private static class BatchStreamingThread extends Thread {
-
- private final BatchManager streaming;
-
- public BatchStreamingThread(final BatchManager streaming) {
- this.streaming = streaming;
- }
-
- @Override
- public void run() {
- try {
- final StringBuilder builder = new StringBuilder();
-
- byte[] buff = new byte[1024];
-
- int len;
-
- while ((len = streaming.getBody().read(buff)) >= 0) {
- builder.append(new String(buff, 0, len));
- }
-
- LOG.debug("Batch request {}", builder.toString());
-
- assertTrue(builder.toString().contains("Content-Id:2"));
- assertTrue(builder.toString().contains("GET " + testStaticServiceRootURL));
- } catch (IOException e) {
- fail();
- }
- }
- }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/CountTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/CountTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/CountTestITCase.java
index 673acdf..2faf5cd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/CountTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/CountTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -34,7 +34,7 @@ public class CountTestITCase extends AbstractTestITCase {
@Test
public void entityCount() {
CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Customer").count();
+ appendEntitySetSegment("Customer").count();
final ODataValueRequest req = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
req.setFormat(ODataFormat.TEXT_PLAIN);
try {
@@ -48,7 +48,7 @@ public class CountTestITCase extends AbstractTestITCase {
@Test
public void invalidAccept() {
final CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Customer").count();
+ appendEntitySetSegment("Customer").count();
final ODataValueRequest req = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
req.setFormat(ODataFormat.TEXT_PLAIN);
req.setAccept("application/json;odata=fullmetadata");
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/EntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/EntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/EntityCreateTestITCase.java
index 04fb6c1..afc3954 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/EntityCreateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/EntityCreateTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -93,7 +93,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
createEntity(getServiceRoot(), format, original, "Customer");
final ODataEntity actual =
- compareEntities(getServiceRoot(), format, original, id, Collections.<String>singleton("Info"));
+ compareEntities(getServiceRoot(), format, original, id, Collections.<String> singleton("Info"));
cleanAfterCreate(format, actual, true, getServiceRoot());
}
@@ -107,7 +107,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
createEntity(getServiceRoot(), format, original, "Customer");
final ODataEntity actual =
- compareEntities(getServiceRoot(), format, original, id, Collections.<String>singleton("Info"));
+ compareEntities(getServiceRoot(), format, original, id, Collections.<String> singleton("Info"));
cleanAfterCreate(format, actual, true, getServiceRoot());
}
@@ -119,11 +119,11 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
final ODataEntity original = getSampleCustomerProfile(id, "Sample customer", false);
original.addLink(client.getObjectFactory().newDeepInsertEntity(
- "Info", getSampleCustomerInfo("Sample Customer_Info")));
+ "Info", getSampleCustomerInfo("Sample Customer_Info")));
createEntity(getServiceRoot(), format, original, "Customer");
final ODataEntity actual =
- compareEntities(getServiceRoot(), format, original, id, Collections.<String>singleton("Info"));
+ compareEntities(getServiceRoot(), format, original, id, Collections.<String> singleton("Info"));
boolean found = false;
@@ -146,11 +146,11 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
final ODataEntity original = getSampleCustomerProfile(id, "Sample customer", false);
original.addLink(client.getObjectFactory().newDeepInsertEntity(
- "Info", getSampleCustomerInfo("Sample Customer_Info")));
+ "Info", getSampleCustomerInfo("Sample Customer_Info")));
createEntity(getServiceRoot(), format, original, "Customer");
final ODataEntity actual =
- compareEntities(getServiceRoot(), format, original, id, Collections.<String>singleton("Info"));
+ compareEntities(getServiceRoot(), format, original, id, Collections.<String> singleton("Info"));
boolean found = false;
@@ -227,13 +227,13 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
final ODataEntity original = getSampleCustomerProfile(id, "Sample customer", false);
final ODataEntityCreateRequest<ODataEntity> createReq = client.getCUDRequestFactory().getEntityCreateRequest(
- client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer").build(), original);
+ client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer").build(), original);
createReq.setPrefer(client.newPreferences().returnNoContent());
final ODataEntityCreateResponse<ODataEntity> createRes = createReq.execute();
assertEquals(204, createRes.getStatusCode());
assertEquals(client.newPreferences().returnNoContent(),
- createRes.getHeader(HeaderName.preferenceApplied).iterator().next());
+ createRes.getHeader(HeaderName.preferenceApplied).iterator().next());
try {
createRes.getBody();
@@ -243,8 +243,8 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
}
final ODataDeleteResponse deleteRes = client.getCUDRequestFactory().getDeleteRequest(
- client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer").appendKeySegment(id).build()).
- execute();
+ client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer").appendKeySegment(id).build()).
+ execute();
assertEquals(204, deleteRes.getStatusCode());
}
@@ -255,7 +255,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer");
final ODataEntityCreateRequest<ODataEntity> createReq =
- client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), original);
+ client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), original);
createReq.setFormat(ODataFormat.JSON_FULL_METADATA);
createReq.setContentType(ContentType.APPLICATION_ATOM_XML.getMimeType());
createReq.setPrefer(client.newPreferences().returnContent());
@@ -267,15 +267,15 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
fail(e.getMessage());
} finally {
final ODataDeleteResponse deleteRes = client.getCUDRequestFactory().getDeleteRequest(
- client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer").appendKeySegment(id).
+ client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer").appendKeySegment(id).
build()).
- execute();
+ execute();
assertEquals(204, deleteRes.getStatusCode());
}
}
private ODataEntity createWithFeedNavigationLink(final ODataFormat format, final int id)
- throws EdmPrimitiveTypeException {
+ throws EdmPrimitiveTypeException {
final String sampleName = "Sample customer";
final ODataEntity original = getSampleCustomerProfile(id, sampleName, false);
@@ -286,20 +286,20 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
for (Integer key : keys) {
final ODataEntity order = client.getObjectFactory().
- newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService.Order"));
+ newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService.Order"));
order.getProperties().add(client.getObjectFactory().newPrimitiveProperty("OrderId",
- client.getObjectFactory().newPrimitiveValueBuilder().buildInt32(key)));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildInt32(key)));
order.getProperties().add(client.getObjectFactory().newPrimitiveProperty("CustomerId",
- client.getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
+ client.getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
final ODataEntityCreateRequest<ODataEntity> createReq = client.getCUDRequestFactory().getEntityCreateRequest(
- client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Order").build(), order);
+ client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Order").build(), order);
createReq.setFormat(format);
original.addLink(client.getObjectFactory().newEntitySetNavigationLink(
- "Orders",
- createReq.execute().getBody().getEditLink()));
+ "Orders",
+ createReq.execute().getBody().getEditLink()));
}
final ODataEntity created = createEntity(getServiceRoot(), format, original, "Customer");
@@ -310,7 +310,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
uriBuilder.appendEntitySetSegment("Customer").appendKeySegment(id).appendEntitySetSegment("Orders");
final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
- getEntitySetRequest(uriBuilder.build());
+ getEntitySetRequest(uriBuilder.build());
req.setFormat(format);
final ODataRetrieveResponse<ODataEntitySet> res = req.execute();
@@ -328,7 +328,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
keys.remove(key);
final ODataDeleteRequest deleteReq = client.getCUDRequestFactory().getDeleteRequest(
- URIUtils.getURI(getServiceRoot(), entity.getEditLink().toASCIIString()));
+ URIUtils.getURI(getServiceRoot(), entity.getEditLink().toASCIIString()));
deleteReq.setFormat(format);
assertEquals(204, deleteReq.execute().getStatusCode());
@@ -342,7 +342,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
final ODataEntity original = getSampleCustomerProfile(id, sampleName, false);
original.addLink(client.getObjectFactory().newEntityNavigationLink(
- "Info", URI.create(getServiceRoot() + "/CustomerInfo(12)")));
+ "Info", URI.create(getServiceRoot() + "/CustomerInfo(12)")));
final ODataEntity created = createEntity(getServiceRoot(), format, original, "Customer");
// now, compare the created one with the actual one and go deeply into the associated customer info.....
@@ -375,7 +375,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
}
private ODataEntity createWithBackNavigationLink(final ODataFormat format, final int id)
- throws EdmPrimitiveTypeException {
+ throws EdmPrimitiveTypeException {
final String sampleName = "Sample customer";
@@ -383,48 +383,48 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
customer = createEntity(getServiceRoot(), format, customer, "Customer");
ODataEntity order = client.getObjectFactory().newEntity(new FullQualifiedName(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Order"));
+ "Microsoft.Test.OData.Services.AstoriaDefaultService.Order"));
getClient().getBinder().add(order,
- client.getObjectFactory().newPrimitiveProperty("CustomerId",
- client.getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
+ client.getObjectFactory().newPrimitiveProperty("CustomerId",
+ client.getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
getClient().getBinder().add(order,
- client.getObjectFactory().newPrimitiveProperty("OrderId",
- client.getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
+ client.getObjectFactory().newPrimitiveProperty("OrderId",
+ client.getObjectFactory().newPrimitiveValueBuilder().buildInt32(id)));
order.addLink(client.getObjectFactory().newEntityNavigationLink(
- "Customer", URIUtils.getURI(getServiceRoot(), customer.getEditLink().toASCIIString())));
+ "Customer", URIUtils.getURI(getServiceRoot(), customer.getEditLink().toASCIIString())));
order = createEntity(getServiceRoot(), format, order, "Order");
final ODataEntity changes = client.getObjectFactory().newEntity(new FullQualifiedName(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer"));
+ "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer"));
changes.setEditLink(customer.getEditLink());
changes.addLink(client.getObjectFactory().newEntitySetNavigationLink(
- "Orders", URIUtils.getURI(getServiceRoot(), order.getEditLink().toASCIIString())));
+ "Orders", URIUtils.getURI(getServiceRoot(), order.getEditLink().toASCIIString())));
update(UpdateType.PATCH, changes, format, null);
final ODataEntityRequest<ODataEntity> customerreq = client.getRetrieveRequestFactory().getEntityRequest(
- URIUtils.getURI(getServiceRoot(), order.getEditLink().toASCIIString() + "/Customer"));
+ URIUtils.getURI(getServiceRoot(), order.getEditLink().toASCIIString() + "/Customer"));
customerreq.setFormat(format);
customer = customerreq.execute().getBody();
assertEquals(Integer.valueOf(id),
- customer.getProperty("CustomerId").getPrimitiveValue().toCastValue(Integer.class));
+ customer.getProperty("CustomerId").getPrimitiveValue().toCastValue(Integer.class));
final ODataEntitySetRequest<ODataEntitySet> orderreq = client.getRetrieveRequestFactory().getEntitySetRequest(
- URIUtils.getURI(getServiceRoot(), customer.getEditLink().toASCIIString() + "/Orders"));
+ URIUtils.getURI(getServiceRoot(), customer.getEditLink().toASCIIString() + "/Orders"));
orderreq.setFormat(format);
final ODataRetrieveResponse<ODataEntitySet> orderres = orderreq.execute();
assertEquals(200, orderres.getStatusCode());
assertEquals(Integer.valueOf(id),
- orderres.getBody().getEntities().get(0).getProperty("OrderId").getPrimitiveValue().
+ orderres.getBody().getEntities().get(0).getProperty("OrderId").getPrimitiveValue().
toCastValue(Integer.class));
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(
- URIUtils.getURI(getServiceRoot(), customer.getEditLink().toASCIIString() + "?$expand=Orders"));
+ URIUtils.getURI(getServiceRoot(), customer.getEditLink().toASCIIString() + "?$expand=Orders"));
req.setFormat(format);
customer = req.execute().getBody();
@@ -442,31 +442,31 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
private void multiKey(final ODataFormat format) {
final ODataEntity message = client.getObjectFactory().newEntity(new FullQualifiedName(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Message"));
+ "Microsoft.Test.OData.Services.AstoriaDefaultService.Message"));
getClient().getBinder().add(message,
- client.getObjectFactory().newPrimitiveProperty("MessageId",
- client.getObjectFactory().newPrimitiveValueBuilder().buildInt32(1000)));
+ client.getObjectFactory().newPrimitiveProperty("MessageId",
+ client.getObjectFactory().newPrimitiveValueBuilder().buildInt32(1000)));
getClient().getBinder().add(message,
- client.getObjectFactory().newPrimitiveProperty("FromUsername",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("1")));
+ client.getObjectFactory().newPrimitiveProperty("FromUsername",
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("1")));
getClient().getBinder().add(message,
- client.getObjectFactory().newPrimitiveProperty("ToUsername",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("xlodhxzzusxecbzptxlfxprneoxkn")));
+ client.getObjectFactory().newPrimitiveProperty("ToUsername",
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("xlodhxzzusxecbzptxlfxprneoxkn")));
getClient().getBinder().add(message,
- client.getObjectFactory().newPrimitiveProperty("Subject",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("Test subject")));
+ client.getObjectFactory().newPrimitiveProperty("Subject",
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("Test subject")));
getClient().getBinder().add(message,
- client.getObjectFactory().newPrimitiveProperty("Body",
- client.getObjectFactory().newPrimitiveValueBuilder().buildString("Test body")));
+ client.getObjectFactory().newPrimitiveProperty("Body",
+ client.getObjectFactory().newPrimitiveValueBuilder().buildString("Test body")));
getClient().getBinder().add(message,
- client.getObjectFactory().newPrimitiveProperty("IsRead",
- client.getObjectFactory().newPrimitiveValueBuilder().buildBoolean(false)));
+ client.getObjectFactory().newPrimitiveProperty("IsRead",
+ client.getObjectFactory().newPrimitiveValueBuilder().buildBoolean(false)));
final URIBuilder builder =
- client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Message");
+ client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Message");
final ODataEntityCreateRequest<ODataEntity> req = client.getCUDRequestFactory().
- getEntityCreateRequest(builder.build(), message);
+ getEntityCreateRequest(builder.build(), message);
req.setFormat(format);
final ODataEntityCreateResponse<ODataEntity> res = req.execute();
@@ -478,7 +478,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
multiKey.put("MessageId", 1000);
final ODataDeleteResponse deleteRes = client.getCUDRequestFactory().
- getDeleteRequest(builder.appendKeySegment(multiKey).build()).execute();
+ getDeleteRequest(builder.appendKeySegment(multiKey).build()).execute();
assertEquals(204, deleteRes.getStatusCode());
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/EntityRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/EntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/EntityRetrieveTestITCase.java
index 39fc464..fc30086 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/EntityRetrieveTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/EntityRetrieveTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -57,7 +57,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
private void withInlineEntry(final ODataFormat format) {
final CommonURIBuilder<?> uriBuilder = client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("Customer").appendKeySegment(-10).expand("Info");
+ appendEntitySetSegment("Customer").appendKeySegment(-10).expand("Info");
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setFormat(format);
@@ -85,9 +85,9 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
assertEquals(2, properties.size());
assertTrue(properties.get(0).getName().equals("CustomerInfoId")
- || properties.get(1).getName().equals("CustomerInfoId"));
+ || properties.get(1).getName().equals("CustomerInfoId"));
assertTrue(properties.get(0).getValue().toString().equals("11")
- || properties.get(1).getValue().toString().equals("11"));
+ || properties.get(1).getValue().toString().equals("11"));
found = true;
}
@@ -109,7 +109,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
private void withInlineFeed(final ODataFormat format) {
final CommonURIBuilder<?> uriBuilder = client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("Customer").appendKeySegment(-10).expand("Orders");
+ appendEntitySetSegment("Customer").appendKeySegment(-10).expand("Orders");
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setFormat(format);
@@ -147,7 +147,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
private void rawRequest(final ODataFormat format) {
final CommonURIBuilder<?> uriBuilder = client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("Car").appendKeySegment(16);
+ appendEntitySetSegment("Car").appendKeySegment(16);
final ODataRawRequest req = client.getRetrieveRequestFactory().getRawRequest(uriBuilder.build());
req.setFormat(format.getContentType(client.getServiceVersion()).toContentTypeString());
@@ -179,7 +179,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
multiKey.put("MessageId", -10);
final CommonURIBuilder<?> uriBuilder = client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("Message").appendKeySegment(multiKey);
+ appendEntitySetSegment("Message").appendKeySegment(multiKey);
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setFormat(format);
@@ -212,7 +212,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
private void checkForETag(final ODataFormat format) {
final CommonURIBuilder<?> uriBuilder =
- client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Product").appendKeySegment(-10);
+ client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Product").appendKeySegment(-10);
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setFormat(format);
@@ -241,7 +241,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
private void geospatial(final ODataFormat format) {
final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("AllGeoTypesSet").appendKeySegment(-10);
+ appendEntitySetSegment("AllGeoTypesSet").appendKeySegment(-10);
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
req.setFormat(format);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/EntitySetTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/EntitySetTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/EntitySetTestITCase.java
index 83a0a5a..ff0b5a8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/EntitySetTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/EntitySetTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -103,7 +103,7 @@ public class EntitySetTestITCase extends AbstractTestITCase {
uriBuilder.appendEntitySetSegment("Customer");
final ODataEntitySetRequest<ODataEntitySet> req = client.getRetrieveRequestFactory().
- getEntitySetRequest(uriBuilder.build());
+ getEntitySetRequest(uriBuilder.build());
req.setFormat(format);
final ODataRetrieveResponse<ODataEntitySet> res = req.execute();
@@ -127,7 +127,7 @@ public class EntitySetTestITCase extends AbstractTestITCase {
uriBuilder.appendEntitySetSegment("Customer");
final ODataEntitySetIteratorRequest<ODataEntitySet, ODataEntity> req =
- client.getRetrieveRequestFactory().getEntitySetIteratorRequest(uriBuilder.build());
+ client.getRetrieveRequestFactory().getEntitySetIteratorRequest(uriBuilder.build());
req.setFormat(format);
final ODataRetrieveResponse<ODataEntitySetIterator<ODataEntitySet, ODataEntity>> res = req.execute();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/v3/EntityUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/EntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/EntityUpdateTestITCase.java
index 72f4ed7..8768859 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/EntityUpdateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/EntityUpdateTestITCase.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -50,7 +50,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
public void mergeAsAtom() {
final ODataFormat format = ODataFormat.ATOM;
final URI uri = client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("Product").appendKeySegment(-10).build();
+ appendEntitySetSegment("Product").appendKeySegment(-10).build();
final String etag = getETag(uri);
final ODataEntity merge = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
merge.setEditLink(uri);
@@ -61,7 +61,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
public void mergeAsJSON() {
final ODataFormat format = ODataFormat.JSON_FULL_METADATA;
final URI uri = client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("Product").appendKeySegment(-10).build();
+ appendEntitySetSegment("Product").appendKeySegment(-10).build();
final String etag = getETag(uri);
final ODataEntity merge = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
merge.setEditLink(uri);
@@ -72,7 +72,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
public void patchAsAtom() {
final ODataFormat format = ODataFormat.ATOM;
final URI uri = client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("Product").appendKeySegment(-10).build();
+ appendEntitySetSegment("Product").appendKeySegment(-10).build();
final String etag = getETag(uri);
final ODataEntity patch = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
patch.setEditLink(uri);
@@ -83,7 +83,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
public void patchAsJSON() {
final ODataFormat format = ODataFormat.JSON_FULL_METADATA;
final URI uri = client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("Product").appendKeySegment(-10).build();
+ appendEntitySetSegment("Product").appendKeySegment(-10).build();
final String etag = getETag(uri);
final ODataEntity patch = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
patch.setEditLink(uri);
@@ -94,7 +94,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
public void replaceAsAtom() {
final ODataFormat format = ODataFormat.ATOM;
final ODataEntity changes = read(format, client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("Car").appendKeySegment(14).build());
+ appendEntitySetSegment("Car").appendKeySegment(14).build());
updateEntityDescription(format, changes, UpdateType.REPLACE);
}
@@ -102,7 +102,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
public void replaceAsJSON() {
final ODataFormat format = ODataFormat.JSON_FULL_METADATA;
final ODataEntity changes = read(format, client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("Car").appendKeySegment(14).build());
+ appendEntitySetSegment("Car").appendKeySegment(14).build());
updateEntityDescription(format, changes, UpdateType.REPLACE);
}
@@ -118,24 +118,24 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
public void patchLink(final ODataFormat format) throws EdmPrimitiveTypeException {
final URI uri = client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("Customer").appendKeySegment(-10).build();
+ appendEntitySetSegment("Customer").appendKeySegment(-10).build();
final ODataEntity patch = client.getObjectFactory().
- newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService.Customer"));
+ newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService.Customer"));
patch.setEditLink(uri);
// ---------------------------------------
// Update to CustomerInfo(12)
// ---------------------------------------
URI customerInfoURI = client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("CustomerInfo").appendKeySegment(12).build();
+ appendEntitySetSegment("CustomerInfo").appendKeySegment(12).build();
patch.addLink(client.getObjectFactory().newEntityNavigationLink("Info", customerInfoURI));
update(UpdateType.PATCH, patch, format, null);
customerInfoURI = client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("Customer").appendKeySegment(-10).appendNavigationSegment("Info").build();
+ appendEntitySetSegment("Customer").appendKeySegment(-10).appendNavigationSegment("Info").build();
ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(customerInfoURI);
req.setFormat(format);
@@ -143,7 +143,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
ODataEntity newInfo = req.execute().getBody();
assertEquals(Integer.valueOf(12),
- newInfo.getProperty("CustomerInfoId").getPrimitiveValue().toCastValue(Integer.class));
+ newInfo.getProperty("CustomerInfoId").getPrimitiveValue().toCastValue(Integer.class));
// ---------------------------------------
// ---------------------------------------
@@ -152,7 +152,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
patch.getNavigationLinks().clear();
customerInfoURI = client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("CustomerInfo").appendKeySegment(11).build();
+ appendEntitySetSegment("CustomerInfo").appendKeySegment(11).build();
read(format, customerInfoURI);
patch.addLink(client.getObjectFactory().newEntityNavigationLink("Info", customerInfoURI));
@@ -160,7 +160,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
update(UpdateType.PATCH, patch, format, null);
customerInfoURI = client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("Customer").appendKeySegment(-10).appendNavigationSegment("Info").build();
+ appendEntitySetSegment("Customer").appendKeySegment(-10).appendNavigationSegment("Info").build();
req = client.getRetrieveRequestFactory().getEntityRequest(customerInfoURI);
req.setFormat(format);
@@ -168,26 +168,26 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
newInfo = req.execute().getBody();
assertEquals(Integer.valueOf(11),
- newInfo.getProperty("CustomerInfoId").getPrimitiveValue().toCastValue(Integer.class));
+ newInfo.getProperty("CustomerInfoId").getPrimitiveValue().toCastValue(Integer.class));
// ---------------------------------------
}
private ODataEntityUpdateRequest<ODataEntity> buildMultiKeyUpdateReq(final ODataFormat format)
- throws EdmPrimitiveTypeException {
+ throws EdmPrimitiveTypeException {
final LinkedHashMap<String, Object> multiKey = new LinkedHashMap<String, Object>();
multiKey.put("FromUsername", "1");
multiKey.put("MessageId", -10);
final ODataEntity message = read(format, client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("Message").appendKeySegment(multiKey).build());
+ appendEntitySetSegment("Message").appendKeySegment(multiKey).build());
message.getAssociationLinks().clear();
message.getNavigationLinks().clear();
final boolean before = message.getProperty("IsRead").getPrimitiveValue().toCastValue(Boolean.class);
message.getProperties().remove(message.getProperty("IsRead"));
getClient().getBinder().add(message,
- client.getObjectFactory().newPrimitiveProperty("IsRead",
- client.getObjectFactory().newPrimitiveValueBuilder().buildBoolean(!before)));
+ client.getObjectFactory().newPrimitiveProperty("IsRead",
+ client.getObjectFactory().newPrimitiveValueBuilder().buildBoolean(!before)));
return client.getCUDRequestFactory().getEntityUpdateRequest(UpdateType.MERGE, message);
}
@@ -210,30 +210,30 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
@Test
public void updateReturnContent() throws EdmPrimitiveTypeException {
final ODataEntityUpdateRequest<ODataEntity> req =
- buildMultiKeyUpdateReq(client.getConfiguration().getDefaultPubFormat());
+ buildMultiKeyUpdateReq(client.getConfiguration().getDefaultPubFormat());
req.setPrefer(client.newPreferences().returnContent());
final ODataEntityUpdateResponse<ODataEntity> res = req.execute();
assertEquals(200, res.getStatusCode());
assertEquals(client.newPreferences().returnContent(),
- res.getHeader(HeaderName.preferenceApplied).iterator().next());
+ res.getHeader(HeaderName.preferenceApplied).iterator().next());
assertNotNull(res.getBody());
}
@Test
public void concurrentModification() {
final URI uri = client.newURIBuilder(getServiceRoot()).
- appendEntitySetSegment("Product").appendKeySegment(-10).build();
+ appendEntitySetSegment("Product").appendKeySegment(-10).build();
String etag = getETag(uri);
final ODataEntity product = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
product.setEditLink(uri);
updateEntityStringProperty("BaseConcurrency",
- client.getConfiguration().getDefaultPubFormat(), product, UpdateType.MERGE, etag);
+ client.getConfiguration().getDefaultPubFormat(), product, UpdateType.MERGE, etag);
try {
etag += "-invalidone";
updateEntityStringProperty("BaseConcurrency",
- client.getConfiguration().getDefaultPubFormat(), product, UpdateType.MERGE, etag);
+ client.getConfiguration().getDefaultPubFormat(), product, UpdateType.MERGE, etag);
fail();
} catch (ODataClientErrorException e) {
assertEquals(412, e.getStatusLine().getStatusCode());
[50/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
index 5d00864..dbbb110 100644
--- a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
+++ b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -125,7 +125,8 @@ public abstract class AbstractServices {
private static final Pattern REF_PATTERN = Pattern.compile("([$]\\d+)");
protected static final String BOUNDARY = "batch_243234_25424_ef_892u748";
- protected static final String MULTIPART_MIXED = "multipart/mixed";//ContentType.MULTIPART_MIXED.toContentTypeString();
+ protected static final String MULTIPART_MIXED = "multipart/mixed";
+ // ContentType.MULTIPART_MIXED.toContentTypeString();
protected static final String APPLICATION_OCTET_STREAM = "application/octet-stream";
protected final ODataServiceVersion version;
@@ -148,18 +149,18 @@ public abstract class AbstractServices {
atomSerializer = new AtomSerializer(version, true);
jsonSerializer = new JsonSerializer(version, true);
- this.xml = new XMLUtilities(version, metadata);
- this.json = new JSONUtilities(version, metadata);
+ xml = new XMLUtilities(version, metadata);
+ json = new JSONUtilities(version, metadata);
}
/**
* Provide sample services.
- *
+ *
* @param accept Accept header.
* @return OData services.
*/
@GET
- public Response getSevices(@HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept) {
+ public Response getSevices(@HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept) {
try {
final Accept acceptType = Accept.parse(accept, version);
@@ -168,9 +169,9 @@ public abstract class AbstractServices {
}
return xml.createResponse(
- null,
- FSManager.instance(version).readFile(Constants.get(version, ConstantKey.SERVICES), acceptType),
- null, acceptType);
+ null,
+ FSManager.instance(version).readFile(Constants.get(version, ConstantKey.SERVICES), acceptType),
+ null, acceptType);
} catch (Exception e) {
return xml.createFaultResponse(accept, e);
}
@@ -178,7 +179,7 @@ public abstract class AbstractServices {
/**
* Provide sample getMetadata().
- *
+ *
* @return getMetadata().
*/
@GET
@@ -201,13 +202,13 @@ public abstract class AbstractServices {
@Consumes(MULTIPART_MIXED)
@Produces(APPLICATION_OCTET_STREAM + ";boundary=" + BOUNDARY)
public Response batch(
- @HeaderParam("Authorization") @DefaultValue(StringUtils.EMPTY) String authorization,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- final @Multipart MultipartBody attachment) {
+ @HeaderParam("Authorization") @DefaultValue(StringUtils.EMPTY) final String authorization,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ final @Multipart MultipartBody attachment) {
try {
final boolean continueOnError = prefer.contains("odata.continue-on-error");
return xml.createBatchResponse(
- exploreMultipart(attachment.getAllAttachments(), BOUNDARY, continueOnError));
+ exploreMultipart(attachment.getAllAttachments(), BOUNDARY, continueOnError));
} catch (IOException e) {
return xml.createFaultResponse(Accept.XML.toString(version), e);
}
@@ -224,7 +225,7 @@ public abstract class AbstractServices {
@GET
@Path("/StoredPIs(1000)")
- public Response getStoredPI(@Context UriInfo uriInfo) {
+ public Response getStoredPI(@Context final UriInfo uriInfo) {
final Entity entity = new EntityImpl();
entity.setType("Microsoft.Test.OData.Services.ODataWCFService.StoredPI");
final Property id = new PropertyImpl();
@@ -255,10 +256,11 @@ public abstract class AbstractServices {
// just for non nullable property test into PropertyTestITCase
return xml.createFaultResponse(Accept.JSON_FULLMETA.toString(version), new Exception("Non nullable properties"));
}
+
// ----------------------------------------------
protected Response bodyPartRequest(final MimeBodyPart body) throws Exception {
- return bodyPartRequest(body, Collections.<String, String>emptyMap());
+ return bodyPartRequest(body, Collections.<String, String> emptyMap());
}
protected Response bodyPartRequest(final MimeBodyPart body, final Map<String, String> references) throws Exception {
@@ -267,7 +269,7 @@ public abstract class AbstractServices {
Header header = en.nextElement();
final String request =
- header.getName() + (StringUtils.isNotBlank(header.getValue()) ? ":" + header.getValue() : "");
+ header.getName() + (StringUtils.isNotBlank(header.getValue()) ? ":" + header.getValue() : "");
final Matcher matcher = REQUEST_PATTERN.matcher(request);
final Matcher matcherRef = BATCH_REQUEST_REF_PATTERN.matcher(request);
@@ -328,8 +330,8 @@ public abstract class AbstractServices {
}
protected abstract InputStream exploreMultipart(
- final List<Attachment> attachments, final String boundary, final boolean continueOnError)
- throws IOException;
+ final List<Attachment> attachments, final String boundary, final boolean continueOnError)
+ throws IOException;
protected void addItemIntro(final ByteArrayOutputStream bos) throws IOException {
addItemIntro(bos, null);
@@ -350,7 +352,7 @@ public abstract class AbstractServices {
}
protected void addChangesetItemIntro(
- final ByteArrayOutputStream bos, final String contentId, final String cboundary) throws IOException {
+ final ByteArrayOutputStream bos, final String contentId, final String cboundary) throws IOException {
bos.write(("--" + cboundary).getBytes());
bos.write(Constants.CRLF);
bos.write(("Content-ID: " + contentId).getBytes());
@@ -359,12 +361,12 @@ public abstract class AbstractServices {
}
protected void addSingleBatchResponse(
- final Response response, final ByteArrayOutputStream bos) throws IOException {
+ final Response response, final ByteArrayOutputStream bos) throws IOException {
addSingleBatchResponse(response, null, bos);
}
protected void addSingleBatchResponse(
- final Response response, final String contentId, final ByteArrayOutputStream bos) throws IOException {
+ final Response response, final String contentId, final ByteArrayOutputStream bos) throws IOException {
bos.write("HTTP/1.1 ".getBytes());
bos.write(String.valueOf(response.getStatusInfo().getStatusCode()).getBytes());
bos.write(" ".getBytes());
@@ -401,45 +403,45 @@ public abstract class AbstractServices {
}
protected void addErrorBatchResponse(final Exception e, final ByteArrayOutputStream bos)
- throws IOException {
+ throws IOException {
addErrorBatchResponse(e, null, bos);
}
protected void addErrorBatchResponse(final Exception e, final String contentId, final ByteArrayOutputStream bos)
- throws IOException {
+ throws IOException {
addSingleBatchResponse(xml.createFaultResponse(Accept.XML.toString(version), e), contentId, bos);
}
@MERGE
@Path("/{entitySetName}({entityId})")
- @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
- @Consumes({MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
+ @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+ @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
public Response mergeEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @HeaderParam("If-Match") @DefaultValue(StringUtils.EMPTY) String ifMatch,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- final String changes) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @HeaderParam("If-Match") @DefaultValue(StringUtils.EMPTY) final String ifMatch,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ final String changes) {
return patchEntity(uriInfo, accept, contentType, prefer, ifMatch, entitySetName, entityId, changes);
}
@PATCH
@Path("/{entitySetName}({entityId})")
- @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
- @Consumes({MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
+ @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+ @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
public Response patchEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @HeaderParam("If-Match") @DefaultValue(StringUtils.EMPTY) String ifMatch,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- final String changes) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @HeaderParam("If-Match") @DefaultValue(StringUtils.EMPTY) final String ifMatch,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ final String changes) {
try {
final Accept acceptType = Accept.parse(accept, version);
@@ -463,7 +465,7 @@ public abstract class AbstractServices {
throw new UnsupportedMediaTypeException("Unsupported media type");
} else if (contentTypeValue == Accept.ATOM) {
entryChanges = atomDeserializer.toEntity(
- IOUtils.toInputStream(changes, Constants.ENCODING)).getPayload();
+ IOUtils.toInputStream(changes, Constants.ENCODING)).getPayload();
} else {
final ResWrap<Entity> jcont = jsonDeserializer.toEntity(IOUtils.toInputStream(changes, Constants.ENCODING));
entryChanges = jcont.getPayload();
@@ -491,7 +493,7 @@ public abstract class AbstractServices {
writer.close();
final InputStream res = xml.addOrReplaceEntity(
- entityId, entitySetName, new ByteArrayInputStream(content.toByteArray()), container.getPayload());
+ entityId, entitySetName, new ByteArrayInputStream(content.toByteArray()), container.getPayload());
final ResWrap<Entity> cres = atomDeserializer.toEntity(res);
@@ -499,25 +501,25 @@ public abstract class AbstractServices {
final String path = Commons.getEntityBasePath(entitySetName, entityId);
FSManager.instance(version).putInMemory(
- cres, path + File.separatorChar + Constants.get(version, ConstantKey.ENTITY));
+ cres, path + File.separatorChar + Constants.get(version, ConstantKey.ENTITY));
final Response response;
if ("return-content".equalsIgnoreCase(prefer)) {
response = xml.createResponse(
- uriInfo.getRequestUri().toASCIIString(),
- xml.readEntity(entitySetName, entityId, acceptType).getValue(),
- null, acceptType, Response.Status.OK);
+ uriInfo.getRequestUri().toASCIIString(),
+ xml.readEntity(entitySetName, entityId, acceptType).getValue(),
+ null, acceptType, Response.Status.OK);
} else {
res.close();
response = xml.createResponse(
- uriInfo.getRequestUri().toASCIIString(),
- null,
- null,
- acceptType, Response.Status.NO_CONTENT);
+ uriInfo.getRequestUri().toASCIIString(),
+ null,
+ null,
+ acceptType, Response.Status.NO_CONTENT);
}
if (StringUtils.isNotBlank(prefer)) {
- response.getHeaders().put("Preference-Applied", Collections.<Object>singletonList(prefer));
+ response.getHeaders().put("Preference-Applied", Collections.<Object> singletonList(prefer));
}
return response;
@@ -528,16 +530,16 @@ public abstract class AbstractServices {
@PUT
@Path("/{entitySetName}({entityId})")
- @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
- @Consumes({MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
+ @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+ @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
public Response replaceEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- final String entity) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ final String entity) {
try {
final Accept acceptType = Accept.parse(accept, version);
@@ -547,8 +549,8 @@ public abstract class AbstractServices {
}
final InputStream res = getUtilities(acceptType).addOrReplaceEntity(entityId, entitySetName,
- IOUtils.toInputStream(entity, Constants.ENCODING),
- xml.readEntity(acceptType, IOUtils.toInputStream(entity, Constants.ENCODING)));
+ IOUtils.toInputStream(entity, Constants.ENCODING),
+ xml.readEntity(acceptType, IOUtils.toInputStream(entity, Constants.ENCODING)));
final ResWrap<Entity> cres;
if (acceptType == Accept.ATOM) {
@@ -559,28 +561,28 @@ public abstract class AbstractServices {
final String path = Commons.getEntityBasePath(entitySetName, entityId);
FSManager.instance(version).putInMemory(
- cres, path + File.separatorChar + Constants.get(version, ConstantKey.ENTITY));
+ cres, path + File.separatorChar + Constants.get(version, ConstantKey.ENTITY));
final Response response;
if ("return-content".equalsIgnoreCase(prefer)) {
response = xml.createResponse(
- uriInfo.getRequestUri().toASCIIString(),
- xml.readEntity(entitySetName, entityId, acceptType).getValue(),
- null,
- acceptType,
- Response.Status.OK);
+ uriInfo.getRequestUri().toASCIIString(),
+ xml.readEntity(entitySetName, entityId, acceptType).getValue(),
+ null,
+ acceptType,
+ Response.Status.OK);
} else {
res.close();
response = xml.createResponse(
- uriInfo.getRequestUri().toASCIIString(),
- null,
- null,
- acceptType,
- Response.Status.NO_CONTENT);
+ uriInfo.getRequestUri().toASCIIString(),
+ null,
+ null,
+ acceptType,
+ Response.Status.NO_CONTENT);
}
if (StringUtils.isNotBlank(prefer)) {
- response.getHeaders().put("Preference-Applied", Collections.<Object>singletonList(prefer));
+ response.getHeaders().put("Preference-Applied", Collections.<Object> singletonList(prefer));
}
return response;
@@ -591,15 +593,15 @@ public abstract class AbstractServices {
@POST
@Path("/{entitySetName}")
- @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
- @Consumes({MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_OCTET_STREAM})
+ @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+ @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_OCTET_STREAM })
public Response postNewEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @PathParam("entitySetName") String entitySetName,
- final String entity) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @PathParam("entitySetName") final String entitySetName,
+ final String entity) {
try {
final Accept acceptType = Accept.parse(accept, version);
@@ -629,7 +631,7 @@ public abstract class AbstractServices {
prop.setType(id.getValue().toString());
prop.setValue(ValueType.PRIMITIVE,
id.getValue() == EdmPrimitiveTypeKind.Int32 ? Integer.parseInt(entityKey) :
- id.getValue() == EdmPrimitiveTypeKind.Guid ? UUID.fromString(entityKey) : entityKey);
+ id.getValue() == EdmPrimitiveTypeKind.Guid ? UUID.fromString(entityKey) : entityKey);
entry.getProperties().add(prop);
}
@@ -664,13 +666,13 @@ public abstract class AbstractServices {
writer.close();
final InputStream serialization =
- xml.addOrReplaceEntity(entityKey, entitySetName, new ByteArrayInputStream(content.toByteArray()), entry);
+ xml.addOrReplaceEntity(entityKey, entitySetName, new ByteArrayInputStream(content.toByteArray()), entry);
ResWrap<Entity> result = atomDeserializer.toEntity(serialization);
result = new ResWrap<Entity>(
- URI.create(Constants.get(version, ConstantKey.ODATA_METADATA_PREFIX)
+ URI.create(Constants.get(version, ConstantKey.ODATA_METADATA_PREFIX)
+ entitySetName + Constants.get(version, ConstantKey.ODATA_METADATA_ENTITY_SUFFIX)),
- null, result.getPayload());
+ null, result.getPayload());
final String path = Commons.getEntityBasePath(entitySetName, entityKey);
FSManager.instance(version).putInMemory(result, path + Constants.get(version, ConstantKey.ENTITY));
@@ -680,22 +682,22 @@ public abstract class AbstractServices {
final Response response;
if ("return-no-content".equalsIgnoreCase(prefer)) {
response = xml.createResponse(
- location,
- null,
- null,
- acceptType,
- Response.Status.NO_CONTENT);
+ location,
+ null,
+ null,
+ acceptType,
+ Response.Status.NO_CONTENT);
} else {
response = xml.createResponse(
- location,
- xml.writeEntity(acceptType, result),
- null,
- acceptType,
- Response.Status.CREATED);
+ location,
+ xml.writeEntity(acceptType, result),
+ null,
+ acceptType,
+ Response.Status.CREATED);
}
if (StringUtils.isNotBlank(prefer)) {
- response.getHeaders().put("Preference-Applied", Collections.<Object>singletonList(prefer));
+ response.getHeaders().put("Preference-Applied", Collections.<Object> singletonList(prefer));
}
return response;
@@ -708,10 +710,10 @@ public abstract class AbstractServices {
@POST
@Path("/Person({entityId})/{type:.*}/Sack")
public Response actionSack(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
- @PathParam("entityId") final String entityId,
- @PathParam("type") final String type,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entityId") final String entityId,
+ @PathParam("type") final String type,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
final Map.Entry<Accept, AbstractUtilities> utils = getUtilities(accept, format);
@@ -730,7 +732,7 @@ public abstract class AbstractServices {
final FSManager fsManager = FSManager.instance(version);
fsManager.putInMemory(xml.writeEntity(Accept.ATOM, container),
- fsManager.getAbsolutePath(Commons.getEntityBasePath("Person", entityId) + Constants.get(version,
+ fsManager.getAbsolutePath(Commons.getEntityBasePath("Person", entityId) + Constants.get(version,
ConstantKey.ENTITY), Accept.ATOM));
return utils.getValue().createResponse(null, null, null, utils.getKey(), Response.Status.NO_CONTENT);
@@ -742,10 +744,10 @@ public abstract class AbstractServices {
@POST
@Path("/Person/{type:.*}/IncreaseSalaries")
public Response actionIncreaseSalaries(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
- @PathParam("type") final String type,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
- final String body) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("type") final String type,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+ final String body) {
final String name = "Person";
try {
@@ -761,12 +763,12 @@ public abstract class AbstractServices {
final int n = tree.get("n").asInt();
final StringBuilder path = new StringBuilder(name).
- append(File.separatorChar).append(type).
- append(File.separatorChar);
+ append(File.separatorChar).append(type).
+ append(File.separatorChar);
path.append(metadata.getEntitySet(name).isSingleton()
- ? Constants.get(version, ConstantKey.ENTITY)
- : Constants.get(version, ConstantKey.FEED));
+ ? Constants.get(version, ConstantKey.ENTITY)
+ : Constants.get(version, ConstantKey.FEED));
final InputStream feed = FSManager.instance(version).readFile(path.toString(), acceptType);
@@ -776,20 +778,20 @@ public abstract class AbstractServices {
String newContent = new String(copy.toByteArray(), "UTF-8");
final Pattern salary = Pattern.compile(acceptType == Accept.ATOM
- ? "\\<d:Salary m:type=\"Edm.Int32\"\\>(-?\\d+)\\</d:Salary\\>"
- : "\"Salary\":(-?\\d+),");
+ ? "\\<d:Salary m:type=\"Edm.Int32\"\\>(-?\\d+)\\</d:Salary\\>"
+ : "\"Salary\":(-?\\d+),");
final Matcher salaryMatcher = salary.matcher(newContent);
while (salaryMatcher.find()) {
final Long newSalary = Long.valueOf(salaryMatcher.group(1)) + n;
newContent = newContent.
- replaceAll("\"Salary\":" + salaryMatcher.group(1) + ",",
+ replaceAll("\"Salary\":" + salaryMatcher.group(1) + ",",
"\"Salary\":" + newSalary + ",").
- replaceAll("\\<d:Salary m:type=\"Edm.Int32\"\\>" + salaryMatcher.group(1) + "</d:Salary\\>",
+ replaceAll("\\<d:Salary m:type=\"Edm.Int32\"\\>" + salaryMatcher.group(1) + "</d:Salary\\>",
"<d:Salary m:type=\"Edm.Int32\">" + newSalary + "</d:Salary>");
}
FSManager.instance(version).putInMemory(IOUtils.toInputStream(newContent, Constants.ENCODING),
- FSManager.instance(version).getAbsolutePath(path.toString(), acceptType));
+ FSManager.instance(version).getAbsolutePath(path.toString(), acceptType));
return xml.createResponse(null, null, null, acceptType, Response.Status.NO_CONTENT);
} catch (Exception e) {
@@ -800,10 +802,10 @@ public abstract class AbstractServices {
@POST
@Path("/Product({entityId})/ChangeProductDimensions")
public Response actionChangeProductDimensions(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
- @PathParam("entityId") final String entityId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
- final String argument) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entityId") final String entityId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+ final String argument) {
final Map.Entry<Accept, AbstractUtilities> utils = getUtilities(accept, format);
@@ -824,7 +826,7 @@ public abstract class AbstractServices {
final FSManager fsManager = FSManager.instance(version);
fsManager.putInMemory(xml.writeEntity(Accept.ATOM, container),
- fsManager.getAbsolutePath(Commons.getEntityBasePath("Product", entityId) + Constants.get(version,
+ fsManager.getAbsolutePath(Commons.getEntityBasePath("Product", entityId) + Constants.get(version,
ConstantKey.ENTITY), Accept.ATOM));
return utils.getValue().createResponse(null, null, null, utils.getKey(), Response.Status.NO_CONTENT);
@@ -836,10 +838,10 @@ public abstract class AbstractServices {
@POST
@Path("/ComputerDetail({entityId})/ResetComputerDetailsSpecifications")
public Response actionResetComputerDetailsSpecifications(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
- @PathParam("entityId") final String entityId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
- final String argument) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entityId") final String entityId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+ final String argument) {
final Map.Entry<Accept, AbstractUtilities> utils = getUtilities(accept, format);
@@ -862,7 +864,7 @@ public abstract class AbstractServices {
final FSManager fsManager = FSManager.instance(version);
fsManager.putInMemory(xml.writeEntity(Accept.ATOM, container),
- fsManager.getAbsolutePath(Commons.getEntityBasePath("ComputerDetail", entityId) + Constants.get(version,
+ fsManager.getAbsolutePath(Commons.getEntityBasePath("ComputerDetail", entityId) + Constants.get(version,
ConstantKey.ENTITY), Accept.ATOM));
return utils.getValue().createResponse(null, null, null, utils.getKey(), Response.Status.NO_CONTENT);
@@ -873,7 +875,7 @@ public abstract class AbstractServices {
/**
* Retrieve entities from the given entity set and the given type.
- *
+ *
* @param accept Accept header.
* @param name entity set.
* @param type entity type.
@@ -882,9 +884,9 @@ public abstract class AbstractServices {
@GET
@Path("/{name}/{type:.*}")
public Response getEntitySet(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
- @PathParam("name") final String name,
- @PathParam("type") final String type) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("name") final String name,
+ @PathParam("type") final String type) {
try {
final Accept acceptType = Accept.parse(accept, version);
@@ -894,12 +896,12 @@ public abstract class AbstractServices {
final String basePath = name + File.separatorChar;
final StringBuilder path = new StringBuilder(name).
- append(File.separatorChar).append(type).
- append(File.separatorChar);
+ append(File.separatorChar).append(type).
+ append(File.separatorChar);
path.append(metadata.getEntitySet(name).isSingleton()
- ? Constants.get(version, ConstantKey.ENTITY)
- : Constants.get(version, ConstantKey.FEED));
+ ? Constants.get(version, ConstantKey.ENTITY)
+ : Constants.get(version, ConstantKey.FEED));
final InputStream feed = FSManager.instance(version).readFile(path.toString(), acceptType);
return xml.createResponse(null, feed, Commons.getETag(basePath, version), acceptType);
@@ -910,7 +912,7 @@ public abstract class AbstractServices {
/**
* Retrieve entity set or function execution sample.
- *
+ *
* @param accept Accept header.
* @param name entity set or function name.
* @param format format query option.
@@ -923,16 +925,16 @@ public abstract class AbstractServices {
@GET
@Path("/{name}")
public Response getEntitySet(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @PathParam("name") String name,
- @QueryParam("$top") @DefaultValue(StringUtils.EMPTY) String top,
- @QueryParam("$skip") @DefaultValue(StringUtils.EMPTY) String skip,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
- @QueryParam("$inlinecount") @DefaultValue(StringUtils.EMPTY) String count,
- @QueryParam("$filter") @DefaultValue(StringUtils.EMPTY) String filter,
- @QueryParam("$orderby") @DefaultValue(StringUtils.EMPTY) String orderby,
- @QueryParam("$skiptoken") @DefaultValue(StringUtils.EMPTY) String skiptoken) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("name") final String name,
+ @QueryParam("$top") @DefaultValue(StringUtils.EMPTY) final String top,
+ @QueryParam("$skip") @DefaultValue(StringUtils.EMPTY) final String skip,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+ @QueryParam("$inlinecount") @DefaultValue(StringUtils.EMPTY) final String count,
+ @QueryParam("$filter") @DefaultValue(StringUtils.EMPTY) final String filter,
+ @QueryParam("$orderby") @DefaultValue(StringUtils.EMPTY) final String orderby,
+ @QueryParam("$skiptoken") @DefaultValue(StringUtils.EMPTY) final String skiptoken) {
try {
final Accept acceptType;
@@ -960,19 +962,19 @@ public abstract class AbstractServices {
if (StringUtils.isNotBlank(orderby)) {
builder.append(Constants.get(version, ConstantKey.ORDERBY)).append(File.separatorChar).
- append(orderby).append(File.separatorChar);
+ append(orderby).append(File.separatorChar);
}
if (StringUtils.isNotBlank(filter)) {
builder.append(Constants.get(version, ConstantKey.FILTER)).append(File.separatorChar).
- append(filter.replaceAll("/", "."));
+ append(filter.replaceAll("/", "."));
} else if (StringUtils.isNotBlank(skiptoken)) {
builder.append(Constants.get(version, ConstantKey.SKIP_TOKEN)).append(File.separatorChar).
- append(skiptoken);
+ append(skiptoken);
} else {
builder.append(metadata.getEntitySet(name).isSingleton()
- ? Constants.get(version, ConstantKey.ENTITY)
- : Constants.get(version, ConstantKey.FEED));
+ ? Constants.get(version, ConstantKey.ENTITY)
+ : Constants.get(version, ConstantKey.FEED));
}
final InputStream feed = FSManager.instance(version).readFile(builder.toString(), Accept.ATOM);
@@ -1010,10 +1012,10 @@ public abstract class AbstractServices {
writer.close();
return xml.createResponse(
- location,
- new ByteArrayInputStream(content.toByteArray()),
- Commons.getETag(basePath, version),
- acceptType);
+ location,
+ new ByteArrayInputStream(content.toByteArray()),
+ Commons.getETag(basePath, version),
+ acceptType);
}
} catch (Exception e) {
return xml.createFaultResponse(accept, e);
@@ -1025,29 +1027,29 @@ public abstract class AbstractServices {
@GET
@Path("/Person({entityId})")
public Response getPerson(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
- @PathParam("entityId") final String entityId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entityId") final String entityId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
final Map.Entry<Accept, AbstractUtilities> utils = getUtilities(accept, format);
final Response internal = getEntityInternal(uriInfo.getRequestUri().toASCIIString(),
- accept, "Person", entityId, format, null, null, false);
+ accept, "Person", entityId, format, null, null, false);
if (internal.getStatus() == 200) {
InputStream entity = (InputStream) internal.getEntity();
try {
if (utils.getKey() == Accept.JSON_FULLMETA || utils.getKey() == Accept.ATOM) {
entity = utils.getValue().addOperation(entity, "Sack", "#DefaultContainer.Sack",
- uriInfo.getAbsolutePath().toASCIIString()
+ uriInfo.getAbsolutePath().toASCIIString()
+ "/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack");
}
return utils.getValue().createResponse(
- uriInfo.getRequestUri().toASCIIString(),
- entity,
- internal.getHeaderString("ETag"),
- utils.getKey());
+ uriInfo.getRequestUri().toASCIIString(),
+ entity,
+ internal.getHeaderString("ETag"),
+ utils.getKey());
} catch (Exception e) {
LOG.error("Error retrieving entity", e);
return xml.createFaultResponse(accept, e);
@@ -1060,29 +1062,29 @@ public abstract class AbstractServices {
@GET
@Path("/Product({entityId})")
public Response getProduct(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
- @PathParam("entityId") final String entityId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entityId") final String entityId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
final Map.Entry<Accept, AbstractUtilities> utils = getUtilities(accept, format);
final Response internal = getEntityInternal(uriInfo.getRequestUri().toASCIIString(),
- accept, "Product", entityId, format, null, null, false);
+ accept, "Product", entityId, format, null, null, false);
if (internal.getStatus() == 200) {
InputStream entity = (InputStream) internal.getEntity();
try {
if (utils.getKey() == Accept.JSON_FULLMETA || utils.getKey() == Accept.ATOM) {
entity = utils.getValue().addOperation(entity,
- "ChangeProductDimensions", "#DefaultContainer.ChangeProductDimensions",
- uriInfo.getAbsolutePath().toASCIIString() + "/ChangeProductDimensions");
+ "ChangeProductDimensions", "#DefaultContainer.ChangeProductDimensions",
+ uriInfo.getAbsolutePath().toASCIIString() + "/ChangeProductDimensions");
}
return utils.getValue().createResponse(
- uriInfo.getRequestUri().toASCIIString(),
- entity,
- internal.getHeaderString("ETag"),
- utils.getKey());
+ uriInfo.getRequestUri().toASCIIString(),
+ entity,
+ internal.getHeaderString("ETag"),
+ utils.getKey());
} catch (Exception e) {
LOG.error("Error retrieving entity", e);
return xml.createFaultResponse(accept, e);
@@ -1095,33 +1097,33 @@ public abstract class AbstractServices {
@GET
@Path("/ComputerDetail({entityId})")
public Response getComputerDetail(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
- @PathParam("entityId") final String entityId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entityId") final String entityId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
final Map.Entry<Accept, AbstractUtilities> utils = getUtilities(accept, format);
final Response internal = getEntityInternal(uriInfo.getRequestUri().toASCIIString(),
- accept, "ComputerDetail", entityId, format, null, null, false);
+ accept, "ComputerDetail", entityId, format, null, null, false);
if (internal.getStatus() == 200) {
InputStream entity = (InputStream) internal.getEntity();
try {
if (utils.getKey() == Accept.JSON_FULLMETA || utils.getKey() == Accept.ATOM) {
entity = utils.getValue().addOperation(entity,
- "ResetComputerDetailsSpecifications", "#DefaultContainer.ResetComputerDetailsSpecifications",
- uriInfo.getAbsolutePath().toASCIIString() + "/ResetComputerDetailsSpecifications");
+ "ResetComputerDetailsSpecifications", "#DefaultContainer.ResetComputerDetailsSpecifications",
+ uriInfo.getAbsolutePath().toASCIIString() + "/ResetComputerDetailsSpecifications");
}
return utils.getValue().createResponse(
- uriInfo.getRequestUri().toASCIIString(),
- entity,
- internal.getHeaderString("ETag"),
- utils.getKey());
+ uriInfo.getRequestUri().toASCIIString(),
+ entity,
+ internal.getHeaderString("ETag"),
+ utils.getKey());
} catch (Exception e) {
LOG.error("Error retrieving entity", e);
return xml.createFaultResponse(accept, e);
- }
+ }
} else {
return internal;
}
@@ -1129,7 +1131,7 @@ public abstract class AbstractServices {
/**
* Retrieve entity sample.
- *
+ *
* @param accept Accept header.
* @param entitySetName Entity set name.
* @param entityId entity id.
@@ -1141,27 +1143,27 @@ public abstract class AbstractServices {
@GET
@Path("/{entitySetName}({entityId})")
public Response getEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
- @QueryParam("$expand") @DefaultValue(StringUtils.EMPTY) String expand,
- @QueryParam("$select") @DefaultValue(StringUtils.EMPTY) String select) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+ @QueryParam("$expand") @DefaultValue(StringUtils.EMPTY) final String expand,
+ @QueryParam("$select") @DefaultValue(StringUtils.EMPTY) final String select) {
return getEntityInternal(
- uriInfo.getRequestUri().toASCIIString(), accept, entitySetName, entityId, format, expand, select, false);
+ uriInfo.getRequestUri().toASCIIString(), accept, entitySetName, entityId, format, expand, select, false);
}
protected Response getEntityInternal(
- final String location,
- final String accept,
- final String entitySetName,
- final String entityId,
- final String format,
- String expand,
- final String select,
- final boolean keyAsSegment) {
+ final String location,
+ final String accept,
+ final String entitySetName,
+ final String entityId,
+ final String format,
+ String expand,
+ final String select,
+ final boolean keyAsSegment) {
try {
final Map.Entry<Accept, AbstractUtilities> utils = getUtilities(accept, format);
@@ -1171,15 +1173,15 @@ public abstract class AbstractServices {
}
final Map.Entry<String, InputStream> entityInfo =
- utils.getValue().readEntity(entitySetName, entityId, Accept.ATOM);
+ utils.getValue().readEntity(entitySetName, entityId, Accept.ATOM);
final InputStream entity = entityInfo.getValue();
ResWrap<Entity> container = atomDeserializer.toEntity(entity);
if (container.getContextURL() == null) {
container = new ResWrap<Entity>(URI.create(Constants.get(version, ConstantKey.ODATA_METADATA_PREFIX)
- + entitySetName + Constants.get(version, ConstantKey.ODATA_METADATA_ENTITY_SUFFIX)),
- container.getMetadataETag(), container.getPayload());
+ + entitySetName + Constants.get(version, ConstantKey.ODATA_METADATA_ENTITY_SUFFIX)),
+ container.getMetadataETag(), container.getPayload());
}
final Entity entry = container.getPayload();
@@ -1232,12 +1234,12 @@ public abstract class AbstractServices {
if (link.getType().equals(Constants.get(version, ConstantKey.ATOM_LINK_ENTRY))) {
// inline entry
final Entity inline = atomDeserializer.toEntity(
- xml.expandEntity(entitySetName, entityId, link.getTitle())).getPayload();
+ xml.expandEntity(entitySetName, entityId, link.getTitle())).getPayload();
rep.setInlineEntity(inline);
} else if (link.getType().equals(Constants.get(version, ConstantKey.ATOM_LINK_FEED))) {
// inline feed
final EntitySet inline = atomDeserializer.toEntitySet(
- xml.expandEntity(entitySetName, entityId, link.getTitle())).getPayload();
+ xml.expandEntity(entitySetName, entityId, link.getTitle())).getPayload();
rep.setInlineEntitySet(inline);
}
replace.put(link, rep);
@@ -1251,10 +1253,10 @@ public abstract class AbstractServices {
}
return xml.createResponse(
- location,
- xml.writeEntity(utils.getKey(), container),
- Commons.getETag(entityInfo.getKey(), version),
- utils.getKey());
+ location,
+ xml.writeEntity(utils.getKey(), container),
+ Commons.getETag(entityInfo.getKey(), version),
+ utils.getKey());
} catch (Exception e) {
LOG.error("Error retrieving entity", e);
return xml.createFaultResponse(accept, e);
@@ -1264,10 +1266,10 @@ public abstract class AbstractServices {
@GET
@Path("/{entitySetName}({entityId})/$value")
public Response getMediaEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId) {
try {
if (!accept.contains("*/*") && !accept.contains("application/octet-stream")) {
@@ -1277,10 +1279,10 @@ public abstract class AbstractServices {
final AbstractUtilities utils = getUtilities(null);
final Map.Entry<String, InputStream> entityInfo = utils.readMediaEntity(entitySetName, entityId);
return utils.createResponse(
- uriInfo.getRequestUri().toASCIIString(),
- entityInfo.getValue(),
- Commons.getETag(entityInfo.getKey(), version),
- null);
+ uriInfo.getRequestUri().toASCIIString(),
+ entityInfo.getValue(),
+ Commons.getETag(entityInfo.getKey(), version),
+ null);
} catch (Exception e) {
LOG.error("Error retrieving entity", e);
@@ -1291,8 +1293,8 @@ public abstract class AbstractServices {
@DELETE
@Path("/{entitySetName}({entityId})")
public Response removeEntity(
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId) {
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId) {
try {
final String basePath = entitySetName + File.separatorChar + Commons.getEntityKey(entityId);
@@ -1306,16 +1308,16 @@ public abstract class AbstractServices {
}
private Response replaceProperty(
- final String location,
- final String accept,
- final String contentType,
- final String prefer,
- final String entitySetName,
- final String entityId,
- final String path,
- final String format,
- final String changes,
- final boolean justValue) {
+ final String location,
+ final String accept,
+ final String contentType,
+ final String prefer,
+ final String entitySetName,
+ final String entityId,
+ final String path,
+ final String format,
+ final String changes,
+ final boolean justValue) {
// if the given path is not about any link then search for property
LOG.info("Retrieve property {}", path);
@@ -1325,7 +1327,7 @@ public abstract class AbstractServices {
final String basePath = Commons.getEntityBasePath(entitySetName, entityId);
final ResWrap<Entity> container = xml.readContainerEntity(Accept.ATOM,
- fsManager.readFile(basePath + Constants.get(version, ConstantKey.ENTITY), Accept.ATOM));
+ fsManager.readFile(basePath + Constants.get(version, ConstantKey.ENTITY), Accept.ATOM));
final Entity entry = container.getPayload();
@@ -1352,14 +1354,14 @@ public abstract class AbstractServices {
toBeReplaced.setValue(ValueType.PRIMITIVE, changes);
} else {
final Property pchanges = xml.readProperty(
- Accept.parse(contentType, version),
- IOUtils.toInputStream(changes, Constants.ENCODING));
+ Accept.parse(contentType, version),
+ IOUtils.toInputStream(changes, Constants.ENCODING));
toBeReplaced.setValue(pchanges.getValueType(), pchanges.getValue());
}
fsManager.putInMemory(xml.writeEntity(Accept.ATOM, container),
- fsManager.getAbsolutePath(basePath + Constants.get(version, ConstantKey.ENTITY), Accept.ATOM));
+ fsManager.getAbsolutePath(basePath + Constants.get(version, ConstantKey.ENTITY), Accept.ATOM));
final Response response;
if ("return-content".equalsIgnoreCase(prefer)) {
@@ -1376,7 +1378,7 @@ public abstract class AbstractServices {
}
if (StringUtils.isNotBlank(prefer)) {
- response.getHeaders().put("Preference-Applied", Collections.<Object>singletonList(prefer));
+ response.getHeaders().put("Preference-Applied", Collections.<Object> singletonList(prefer));
}
return response;
@@ -1386,12 +1388,12 @@ public abstract class AbstractServices {
}
private Response deletePropertyValue(
- final String accept,
- final String prefer,
- final String entitySetName,
- final String entityId,
- final String path,
- final String format) {
+ final String accept,
+ final String prefer,
+ final String entitySetName,
+ final String entityId,
+ final String path,
+ final String format) {
try {
Accept acceptType = null;
if (StringUtils.isNotBlank(format)) {
@@ -1406,10 +1408,10 @@ public abstract class AbstractServices {
final AbstractUtilities utils = getUtilities(acceptType);
final InputStream changed = utils.deleteProperty(
- entitySetName,
- entityId,
- Arrays.asList(path.split("/")),
- acceptType);
+ entitySetName,
+ entityId,
+ Arrays.asList(path.split("/")),
+ acceptType);
final Response response;
if ("return-content".equalsIgnoreCase(prefer)) {
@@ -1420,7 +1422,7 @@ public abstract class AbstractServices {
}
if (StringUtils.isNotBlank(prefer)) {
- response.getHeaders().put("Preference-Applied", Collections.<Object>singletonList(prefer));
+ response.getHeaders().put("Preference-Applied", Collections.<Object> singletonList(prefer));
}
return response;
@@ -1432,7 +1434,7 @@ public abstract class AbstractServices {
/**
* Replace property value.
- *
+ *
* @param accept
* @param entitySetName
* @param entityId
@@ -1444,23 +1446,23 @@ public abstract class AbstractServices {
@PUT
@Path("/{entitySetName}({entityId})/{path:.*}/$value")
public Response replacePropertyValue(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- @PathParam("path") String path,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
- final String changes) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ @PathParam("path") final String path,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+ final String changes) {
return replaceProperty(uriInfo.getRequestUri().toASCIIString(),
- accept, contentType, prefer, entitySetName, entityId, path, format, changes, true);
+ accept, contentType, prefer, entitySetName, entityId, path, format, changes, true);
}
/**
* Replace property.
- *
+ *
* @param accept
* @param entitySetName
* @param entityId
@@ -1472,23 +1474,23 @@ public abstract class AbstractServices {
@MERGE
@Path("/{entitySetName}({entityId})/{path:.*}")
public Response mergeProperty(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- @PathParam("path") String path,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
- final String changes) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ @PathParam("path") final String path,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+ final String changes) {
return replaceProperty(uriInfo.getRequestUri().toASCIIString(),
- accept, contentType, prefer, entitySetName, entityId, path, format, changes, false);
+ accept, contentType, prefer, entitySetName, entityId, path, format, changes, false);
}
/**
* Replace property.
- *
+ *
* @param accept
* @param entitySetName
* @param entityId
@@ -1500,37 +1502,37 @@ public abstract class AbstractServices {
@PATCH
@Path("/{entitySetName}({entityId})/{path:.*}")
public Response patchProperty(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- @PathParam("path") String path,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
- final String changes) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ @PathParam("path") final String path,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+ final String changes) {
return replaceProperty(uriInfo.getRequestUri().toASCIIString(),
- accept, contentType, prefer, entitySetName, entityId, path, format, changes, false);
+ accept, contentType, prefer, entitySetName, entityId, path, format, changes, false);
}
@PUT
- @Produces({MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
- @Consumes({MediaType.WILDCARD, MediaType.APPLICATION_OCTET_STREAM})
+ @Produces({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+ @Consumes({ MediaType.WILDCARD, MediaType.APPLICATION_OCTET_STREAM })
@Path("/{entitySetName}({entityId})/$value")
public Response replaceMediaEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
- String value) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+ final String value) {
try {
final AbstractUtilities utils = getUtilities(null);
final InputStream res = utils.putMediaInMemory(
- entitySetName, entityId, IOUtils.toInputStream(value, Constants.ENCODING));
+ entitySetName, entityId, IOUtils.toInputStream(value, Constants.ENCODING));
final String location = uriInfo.getRequestUri().toASCIIString().replace("/$value", "");
@@ -1543,7 +1545,7 @@ public abstract class AbstractServices {
}
if (StringUtils.isNotBlank(prefer)) {
- response.getHeaders().put("Preference-Applied", Collections.<Object>singletonList(prefer));
+ response.getHeaders().put("Preference-Applied", Collections.<Object> singletonList(prefer));
}
return response;
@@ -1556,7 +1558,7 @@ public abstract class AbstractServices {
/**
* Replace property.
- *
+ *
* @param accept
* @param entitySetName
* @param entityId
@@ -1568,36 +1570,36 @@ public abstract class AbstractServices {
@PUT
@Path("/{entitySetName}({entityId})/{path:.*}")
public Response replaceProperty(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- @PathParam("path") String path,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
- final String changes) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ @PathParam("path") final String path,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+ final String changes) {
if (xml.isMediaContent(entitySetName + "/" + path)) {
return replaceMediaProperty(prefer, entitySetName, entityId, path, changes);
} else {
return replaceProperty(uriInfo.getRequestUri().toASCIIString(),
- accept, contentType, prefer, entitySetName, entityId, path, format, changes, false);
+ accept, contentType, prefer, entitySetName, entityId, path, format, changes, false);
}
}
private Response replaceMediaProperty(
- final String prefer,
- final String entitySetName,
- final String entityId,
- final String path,
- final String value) {
+ final String prefer,
+ final String entitySetName,
+ final String entityId,
+ final String path,
+ final String value) {
try {
final AbstractUtilities utils = getUtilities(null);
InputStream res = utils.putMediaInMemory(
- entitySetName, entityId, path, IOUtils.toInputStream(value, Constants.ENCODING));
+ entitySetName, entityId, path, IOUtils.toInputStream(value, Constants.ENCODING));
final Response response;
if ("return-content".equalsIgnoreCase(prefer)) {
@@ -1608,7 +1610,7 @@ public abstract class AbstractServices {
}
if (StringUtils.isNotBlank(prefer)) {
- response.getHeaders().put("Preference-Applied", Collections.<Object>singletonList(prefer));
+ response.getHeaders().put("Preference-Applied", Collections.<Object> singletonList(prefer));
}
return response;
@@ -1620,7 +1622,7 @@ public abstract class AbstractServices {
/**
* Nullify property value.
- *
+ *
* @param accept
* @param entitySetName
* @param entityId
@@ -1631,18 +1633,18 @@ public abstract class AbstractServices {
@DELETE
@Path("/{entitySetName}({entityId})/{path:.*}/$value")
public Response deleteProperty(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- @PathParam("path") String path,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ @PathParam("path") final String path,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
return deletePropertyValue(accept, prefer, entitySetName, entityId, path, format);
}
/**
* Retrieve property sample.
- *
+ *
* @param accept Accept header.
* @param entitySetName Entity set name.
* @param entityId entity id.
@@ -1653,11 +1655,11 @@ public abstract class AbstractServices {
@GET
@Path("/{entitySetName}({entityId})/{path:.*}/$value")
public Response getPathValue(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- @PathParam("path") String path,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ @PathParam("path") final String path,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
try {
Accept acceptType = null;
@@ -1675,7 +1677,7 @@ public abstract class AbstractServices {
/**
* Retrieve property sample.
- *
+ *
* @param accept Accept header.
* @param entitySetName Entity set name.
* @param entityId entity id.
@@ -1686,11 +1688,11 @@ public abstract class AbstractServices {
@GET
@Path("/{entitySetName}({entityId})/{path:.*}")
public Response getPath(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- @PathParam("path") String path,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ @PathParam("path") final String path,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
// default utilities
final AbstractUtilities utils = xml;
@@ -1728,10 +1730,10 @@ public abstract class AbstractServices {
final String basePath = Commons.getEntityBasePath(entitySetName, entityId);
return xml.createResponse(
- null,
- new ByteArrayInputStream(content.toByteArray()),
- Commons.getETag(basePath, version),
- acceptType);
+ null,
+ new ByteArrayInputStream(content.toByteArray()),
+ Commons.getETag(basePath, version),
+ acceptType);
} catch (NotFoundException e) {
// if the given path is not about any link then search for property
@@ -1744,9 +1746,9 @@ public abstract class AbstractServices {
}
private Response navigateStreamedEntity(
- String entitySetName,
- String entityId,
- String path) throws Exception {
+ final String entitySetName,
+ final String entityId,
+ final String path) throws Exception {
final AbstractUtilities utils = getUtilities(null);
final Map.Entry<String, InputStream> entityInfo = utils.readMediaEntity(entitySetName, entityId, path);
@@ -1754,11 +1756,11 @@ public abstract class AbstractServices {
}
private Response navigateProperty(
- final Accept acceptType,
- final String entitySetName,
- final String entityId,
- final String path,
- final boolean searchForValue) throws Exception {
+ final Accept acceptType,
+ final String entitySetName,
+ final String entityId,
+ final String path,
+ final boolean searchForValue) throws Exception {
if ((searchForValue && acceptType != null && acceptType != Accept.TEXT) || acceptType == Accept.ATOM) {
throw new UnsupportedMediaTypeException("Unsupported media type " + acceptType);
@@ -1790,11 +1792,11 @@ public abstract class AbstractServices {
}
final ResWrap<Property> container = new ResWrap<Property>(
- URI.create(Constants.get(version, ConstantKey.ODATA_METADATA_PREFIX)
- + (version.compareTo(ODataServiceVersion.V40) >= 0 ?
- entitySetName + "(" + entityId + ")/" + path : property.getType())),
- entryContainer.getMetadataETag(),
- property);
+ URI.create(Constants.get(version, ConstantKey.ODATA_METADATA_PREFIX)
+ + (version.compareTo(ODataServiceVersion.V40) >= 0 ?
+ entitySetName + "(" + entityId + ")/" + path : property.getType())),
+ entryContainer.getMetadataETag(),
+ property);
return xml.createResponse(null,
searchForValue ?
@@ -1802,8 +1804,8 @@ public abstract class AbstractServices {
container.getPayload().isNull() ? StringUtils.EMPTY : stringValue(container.getPayload()),
Constants.ENCODING) :
utils.writeProperty(acceptType, container),
- Commons.getETag(Commons.getEntityBasePath(entitySetName, entityId), version),
- acceptType);
+ Commons.getETag(Commons.getEntityBasePath(entitySetName, entityId), version),
+ acceptType);
}
private String stringValue(final Property property) {
@@ -1820,7 +1822,7 @@ public abstract class AbstractServices {
/**
* Count sample.
- *
+ *
* @param accept Accept header.
* @param entitySetName entity set name.
* @return count.
@@ -1828,8 +1830,8 @@ public abstract class AbstractServices {
@GET
@Path("/{entitySetName}/$count")
public Response count(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @PathParam("entitySetName") String entitySetName) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entitySetName") final String entitySetName) {
try {
final Accept acceptType = Accept.parse(accept, version, Accept.TEXT);
@@ -1874,7 +1876,7 @@ public abstract class AbstractServices {
return utils;
}
- protected void updateInlineEntities(Entity entity) {
+ protected void updateInlineEntities(final Entity entity) {
final String type = entity.getType();
EntityType entityType;
Map<String, NavigationProperty> navProperties = Collections.emptyMap();
@@ -1890,8 +1892,8 @@ public abstract class AbstractServices {
alink.getAnnotations().addAll(property.getAnnotations());
alink.setType(navProperties.get(property.getName()).isEntitySet()
- ? Constants.get(version, ConstantKey.ATOM_LINK_FEED)
- : Constants.get(version, ConstantKey.ATOM_LINK_ENTRY));
+ ? Constants.get(version, ConstantKey.ATOM_LINK_FEED)
+ : Constants.get(version, ConstantKey.ATOM_LINK_ENTRY));
alink.setRel(Constants.get(version, ConstantKey.ATOM_LINK_REL) + property.getName());
@@ -1926,8 +1928,7 @@ public abstract class AbstractServices {
protected void normalizeAtomEntry(final Entity entry, final String entitySetName, final String entityKey) {
final org.apache.olingo.fit.metadata.EntitySet entitySet = metadata.getEntitySet(entitySetName);
final EntityType entityType = metadata.getEntityOrComplexType(entitySet.getType());
- for (Map.Entry<String, org.apache.olingo.fit.metadata.Property> property
- : entityType.getPropertyMap().entrySet()) {
+ for (Map.Entry<String, org.apache.olingo.fit.metadata.Property> property : entityType.getPropertyMap().entrySet()) {
if (entry.getProperty(property.getKey()) == null && property.getValue().isNullable()) {
final PropertyImpl prop = new PropertyImpl();
prop.setName(property.getKey());
@@ -1948,8 +1949,8 @@ public abstract class AbstractServices {
final LinkImpl link = new LinkImpl();
link.setTitle(property.getKey());
link.setType(property.getValue().isEntitySet()
- ? Constants.get(version, ConstantKey.ATOM_LINK_FEED)
- : Constants.get(version, ConstantKey.ATOM_LINK_ENTRY));
+ ? Constants.get(version, ConstantKey.ATOM_LINK_FEED)
+ : Constants.get(version, ConstantKey.ATOM_LINK_ENTRY));
link.setRel(Constants.get(version, ConstantKey.ATOM_LINK_REL) + property.getKey());
link.setHref(entitySetName + "(" + entityKey + ")/" + property.getKey());
entry.getNavigationLinks().add(link);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/UnsupportedMediaTypeException.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/UnsupportedMediaTypeException.java b/fit/src/main/java/org/apache/olingo/fit/UnsupportedMediaTypeException.java
index ad7e4b4..7b76cd8 100644
--- a/fit/src/main/java/org/apache/olingo/fit/UnsupportedMediaTypeException.java
+++ b/fit/src/main/java/org/apache/olingo/fit/UnsupportedMediaTypeException.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -26,16 +26,15 @@ public class UnsupportedMediaTypeException extends RuntimeException {
* Creates a new instance of
* <code>UnsupportedMediaTypeException</code> without detail message.
*/
- public UnsupportedMediaTypeException() {
- }
+ public UnsupportedMediaTypeException() {}
/**
* Constructs an instance of
* <code>UnsupportedMediaTypeException</code> with the specified detail message.
- *
+ *
* @param msg the detail message.
*/
- public UnsupportedMediaTypeException(String msg) {
+ public UnsupportedMediaTypeException(final String msg) {
super(msg);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/V3ActionOverloading.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/V3ActionOverloading.java b/fit/src/main/java/org/apache/olingo/fit/V3ActionOverloading.java
index a457efb..9dd3130 100644
--- a/fit/src/main/java/org/apache/olingo/fit/V3ActionOverloading.java
+++ b/fit/src/main/java/org/apache/olingo/fit/V3ActionOverloading.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -22,6 +22,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.util.Map;
+
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
import javax.ws.rs.HeaderParam;
@@ -34,6 +35,7 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
+
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
@@ -52,14 +54,14 @@ public class V3ActionOverloading extends V3Services {
public V3ActionOverloading() throws Exception {
super(new Metadata(FSManager.instance(ODataServiceVersion.V30).readRes(
- "actionOverloading" + StringUtils.capitalize(Constants.get(ODataServiceVersion.V30, ConstantKey.METADATA)),
- Accept.XML), ODataServiceVersion.V30));
+ "actionOverloading" + StringUtils.capitalize(Constants.get(ODataServiceVersion.V30, ConstantKey.METADATA)),
+ Accept.XML), ODataServiceVersion.V30));
}
private Response replaceServiceName(final Response response) {
try {
final String content = IOUtils.toString((InputStream) response.getEntity(), Constants.ENCODING).
- replaceAll("Static\\.svc", "ActionOverloading.svc");
+ replaceAll("Static\\.svc", "ActionOverloading.svc");
final Response.ResponseBuilder builder = Response.status(response.getStatus());
for (String headerName : response.getHeaders().keySet()) {
@@ -88,15 +90,15 @@ public class V3ActionOverloading extends V3Services {
@Override
public Response getMetadata() {
return super.getMetadata("actionOverloading"
- + StringUtils.capitalize(Constants.get(ODataServiceVersion.V30, ConstantKey.METADATA)));
+ + StringUtils.capitalize(Constants.get(ODataServiceVersion.V30, ConstantKey.METADATA)));
}
@POST
@Path("/RetrieveProduct")
public Response unboundRetrieveProduct(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType) {
final Accept acceptType;
if (StringUtils.isNotBlank(format)) {
@@ -110,7 +112,7 @@ public class V3ActionOverloading extends V3Services {
try {
final InputStream result = FSManager.instance(ODataServiceVersion.V30).
- readFile("actionOverloadingRetrieveProduct", acceptType);
+ readFile("actionOverloadingRetrieveProduct", acceptType);
return replaceServiceName(xml.createResponse(result, null, acceptType));
} catch (Exception e) {
return replaceServiceName(xml.createFaultResponse(accept, e));
@@ -121,10 +123,10 @@ public class V3ActionOverloading extends V3Services {
@Path("/Product({entityId})")
@Override
public Response getProduct(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
- @PathParam("entityId") final String entityId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entityId") final String entityId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
final Map.Entry<Accept, AbstractUtilities> utils = super.getUtilities(accept, format);
@@ -138,12 +140,12 @@ public class V3ActionOverloading extends V3Services {
try {
if (utils.getKey() == Accept.JSON_FULLMETA || utils.getKey() == Accept.ATOM) {
entity = utils.getValue().addOperation(entity, "RetrieveProduct", "#DefaultContainer.RetrieveProduct",
- uriInfo.getAbsolutePath().toASCIIString()
+ uriInfo.getAbsolutePath().toASCIIString()
+ "/RetrieveProduct");
}
return replaceServiceName(utils.getValue().createResponse(
- entity, Commons.getETag(entityInfo.getKey(), ODataServiceVersion.V30), utils.getKey()));
+ entity, Commons.getETag(entityInfo.getKey(), ODataServiceVersion.V30), utils.getKey()));
} catch (Exception e) {
LOG.error("Error retrieving entity", e);
return replaceServiceName(xml.createFaultResponse(accept, e));
@@ -153,9 +155,9 @@ public class V3ActionOverloading extends V3Services {
@POST
@Path("/Product({entityId})/RetrieveProduct")
public Response productBoundRetrieveProduct(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType) {
return unboundRetrieveProduct(accept, format, contentType);
}
@@ -163,11 +165,11 @@ public class V3ActionOverloading extends V3Services {
@GET
@Path("/OrderLine(OrderId={orderId},ProductId={productId})")
public Response getOrderLine(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
- @PathParam("orderId") final String orderId,
- @PathParam("productId") final String productId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("orderId") final String orderId,
+ @PathParam("productId") final String productId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
final Map.Entry<Accept, AbstractUtilities> utils = super.getUtilities(accept, format);
@@ -176,18 +178,18 @@ public class V3ActionOverloading extends V3Services {
}
final Map.Entry<String, InputStream> entityInfo = utils.getValue().
- readEntity("OrderLine", orderId + " " + productId, utils.getKey());
+ readEntity("OrderLine", orderId + " " + productId, utils.getKey());
InputStream entity = entityInfo.getValue();
try {
if (utils.getKey() == Accept.JSON_FULLMETA || utils.getKey() == Accept.ATOM) {
entity = utils.getValue().addOperation(entity, "RetrieveProduct", "#DefaultContainer.RetrieveProduct",
- uriInfo.getAbsolutePath().toASCIIString()
+ uriInfo.getAbsolutePath().toASCIIString()
+ "/RetrieveProduct");
}
return replaceServiceName(utils.getValue().createResponse(
- entity, Commons.getETag(entityInfo.getKey(), ODataServiceVersion.V30), utils.getKey()));
+ entity, Commons.getETag(entityInfo.getKey(), ODataServiceVersion.V30), utils.getKey()));
} catch (Exception e) {
LOG.error("Error retrieving entity", e);
return replaceServiceName(xml.createFaultResponse(accept, e));
@@ -197,9 +199,9 @@ public class V3ActionOverloading extends V3Services {
@POST
@Path("/OrderLine(OrderId={orderId},ProductId={productId})/RetrieveProduct")
public Response orderLineBoundRetrieveProduct(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType) {
return unboundRetrieveProduct(accept, format, contentType);
}
[26/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
index 10a97b5..1cd3960 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
@@ -1,119 +1,98 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ContactDetails")
-public interface ContactDetails
+public interface ContactDetails
extends java.io.Serializable {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "EmailBag", type = "Edm.String", nullable = false)
+ java.util.Collection<java.lang.String> getEmailBag();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "EmailBag", type = "Edm.String", nullable = false)
- java.util.Collection<java.lang.String> getEmailBag();
-
- void setEmailBag(java.util.Collection<java.lang.String> _emailBag);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AlternativeNames", type = "Edm.String", nullable = false)
- java.util.Collection<java.lang.String> getAlternativeNames();
-
- void setAlternativeNames(java.util.Collection<java.lang.String> _alternativeNames);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactAlias", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases", nullable = true)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases getContactAlias();
-
- void setContactAlias(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases _contactAlias);
+ void setEmailBag(java.util.Collection<java.lang.String> _emailBag);
-
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AlternativeNames", type = "Edm.String",
+ nullable = false)
+ java.util.Collection<java.lang.String> getAlternativeNames();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomePhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getHomePhone();
+ void setAlternativeNames(java.util.Collection<java.lang.String> _alternativeNames);
- void setHomePhone(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _homePhone);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactAlias",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases", nullable = true)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases
+ getContactAlias();
-
+ void
+ setContactAlias(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases _contactAlias);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "WorkPhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getWorkPhone();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomePhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone
+ getHomePhone();
- void setWorkPhone(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _workPhone);
+ void
+ setHomePhone(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _homePhone);
-
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "WorkPhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone
+ getWorkPhone();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MobilePhoneBag", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = false)
- java.util.Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone> getMobilePhoneBag();
+ void
+ setWorkPhone(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _workPhone);
- void setMobilePhoneBag(java.util.Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone> _mobilePhoneBag);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MobilePhoneBag",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = false)
+ java.util.Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone>
+ getMobilePhoneBag();
-
+ void
+ setMobilePhoneBag(
+ java.util.Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone> _mobilePhoneBag);
- ComplexFactory factory();
+ ComplexFactory factory();
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactAlias",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases newContactAlias();
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactAlias",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases
+ newContactAlias();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomePhone",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newHomePhone();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomePhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone
+ newHomePhone();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "WorkPhone",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newWorkPhone();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "WorkPhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone
+ newWorkPhone();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MobilePhoneBag",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newMobilePhoneBag();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MobilePhoneBag",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone
+ newMobilePhoneBag();
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
index 080ddc3..744df0b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
@@ -1,255 +1,235 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Contractor",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person")
-public interface Contractor
- extends Annotatable,org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPersonId();
-
- void setPersonId(java.lang.Integer _personId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContratorCompanyId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getContratorCompanyId();
-
- void setContratorCompanyId(java.lang.Integer _contratorCompanyId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BillingRate",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getBillingRate();
-
- void setBillingRate(java.lang.Integer _billingRate);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TeamContactPersonId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getTeamContactPersonId();
-
- void setTeamContactPersonId(java.lang.Integer _teamContactPersonId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "JobDescription",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getJobDescription();
-
- void setJobDescription(java.lang.String _jobDescription);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonMetadata",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "PersonMetadata",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection getPersonMetadata();
-
- void setPersonMetadata(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person.ComplexFactory{
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
- type = "Edm.Int32")
- Annotatable getPersonIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ContratorCompanyId",
- type = "Edm.Int32")
- Annotatable getContratorCompanyIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BillingRate",
- type = "Edm.Int32")
- Annotatable getBillingRateAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TeamContactPersonId",
- type = "Edm.Int32")
- Annotatable getTeamContactPersonIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "JobDescription",
- type = "Edm.String")
- Annotatable getJobDescriptionAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonMetadata",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata")
- Annotatable getPersonMetadataAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person")
+public interface Contractor
+ extends Annotatable,
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person {
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPersonId();
+
+ @Override
+ void setPersonId(java.lang.Integer _personId);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ @Override
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContratorCompanyId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getContratorCompanyId();
+
+ void setContratorCompanyId(java.lang.Integer _contratorCompanyId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BillingRate",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getBillingRate();
+
+ void setBillingRate(java.lang.Integer _billingRate);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TeamContactPersonId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getTeamContactPersonId();
+
+ void setTeamContactPersonId(java.lang.Integer _teamContactPersonId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "JobDescription",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getJobDescription();
+
+ void setJobDescription(java.lang.String _jobDescription);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonMetadata",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "PersonMetadata",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection
+ getPersonMetadata();
+
+ @Override
+ void
+ setPersonMetadata(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory
+ extends
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person.ComplexFactory {}
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations
+ extends
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
+ type = "Edm.Int32")
+ Annotatable getPersonIdAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ContratorCompanyId",
+ type = "Edm.Int32")
+ Annotatable getContratorCompanyIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BillingRate",
+ type = "Edm.Int32")
+ Annotatable getBillingRateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TeamContactPersonId",
+ type = "Edm.Int32")
+ Annotatable getTeamContactPersonIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "JobDescription",
+ type = "Edm.String")
+ Annotatable getJobDescriptionAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonMetadata",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata")
+ Annotatable getPersonMetadataAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
index 122bcb6..035cb1b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface ContractorCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Contractor> {
+public interface ContractorCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Contractor> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
index 5b51b0e..f3a44b4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
@@ -1,349 +1,337 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Customer",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Customer
- extends Annotatable,java.io.Serializable {
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Thumbnail",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.io.InputStream getThumbnail();
-
- void setThumbnail(java.io.InputStream _thumbnail);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Video",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.io.InputStream getVideo();
-
- void setVideo(java.io.InputStream _video);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getCustomerId();
-
- void setCustomerId(java.lang.Integer _customerId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PrimaryContactInfo",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails getPrimaryContactInfo();
-
- void setPrimaryContactInfo(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _primaryContactInfo);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BackupContactInfo",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> getBackupContactInfo();
-
- void setBackupContactInfo(java.util.Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> _backupContactInfo);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Auditing",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo getAuditing();
-
- void setAuditing(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _auditing);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Orders",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Order",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection getOrders();
-
- void setOrders(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection _orders);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Logins",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection getLogins();
-
- void setLogins(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection _logins);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Husband",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Customer",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer getHusband();
-
- void setHusband(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer _husband);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Wife",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Customer",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer getWife();
-
- void setWife(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer _wife);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Info",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "CustomerInfo",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo getInfo();
-
- void setInfo(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo _info);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PrimaryContactInfo",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newPrimaryContactInfo();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BackupContactInfo",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newBackupContactInfo();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Auditing",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newAuditing();
-
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Thumbnail",
- type = "Edm.Stream")
- Annotatable getThumbnailAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Video",
- type = "Edm.Stream")
- Annotatable getVideoAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerId",
- type = "Edm.Int32")
- Annotatable getCustomerIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PrimaryContactInfo",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
- Annotatable getPrimaryContactInfoAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BackupContactInfo",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
- Annotatable getBackupContactInfoAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Auditing",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
- Annotatable getAuditingAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Orders",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
- Annotatable getOrdersAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Logins",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
- Annotatable getLoginsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Husband",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
- Annotatable getHusbandAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Wife",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
- Annotatable getWifeAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Info",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo")
- Annotatable getInfoAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Customer
+ extends Annotatable, java.io.Serializable {
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Thumbnail",
+ type = "Edm.Stream",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.io.InputStream getThumbnail();
+
+ void setThumbnail(java.io.InputStream _thumbnail);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Video",
+ type = "Edm.Stream",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.io.InputStream getVideo();
+
+ void setVideo(java.io.InputStream _video);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getCustomerId();
+
+ void setCustomerId(java.lang.Integer _customerId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PrimaryContactInfo",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails
+ getPrimaryContactInfo();
+
+ void
+ setPrimaryContactInfo(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _primaryContactInfo);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BackupContactInfo",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails>
+ getBackupContactInfo();
+
+ void
+ setBackupContactInfo(
+ java.util.Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> _backupContactInfo);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Auditing",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo
+ getAuditing();
+
+ void
+ setAuditing(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _auditing);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Orders",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Order",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection
+ getOrders();
+
+ void
+ setOrders(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection _orders);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Logins",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Login",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection
+ getLogins();
+
+ void
+ setLogins(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection _logins);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Husband",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Customer",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer
+ getHusband();
+
+ void
+ setHusband(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer _husband);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Wife",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Customer",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer
+ getWife();
+
+ void
+ setWife(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer _wife);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Info",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "CustomerInfo",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo
+ getInfo();
+
+ void
+ setInfo(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo _info);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PrimaryContactInfo",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails
+ newPrimaryContactInfo();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BackupContactInfo",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails
+ newBackupContactInfo();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Auditing",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo
+ newAuditing();
+
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Thumbnail",
+ type = "Edm.Stream")
+ Annotatable getThumbnailAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Video",
+ type = "Edm.Stream")
+ Annotatable getVideoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerId",
+ type = "Edm.Int32")
+ Annotatable getCustomerIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PrimaryContactInfo",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
+ Annotatable getPrimaryContactInfoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BackupContactInfo",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
+ Annotatable getBackupContactInfoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Auditing",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
+ Annotatable getAuditingAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Orders",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
+ Annotatable getOrdersAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Logins",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getLoginsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Husband",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
+ Annotatable getHusbandAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Wife",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
+ Annotatable getWifeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Info",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo")
+ Annotatable getInfoAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
index 38cf43c..e2e1684 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface CustomerCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer> {
+public interface CustomerCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
index 4bf58ac..39aeb4a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
@@ -1,135 +1,102 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "CustomerInfo",
- openType = false,
- hasStream = true,
- isAbstract = false)
-public interface CustomerInfo
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerInfoId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getCustomerInfoId();
-
- void setCustomerInfoId(java.lang.Integer _customerInfoId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Information",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getInformation();
-
- void setInformation(java.lang.String _information);
-
-
-
- void setStream(java.io.InputStream stream);
-
- java.io.InputStream getStream();
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerInfoId",
- type = "Edm.Int32")
- Annotatable getCustomerInfoIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Information",
- type = "Edm.String")
- Annotatable getInformationAnnotations();
-
-
- }
+ openType = false,
+ hasStream = true,
+ isAbstract = false)
+public interface CustomerInfo
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerInfoId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getCustomerInfoId();
+
+ void setCustomerInfoId(java.lang.Integer _customerInfoId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Information",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getInformation();
+
+ void setInformation(java.lang.String _information);
+
+ void setStream(java.io.InputStream stream);
+
+ java.io.InputStream getStream();
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerInfoId",
+ type = "Edm.Int32")
+ Annotatable getCustomerInfoIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Information",
+ type = "Edm.String")
+ Annotatable getInformationAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
index b7ee55f..7546d54 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface CustomerInfoCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo> {
+public interface CustomerInfoCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
index fcbf94e..61741a9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
@@ -1,82 +1,45 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Dimensions")
-public interface Dimensions
+public interface Dimensions
extends java.io.Serializable {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Width", type = "Edm.Decimal", nullable = false)
+ java.math.BigDecimal getWidth();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Width", type = "Edm.Decimal", nullable = false)
- java.math.BigDecimal getWidth();
-
- void setWidth(java.math.BigDecimal _width);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Height", type = "Edm.Decimal", nullable = false)
- java.math.BigDecimal getHeight();
-
- void setHeight(java.math.BigDecimal _height);
+ void setWidth(java.math.BigDecimal _width);
-
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Height", type = "Edm.Decimal", nullable = false)
+ java.math.BigDecimal getHeight();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Depth", type = "Edm.Decimal", nullable = false)
- java.math.BigDecimal getDepth();
+ void setHeight(java.math.BigDecimal _height);
- void setDepth(java.math.BigDecimal _depth);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Depth", type = "Edm.Decimal", nullable = false)
+ java.math.BigDecimal getDepth();
-
+ void setDepth(java.math.BigDecimal _depth);
- ComplexFactory factory();
+ ComplexFactory factory();
- interface ComplexFactory {
- }
+ interface ComplexFactory {}
}
[30/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
index a343d6b..44868c8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ComputerDetail")
-public interface ComputerDetail
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetailCollection> {
+public interface ComputerDetail
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetailCollection> {
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail
+ newComputerDetail();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail newComputerDetail();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetailCollection newComputerDetailCollection();
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetailCollection
+ newComputerDetailCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java
index bcc8ebd..e2600a9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Customer")
-public interface Customer
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection> {
+public interface Customer
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection> {
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer
+ newCustomer();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer newCustomer();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection newCustomerCollection();
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection
+ newCustomerCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
index c4b6785..aec700f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "CustomerInfo")
-public interface CustomerInfo
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfoCollection> {
+public interface CustomerInfo
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfoCollection> {
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo
+ newCustomerInfo();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo newCustomerInfo();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfoCollection newCustomerInfoCollection();
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfoCollection
+ newCustomerInfoCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
index 16f8502..bbb5a53 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
@@ -1,172 +1,181 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.PersistenceManager;
import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+import org.apache.olingo.ext.proxy.api.PersistenceManager;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "DefaultContainer",
- namespace = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- isDefaultEntityContainer = true)
+ namespace = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ isDefaultEntityContainer = true)
public interface DefaultContainer extends PersistenceManager {
- Customer getCustomer();
- Login getLogin();
- OrderLine getOrderLine();
- ComputerDetail getComputerDetail();
- Product getProduct();
- Message getMessage();
- ProductDetail getProductDetail();
- ProductPhoto getProductPhoto();
- Order getOrder();
- Computer getComputer();
- MappedEntityType getMappedEntityType();
- PageView getPageView();
- Driver getDriver();
- AllGeoCollectionTypesSet getAllGeoCollectionTypesSet();
- Car getCar();
- CustomerInfo getCustomerInfo();
- License getLicense();
- ProductReview getProductReview();
- LastLogin getLastLogin();
- MessageAttachment getMessageAttachment();
- AllGeoTypesSet getAllGeoTypesSet();
- PersonMetadata getPersonMetadata();
- RSAToken getRSAToken();
- Person getPerson();
+ Customer getCustomer();
+
+ Login getLogin();
+
+ OrderLine getOrderLine();
+
+ ComputerDetail getComputerDetail();
+
+ Product getProduct();
+
+ Message getMessage();
+
+ ProductDetail getProductDetail();
+
+ ProductPhoto getProductPhoto();
+
+ Order getOrder();
+
+ Computer getComputer();
+
+ MappedEntityType getMappedEntityType();
+
+ PageView getPageView();
+ Driver getDriver();
+ AllGeoCollectionTypesSet getAllGeoCollectionTypesSet();
+ Car getCar();
+
+ CustomerInfo getCustomerInfo();
+
+ License getLicense();
+
+ ProductReview getProductReview();
+
+ LastLogin getLastLogin();
+
+ MessageAttachment getMessageAttachment();
+
+ AllGeoTypesSet getAllGeoTypesSet();
+
+ PersonMetadata getPersonMetadata();
+
+ RSAToken getRSAToken();
+
+ Person getPerson();
Operations operations();
public interface Operations {
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetSpecificCustomer",
- type = OperationType.FUNCTION,
- isComposable = false,
- returnType = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Customer)")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection getSpecificCustomer(
- @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "Name", type = "Edm.String", nullable = true) java.lang.String name
- );
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "InStreamErrorGetCustomer",
- type = OperationType.FUNCTION,
- isComposable = false,
- returnType = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Customer)")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection inStreamErrorGetCustomer(
- );
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetPrimitiveString",
- type = OperationType.FUNCTION,
- isComposable = false,
- returnType = "Edm.String")
- java.lang.String getPrimitiveString(
- );
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "EntityProjectionReturnsCollectionOfComplexTypes",
- type = OperationType.FUNCTION,
- isComposable = false,
- returnType = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)")
- java.util.Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> entityProjectionReturnsCollectionOfComplexTypes(
- );
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetArgumentPlusOne",
- type = OperationType.FUNCTION,
- isComposable = false,
- returnType = "Edm.Int32")
- java.lang.Integer getArgumentPlusOne(
- @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "arg1", type = "Edm.Int32", nullable = false) java.lang.Integer arg1
- );
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetCustomerCount",
- type = OperationType.FUNCTION,
- isComposable = false,
- returnType = "Edm.Int32")
- java.lang.Integer getCustomerCount(
- );
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ResetDataSource",
- type = OperationType.ACTION)
- void resetDataSource(
- );
-
- }
-
- ComplexFactory complexFactory();
-
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactDetails",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newContactDetails();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AuditInfo",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newAuditInfo();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyInfo",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newConcurrencyInfo();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexToCategory",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory newComplexToCategory();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Phone",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newPhone();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Aliases",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases newAliases();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexWithAllPrimitiveTypes",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexWithAllPrimitiveTypes")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexWithAllPrimitiveTypes newComplexWithAllPrimitiveTypes();
-
- }
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetSpecificCustomer",
+ type = OperationType.FUNCTION,
+ isComposable = false,
+ returnType = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Customer)")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection
+ getSpecificCustomer(
+ @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "Name", type = "Edm.String", nullable = true) java.lang.String name
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "InStreamErrorGetCustomer",
+ type = OperationType.FUNCTION,
+ isComposable = false,
+ returnType = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Customer)")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection
+ inStreamErrorGetCustomer(
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetPrimitiveString",
+ type = OperationType.FUNCTION,
+ isComposable = false,
+ returnType = "Edm.String")
+ java.lang.String getPrimitiveString(
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "EntityProjectionReturnsCollectionOfComplexTypes",
+ type = OperationType.FUNCTION,
+ isComposable = false,
+ returnType = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)")
+ java.util.Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails>
+ entityProjectionReturnsCollectionOfComplexTypes(
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetArgumentPlusOne",
+ type = OperationType.FUNCTION,
+ isComposable = false,
+ returnType = "Edm.Int32")
+ java.lang.Integer
+ getArgumentPlusOne(
+ @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "arg1", type = "Edm.Int32", nullable = false) java.lang.Integer arg1
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetCustomerCount",
+ type = OperationType.FUNCTION,
+ isComposable = false,
+ returnType = "Edm.Int32")
+ java.lang.Integer getCustomerCount(
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ResetDataSource",
+ type = OperationType.ACTION)
+ void resetDataSource(
+ );
+
+ }
+
+ ComplexFactory complexFactory();
+
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactDetails",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails
+ newContactDetails();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AuditInfo",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo
+ newAuditInfo();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyInfo",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo
+ newConcurrencyInfo();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions
+ newDimensions();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexToCategory",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory
+ newComplexToCategory();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Phone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone
+ newPhone();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Aliases",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases
+ newAliases();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexWithAllPrimitiveTypes",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexWithAllPrimitiveTypes")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexWithAllPrimitiveTypes
+ newComplexWithAllPrimitiveTypes();
+
}
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java
index bd0517f..343c6c2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Driver")
-public interface Driver
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver, java.lang.String, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.DriverCollection> {
+public interface Driver
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver, java.lang.String, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.DriverCollection> {
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver
+ newDriver();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver newDriver();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.DriverCollection newDriverCollection();
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.DriverCollection
+ newDriverCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
index 27333bb..3a63808 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "LastLogin")
-public interface LastLogin
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin, java.lang.String, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLoginCollection> {
+public interface LastLogin
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin, java.lang.String, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLoginCollection> {
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin
+ newLastLogin();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin newLastLogin();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLoginCollection newLastLoginCollection();
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLoginCollection
+ newLastLoginCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java
index bfca449..9c911bc 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "License")
-public interface License
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.License, java.lang.String, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LicenseCollection> {
+public interface License
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.License, java.lang.String, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LicenseCollection> {
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.License
+ newLicense();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.License newLicense();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LicenseCollection newLicenseCollection();
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LicenseCollection
+ newLicenseCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java
index 664b62e..35442e8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Login")
-public interface Login
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login, java.lang.String, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection> {
+public interface Login
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login, java.lang.String, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection> {
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login
+ newLogin();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login newLogin();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection newLoginCollection();
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection
+ newLoginCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
index 363491c..fa95746 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "MappedEntityType")
-public interface MappedEntityType
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityTypeCollection> {
+public interface MappedEntityType
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityTypeCollection> {
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType
+ newMappedEntityType();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType newMappedEntityType();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityTypeCollection newMappedEntityTypeCollection();
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityTypeCollection
+ newMappedEntityTypeCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java
index 9bc53dd..7048314 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,16 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageKey;
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Message")
-public interface Message
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Message, MessageKey, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection> {
+public interface Message
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Message, MessageKey, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection> {
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Message
+ newMessage();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Message newMessage();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection newMessageCollection();
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection
+ newMessageCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
index fc97e12..585f6c0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "MessageAttachment")
-public interface MessageAttachment
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment, java.util.UUID, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection> {
+public interface MessageAttachment
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment, java.util.UUID, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection> {
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment
+ newMessageAttachment();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment newMessageAttachment();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection newMessageAttachmentCollection();
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection
+ newMessageAttachmentCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java
index d46b417..fba5282 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Order")
-public interface Order
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection> {
+public interface Order
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection> {
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order
+ newOrder();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order newOrder();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection newOrderCollection();
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection
+ newOrderCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
index d9135b1..f9a5f0b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,37 +20,28 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
+import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineKey;
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "OrderLine")
-public interface OrderLine
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine, OrderLineKey, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineCollection> {
-
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine newOrderLine();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineCollection newOrderLineCollection();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine newBackOrderLine();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLineCollection newBackOrderLineCollection();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2 newBackOrderLine2();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2Collection newBackOrderLine2Collection();
+public interface OrderLine
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine, OrderLineKey, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineCollection> {
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine
+ newOrderLine();
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineCollection
+ newOrderLineCollection();
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine
+ newBackOrderLine();
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLineCollection
+ newBackOrderLineCollection();
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2
+ newBackOrderLine2();
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2Collection
+ newBackOrderLine2Collection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java
index 820335d..fa229c6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,35 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "PageView")
+public interface PageView
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageViewCollection> {
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView
+ newPageView();
-@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "PageView")
-public interface PageView
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageViewCollection> {
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageViewCollection
+ newPageViewCollection();
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPageView
+ newProductPageView();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView newPageView();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageViewCollection newPageViewCollection();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPageView newProductPageView();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPageViewCollection newProductPageViewCollection();
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPageViewCollection
+ newProductPageViewCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java
index 25cfc1f..24e36da 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,39 +20,33 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Person")
-public interface Person
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection> {
-
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person newPerson();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection newPersonCollection();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Contractor newContractor();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContractorCollection newContractorCollection();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee newEmployee();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection newEmployeeCollection();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee newSpecialEmployee();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployeeCollection newSpecialEmployeeCollection();
+public interface Person
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection> {
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person
+ newPerson();
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection
+ newPersonCollection();
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Contractor
+ newContractor();
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContractorCollection
+ newContractorCollection();
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee
+ newEmployee();
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection
+ newEmployeeCollection();
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee
+ newSpecialEmployee();
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployeeCollection
+ newSpecialEmployeeCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
index 6fed193..23c69da 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "PersonMetadata")
-public interface PersonMetadata
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection> {
+public interface PersonMetadata
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection> {
+
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata
+ newPersonMetadata();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata newPersonMetadata();
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection newPersonMetadataCollection();
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection
+ newPersonMetadataCollection();
}
[11/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java
index 552fa51..2e933cb 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface CreditRecordCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecord> {
+public interface CreditRecordCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecord> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java
index 648d99f..a087d05 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java
@@ -1,428 +1,433 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Customer",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.ODataWCFService.Person")
-public interface Customer
- extends Annotatable,org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPersonID();
-
- void setPersonID(java.lang.Integer _personID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getFirstName();
-
- void setFirstName(java.lang.String _firstName);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getLastName();
-
- void setLastName(java.lang.String _lastName);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MiddleName",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getMiddleName();
-
- void setMiddleName(java.lang.String _middleName);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Address",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address getHomeAddress();
-
- void setHomeAddress(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Home",
- type = "Edm.GeographyPoint",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.Point getHome();
-
- void setHome(org.apache.olingo.commons.api.edm.geo.Point _home);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Numbers",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.lang.String> getNumbers();
-
- void setNumbers(java.util.Collection<java.lang.String> _numbers);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Emails",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.lang.String> getEmails();
-
- void setEmails(java.util.Collection<java.lang.String> _emails);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getCity();
-
- void setCity(java.lang.String _city);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Birthday",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getBirthday();
-
- void setBirthday(java.util.Calendar _birthday);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TimeBetweenLastTwoOrders",
- type = "Edm.Duration",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.math.BigDecimal getTimeBetweenLastTwoOrders();
-
- void setTimeBetweenLastTwoOrders(java.math.BigDecimal _timeBetweenLastTwoOrders);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Parent",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Person",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "People",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person getParent();
-
- void setParent(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person _parent);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Orders",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Order",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "Orders",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection getOrders();
-
- void setOrders(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection _orders);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Company",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Company",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "Company",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company getCompany();
-
- void setCompany(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company _company);
-
-
- @Override
- Operations operations();
-
- interface Operations extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.Operations{
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.ComplexFactory{
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newHomeAddress();
-
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonID",
- type = "Edm.Int32")
- Annotatable getPersonIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FirstName",
- type = "Edm.String")
- Annotatable getFirstNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LastName",
- type = "Edm.String")
- Annotatable getLastNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "MiddleName",
- type = "Edm.String")
- Annotatable getMiddleNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HomeAddress",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
- Annotatable getHomeAddressAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Home",
- type = "Edm.GeographyPoint")
- Annotatable getHomeAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Numbers",
- type = "Edm.String")
- Annotatable getNumbersAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Emails",
- type = "Edm.String")
- Annotatable getEmailsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "City",
- type = "Edm.String")
- Annotatable getCityAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Birthday",
- type = "Edm.DateTimeOffset")
- Annotatable getBirthdayAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TimeBetweenLastTwoOrders",
- type = "Edm.Duration")
- Annotatable getTimeBetweenLastTwoOrdersAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Parent",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Person")
- Annotatable getParentAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Orders",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Order")
- Annotatable getOrdersAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Company",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Company")
- Annotatable getCompanyAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.ODataWCFService.Person")
+public interface Customer
+ extends Annotatable,
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person {
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPersonID();
+
+ @Override
+ void setPersonID(java.lang.Integer _personID);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getFirstName();
+
+ @Override
+ void setFirstName(java.lang.String _firstName);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getLastName();
+
+ @Override
+ void setLastName(java.lang.String _lastName);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MiddleName",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getMiddleName();
+
+ @Override
+ void setMiddleName(java.lang.String _middleName);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Address",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address
+ getHomeAddress();
+
+ @Override
+ void
+ setHomeAddress(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Home",
+ type = "Edm.GeographyPoint",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.Point getHome();
+
+ @Override
+ void setHome(org.apache.olingo.commons.api.edm.geo.Point _home);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Numbers",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.lang.String> getNumbers();
+
+ @Override
+ void setNumbers(java.util.Collection<java.lang.String> _numbers);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Emails",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.lang.String> getEmails();
+
+ @Override
+ void setEmails(java.util.Collection<java.lang.String> _emails);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getCity();
+
+ void setCity(java.lang.String _city);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Birthday",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getBirthday();
+
+ void setBirthday(java.util.Calendar _birthday);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TimeBetweenLastTwoOrders",
+ type = "Edm.Duration",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.math.BigDecimal getTimeBetweenLastTwoOrders();
+
+ void setTimeBetweenLastTwoOrders(java.math.BigDecimal _timeBetweenLastTwoOrders);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Parent",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Person",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "People",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person getParent();
+
+ @Override
+ void setParent(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person _parent);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Orders",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Order",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "Orders",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection
+ getOrders();
+
+ void
+ setOrders(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection _orders);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Company",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Company",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "Company",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company getCompany();
+
+ void
+ setCompany(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company _company);
+
+ @Override
+ Operations operations();
+
+ interface Operations
+ extends
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.Operations {
+
+ }
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory
+ extends
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.ComplexFactory {
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address
+ newHomeAddress();
+
+ }
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations
+ extends
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonID",
+ type = "Edm.Int32")
+ Annotatable getPersonIDAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FirstName",
+ type = "Edm.String")
+ Annotatable getFirstNameAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LastName",
+ type = "Edm.String")
+ Annotatable getLastNameAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "MiddleName",
+ type = "Edm.String")
+ Annotatable getMiddleNameAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HomeAddress",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
+ Annotatable getHomeAddressAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Home",
+ type = "Edm.GeographyPoint")
+ Annotatable getHomeAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Numbers",
+ type = "Edm.String")
+ Annotatable getNumbersAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Emails",
+ type = "Edm.String")
+ Annotatable getEmailsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "City",
+ type = "Edm.String")
+ Annotatable getCityAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Birthday",
+ type = "Edm.DateTimeOffset")
+ Annotatable getBirthdayAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TimeBetweenLastTwoOrders",
+ type = "Edm.Duration")
+ Annotatable getTimeBetweenLastTwoOrdersAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Parent",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Person")
+ Annotatable getParentAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Orders",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Order")
+ Annotatable getOrdersAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Company",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Company")
+ Annotatable getCompanyAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java
index 61c96c4..27bcdec 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface CustomerCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer> {
+public interface CustomerCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java
index 3f9a329..3d46785 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java
@@ -1,173 +1,139 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Department",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Department
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DepartmentID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getDepartmentID();
-
- void setDepartmentID(java.lang.Integer _departmentID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DepartmentNO",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getDepartmentNO();
-
- void setDepartmentNO(java.lang.String _departmentNO);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Company",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Company",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "Company",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company getCompany();
-
- void setCompany(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company _company);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DepartmentID",
- type = "Edm.Int32")
- Annotatable getDepartmentIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DepartmentNO",
- type = "Edm.String")
- Annotatable getDepartmentNOAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Company",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Company")
- Annotatable getCompanyAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Department
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DepartmentID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getDepartmentID();
+
+ void setDepartmentID(java.lang.Integer _departmentID);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DepartmentNO",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getDepartmentNO();
+
+ void setDepartmentNO(java.lang.String _departmentNO);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Company",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Company",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "Company",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company getCompany();
+
+ void
+ setCompany(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company _company);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DepartmentID",
+ type = "Edm.Int32")
+ Annotatable getDepartmentIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DepartmentNO",
+ type = "Edm.String")
+ Annotatable getDepartmentNOAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Company",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Company")
+ Annotatable getCompanyAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java
index 4da5e12..63428d0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface DepartmentCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department> {
+public interface DepartmentCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java
index 6b86ec5..07c93b4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java
@@ -1,387 +1,390 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Employee",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.ODataWCFService.Person")
-public interface Employee
- extends Annotatable,org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPersonID();
-
- void setPersonID(java.lang.Integer _personID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getFirstName();
-
- void setFirstName(java.lang.String _firstName);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getLastName();
-
- void setLastName(java.lang.String _lastName);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MiddleName",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getMiddleName();
-
- void setMiddleName(java.lang.String _middleName);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Address",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address getHomeAddress();
-
- void setHomeAddress(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Home",
- type = "Edm.GeographyPoint",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.Point getHome();
-
- void setHome(org.apache.olingo.commons.api.edm.geo.Point _home);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Numbers",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.lang.String> getNumbers();
-
- void setNumbers(java.util.Collection<java.lang.String> _numbers);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Emails",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.lang.String> getEmails();
-
- void setEmails(java.util.Collection<java.lang.String> _emails);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DateHired",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getDateHired();
-
- void setDateHired(java.util.Calendar _dateHired);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Office",
- type = "Edm.GeographyPoint",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.Point getOffice();
-
- void setOffice(org.apache.olingo.commons.api.edm.geo.Point _office);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Parent",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Person",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "People",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person getParent();
-
- void setParent(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person _parent);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Company",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Company",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "Company",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company getCompany();
-
- void setCompany(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company _company);
-
-
- @Override
- Operations operations();
-
- interface Operations extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.Operations{
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.ComplexFactory{
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newHomeAddress();
-
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonID",
- type = "Edm.Int32")
- Annotatable getPersonIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FirstName",
- type = "Edm.String")
- Annotatable getFirstNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LastName",
- type = "Edm.String")
- Annotatable getLastNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "MiddleName",
- type = "Edm.String")
- Annotatable getMiddleNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HomeAddress",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
- Annotatable getHomeAddressAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Home",
- type = "Edm.GeographyPoint")
- Annotatable getHomeAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Numbers",
- type = "Edm.String")
- Annotatable getNumbersAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Emails",
- type = "Edm.String")
- Annotatable getEmailsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DateHired",
- type = "Edm.DateTimeOffset")
- Annotatable getDateHiredAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Office",
- type = "Edm.GeographyPoint")
- Annotatable getOfficeAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Parent",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Person")
- Annotatable getParentAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Company",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Company")
- Annotatable getCompanyAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.ODataWCFService.Person")
+public interface Employee
+ extends Annotatable,
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person {
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPersonID();
+
+ @Override
+ void setPersonID(java.lang.Integer _personID);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getFirstName();
+
+ @Override
+ void setFirstName(java.lang.String _firstName);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getLastName();
+
+ @Override
+ void setLastName(java.lang.String _lastName);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MiddleName",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getMiddleName();
+
+ @Override
+ void setMiddleName(java.lang.String _middleName);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Address",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address
+ getHomeAddress();
+
+ @Override
+ void
+ setHomeAddress(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Home",
+ type = "Edm.GeographyPoint",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.Point getHome();
+
+ @Override
+ void setHome(org.apache.olingo.commons.api.edm.geo.Point _home);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Numbers",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.lang.String> getNumbers();
+
+ @Override
+ void setNumbers(java.util.Collection<java.lang.String> _numbers);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Emails",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.lang.String> getEmails();
+
+ @Override
+ void setEmails(java.util.Collection<java.lang.String> _emails);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DateHired",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getDateHired();
+
+ void setDateHired(java.util.Calendar _dateHired);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Office",
+ type = "Edm.GeographyPoint",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.Point getOffice();
+
+ void setOffice(org.apache.olingo.commons.api.edm.geo.Point _office);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Parent",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Person",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "People",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person getParent();
+
+ @Override
+ void setParent(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person _parent);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Company",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Company",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "Company",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company getCompany();
+
+ void
+ setCompany(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company _company);
+
+ @Override
+ Operations operations();
+
+ interface Operations
+ extends
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.Operations {
+
+ }
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory
+ extends
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.ComplexFactory {
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address
+ newHomeAddress();
+
+ }
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations
+ extends
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonID",
+ type = "Edm.Int32")
+ Annotatable getPersonIDAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FirstName",
+ type = "Edm.String")
+ Annotatable getFirstNameAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LastName",
+ type = "Edm.String")
+ Annotatable getLastNameAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "MiddleName",
+ type = "Edm.String")
+ Annotatable getMiddleNameAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HomeAddress",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
+ Annotatable getHomeAddressAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Home",
+ type = "Edm.GeographyPoint")
+ Annotatable getHomeAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Numbers",
+ type = "Edm.String")
+ Annotatable getNumbersAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Emails",
+ type = "Edm.String")
+ Annotatable getEmailsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DateHired",
+ type = "Edm.DateTimeOffset")
+ Annotatable getDateHiredAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Office",
+ type = "Edm.GeographyPoint")
+ Annotatable getOfficeAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Parent",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Person")
+ Annotatable getParentAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Company",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Company")
+ Annotatable getCompanyAnnotations();
+ }
}
[25/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
index 73ded83..2b9b06f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
@@ -1,454 +1,485 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "DiscontinuedProduct",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
-public interface DiscontinuedProduct
- extends Annotatable,org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product {
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Picture",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.io.InputStream getPicture();
-
- void setPicture(java.io.InputStream _picture);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductId();
-
- void setProductId(java.lang.Integer _productId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getDescription();
-
- void setDescription(java.lang.String _description);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions getDimensions();
-
- void setDimensions(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BaseConcurrency",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getBaseConcurrency();
-
- void setBaseConcurrency(java.lang.String _baseConcurrency);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getComplexConcurrency();
-
- void setComplexConcurrency(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _complexConcurrency);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "NestedComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo getNestedComplexConcurrency();
-
- void setNestedComplexConcurrency(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _nestedComplexConcurrency);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Discontinued",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getDiscontinued();
-
- void setDiscontinued(java.util.Calendar _discontinued);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReplacementProductId",
- type = "Edm.Int32",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getReplacementProductId();
-
- void setReplacementProductId(java.lang.Integer _replacementProductId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DiscontinuedPhone",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getDiscontinuedPhone();
-
- void setDiscontinuedPhone(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _discontinuedPhone);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ChildConcurrencyToken",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getChildConcurrencyToken();
-
- void setChildConcurrencyToken(java.lang.String _childConcurrencyToken);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "RelatedProducts",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Product",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection getRelatedProducts();
-
- void setRelatedProducts(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection _relatedProducts);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Detail",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "ProductDetail",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail getDetail();
-
- void setDetail(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail _detail);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Reviews",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "ProductReview",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection getReviews();
-
- void setReviews(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection _reviews);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Photos",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "ProductPhoto",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection getPhotos();
-
- void setPhotos(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection _photos);
-
-
- @Override
- Operations operations();
-
- interface Operations extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product.Operations{
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product.ComplexFactory{
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newComplexConcurrency();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "NestedComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newNestedComplexConcurrency();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DiscontinuedPhone",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newDiscontinuedPhone();
-
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Picture",
- type = "Edm.Stream")
- Annotatable getPictureAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
- type = "Edm.Int32")
- Annotatable getProductIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
- type = "Edm.String")
- Annotatable getDescriptionAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
- Annotatable getDimensionsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BaseConcurrency",
- type = "Edm.String")
- Annotatable getBaseConcurrencyAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
- Annotatable getComplexConcurrencyAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "NestedComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
- Annotatable getNestedComplexConcurrencyAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Discontinued",
- type = "Edm.DateTime")
- Annotatable getDiscontinuedAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ReplacementProductId",
- type = "Edm.Int32")
- Annotatable getReplacementProductIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DiscontinuedPhone",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
- Annotatable getDiscontinuedPhoneAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ChildConcurrencyToken",
- type = "Edm.String")
- Annotatable getChildConcurrencyTokenAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "RelatedProducts",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
- Annotatable getRelatedProductsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Detail",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail")
- Annotatable getDetailAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Reviews",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview")
- Annotatable getReviewsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Photos",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto")
- Annotatable getPhotosAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+public interface DiscontinuedProduct
+ extends Annotatable,
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Picture",
+ type = "Edm.Stream",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.io.InputStream getPicture();
+
+ @Override
+ void setPicture(java.io.InputStream _picture);
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductId();
+
+ @Override
+ void setProductId(java.lang.Integer _productId);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getDescription();
+
+ @Override
+ void setDescription(java.lang.String _description);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions
+ getDimensions();
+
+ @Override
+ void
+ setDimensions(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BaseConcurrency",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getBaseConcurrency();
+
+ @Override
+ void setBaseConcurrency(java.lang.String _baseConcurrency);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo
+ getComplexConcurrency();
+
+ @Override
+ void
+ setComplexConcurrency(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _complexConcurrency);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "NestedComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo
+ getNestedComplexConcurrency();
+
+ @Override
+ void
+ setNestedComplexConcurrency(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _nestedComplexConcurrency);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Discontinued",
+ type = "Edm.DateTime",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getDiscontinued();
+
+ void setDiscontinued(java.util.Calendar _discontinued);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReplacementProductId",
+ type = "Edm.Int32",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getReplacementProductId();
+
+ void setReplacementProductId(java.lang.Integer _replacementProductId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DiscontinuedPhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone
+ getDiscontinuedPhone();
+
+ void
+ setDiscontinuedPhone(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _discontinuedPhone);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ChildConcurrencyToken",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getChildConcurrencyToken();
+
+ void setChildConcurrencyToken(java.lang.String _childConcurrencyToken);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "RelatedProducts",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Product",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection
+ getRelatedProducts();
+
+ @Override
+ void
+ setRelatedProducts(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection _relatedProducts);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Detail",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "ProductDetail",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail
+ getDetail();
+
+ @Override
+ void
+ setDetail(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail _detail);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Reviews",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "ProductReview",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection
+ getReviews();
+
+ @Override
+ void
+ setReviews(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection _reviews);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Photos",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "ProductPhoto",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection
+ getPhotos();
+
+ @Override
+ void
+ setPhotos(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection _photos);
+
+ @Override
+ Operations operations();
+
+ interface Operations
+ extends
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product.Operations {
+
+ }
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory
+ extends
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product.ComplexFactory {
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions
+ newDimensions();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo
+ newComplexConcurrency();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "NestedComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo
+ newNestedComplexConcurrency();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DiscontinuedPhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone
+ newDiscontinuedPhone();
+
+ }
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations
+ extends
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Picture",
+ type = "Edm.Stream")
+ Annotatable getPictureAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
+ type = "Edm.String")
+ Annotatable getDescriptionAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Dimensions",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
+ Annotatable getDimensionsAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BaseConcurrency",
+ type = "Edm.String")
+ Annotatable getBaseConcurrencyAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
+ Annotatable getComplexConcurrencyAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "NestedComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
+ Annotatable getNestedComplexConcurrencyAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Discontinued",
+ type = "Edm.DateTime")
+ Annotatable getDiscontinuedAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ReplacementProductId",
+ type = "Edm.Int32")
+ Annotatable getReplacementProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DiscontinuedPhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
+ Annotatable getDiscontinuedPhoneAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ChildConcurrencyToken",
+ type = "Edm.String")
+ Annotatable getChildConcurrencyTokenAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "RelatedProducts",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getRelatedProductsAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Detail",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail")
+ Annotatable getDetailAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Reviews",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview")
+ Annotatable getReviewsAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Photos",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto")
+ Annotatable getPhotosAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
index 943899e..4eec229 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface DiscontinuedProductCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.DiscontinuedProduct> {
+public interface DiscontinuedProductCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.DiscontinuedProduct> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
index cf5f8c8..d42a8a1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
@@ -1,146 +1,114 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Driver",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Driver
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BirthDate",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getBirthDate();
-
- void setBirthDate(java.util.Calendar _birthDate);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "License",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.License",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "License",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.License getLicense();
-
- void setLicense(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.License _license);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BirthDate",
- type = "Edm.DateTime")
- Annotatable getBirthDateAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "License",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.License")
- Annotatable getLicenseAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Driver
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BirthDate",
+ type = "Edm.DateTime",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getBirthDate();
+
+ void setBirthDate(java.util.Calendar _birthDate);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "License",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.License",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "License",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.License
+ getLicense();
+
+ void
+ setLicense(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.License _license);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BirthDate",
+ type = "Edm.DateTime")
+ Annotatable getBirthDateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "License",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.License")
+ Annotatable getLicenseAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
index fc5aea4..8d9994d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface DriverCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver> {
+public interface DriverCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
index d5a33f2..e93a355 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
@@ -1,252 +1,238 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Employee",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person")
-public interface Employee
- extends Annotatable,org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPersonId();
-
- void setPersonId(java.lang.Integer _personId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManagersPersonId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getManagersPersonId();
-
- void setManagersPersonId(java.lang.Integer _managersPersonId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Salary",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getSalary();
-
- void setSalary(java.lang.Integer _salary);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Title",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getTitle();
-
- void setTitle(java.lang.String _title);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonMetadata",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "PersonMetadata",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection getPersonMetadata();
-
- void setPersonMetadata(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Manager",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Person",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee getManager();
-
- void setManager(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee _manager);
-
-
- Operations operations();
-
- interface Operations {
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "Sack",
- type = OperationType.ACTION)
- void sack(
- );
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person.ComplexFactory{
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
- type = "Edm.Int32")
- Annotatable getPersonIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManagersPersonId",
- type = "Edm.Int32")
- Annotatable getManagersPersonIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Salary",
- type = "Edm.Int32")
- Annotatable getSalaryAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Title",
- type = "Edm.String")
- Annotatable getTitleAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonMetadata",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata")
- Annotatable getPersonMetadataAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Manager",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee")
- Annotatable getManagerAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person")
+public interface Employee
+ extends Annotatable,
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person {
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPersonId();
+
+ @Override
+ void setPersonId(java.lang.Integer _personId);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ @Override
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManagersPersonId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getManagersPersonId();
+
+ void setManagersPersonId(java.lang.Integer _managersPersonId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Salary",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getSalary();
+
+ void setSalary(java.lang.Integer _salary);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Title",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getTitle();
+
+ void setTitle(java.lang.String _title);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonMetadata",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "PersonMetadata",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection
+ getPersonMetadata();
+
+ @Override
+ void
+ setPersonMetadata(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Manager",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Person",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee
+ getManager();
+
+ void
+ setManager(
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee _manager);
+
+ Operations operations();
+
+ interface Operations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "Sack",
+ type = OperationType.ACTION)
+ void sack(
+ );
+
+ }
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory
+ extends
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person.ComplexFactory {}
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations
+ extends
+ org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
+ type = "Edm.Int32")
+ Annotatable getPersonIdAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManagersPersonId",
+ type = "Edm.Int32")
+ Annotatable getManagersPersonIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Salary",
+ type = "Edm.Int32")
+ Annotatable getSalaryAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Title",
+ type = "Edm.String")
+ Annotatable getTitleAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonMetadata",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata")
+ Annotatable getPersonMetadataAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Manager",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee")
+ Annotatable getManagerAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
index 089ca2e..9742cec 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
@@ -1,62 +1,46 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
import org.apache.olingo.ext.proxy.api.OperationType;
import org.apache.olingo.ext.proxy.api.annotations.Operation;
import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface EmployeeCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee> {
- Operations operations();
+public interface EmployeeCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee> {
+ Operations operations();
- public interface Operations {
+ public interface Operations {
-
- @Operation(name = "IncreaseSalaries",
- type = OperationType.ACTION)
- void increaseSalaries(
- @Parameter(name = "n", type = "Edm.Int32", nullable = false) java.lang.Integer n
- );
+ @Operation(name = "IncreaseSalaries",
+ type = OperationType.ACTION)
+ void increaseSalaries(
+ @Parameter(name = "n", type = "Edm.Int32", nullable = false) java.lang.Integer n
+ );
- }
+ }
Object getAnnotation(Class<? extends AbstractTerm> term);
[09/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java
index ece3be9..24e2b1f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface OrderDetailCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail> {
+public interface OrderDetailCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java
index 9090cf2..ede4ce9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java
@@ -1,74 +1,50 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.AbstractEntityKey;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class OrderDetailKey extends AbstractEntityKey {
- private java.lang.Integer _orderID;
+ private static final long serialVersionUID = 1L;
+ private java.lang.Integer _orderID;
- @CompoundKeyElement(name = "OrderID", position = 0)
- public java.lang.Integer getOrderID() {
- return _orderID;
- }
+ @CompoundKeyElement(name = "OrderID", position = 0)
+ public java.lang.Integer getOrderID() {
+ return _orderID;
+ }
- public void setOrderID(java.lang.Integer _orderID) {
- this._orderID = _orderID;
- }
+ public void setOrderID(final java.lang.Integer _orderID) {
+ this._orderID = _orderID;
+ }
- private java.lang.Integer _productID;
+ private java.lang.Integer _productID;
- @CompoundKeyElement(name = "ProductID", position = 1)
- public java.lang.Integer getProductID() {
- return _productID;
- }
+ @CompoundKeyElement(name = "ProductID", position = 1)
+ public java.lang.Integer getProductID() {
+ return _productID;
+ }
- public void setProductID(java.lang.Integer _productID) {
- this._productID = _productID;
- }
+ public void setProductID(final java.lang.Integer _productID) {
+ this._productID = _productID;
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java
index 2a5bcd0..53c55b8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java
@@ -1,210 +1,187 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "PaymentInstrument",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface PaymentInstrument
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PaymentInstrumentID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPaymentInstrumentID();
-
- void setPaymentInstrumentID(java.lang.Integer _paymentInstrumentID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FriendlyName",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getFriendlyName();
-
- void setFriendlyName(java.lang.String _friendlyName);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CreatedDate",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getCreatedDate();
-
- void setCreatedDate(java.util.Calendar _createdDate);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "TheStoredPI",
- type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "StoredPIs",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI getTheStoredPI();
-
- void setTheStoredPI(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI _theStoredPI);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "BackupStoredPI",
- type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "StoredPIs",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI getBackupStoredPI();
-
- void setBackupStoredPI(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI _backupStoredPI);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PaymentInstrumentID",
- type = "Edm.Int32")
- Annotatable getPaymentInstrumentIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FriendlyName",
- type = "Edm.String")
- Annotatable getFriendlyNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CreatedDate",
- type = "Edm.DateTimeOffset")
- Annotatable getCreatedDateAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "TheStoredPI",
- type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI")
- Annotatable getTheStoredPIAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "BillingStatements",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Statement")
- Annotatable getBillingStatementsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "BackupStoredPI",
- type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI")
- Annotatable getBackupStoredPIAnnotations();
- }
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "BillingStatements",
- type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "StoredPIs",
- containsTarget = true)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.BillingStatements getBillingStatements();
- void setBillingStatements(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.BillingStatements _billingStatements);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "BillingStatements", contained = true)
- interface BillingStatements
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Statement, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StatementCollection> {
-
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Statement newStatement();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StatementCollection newStatementCollection();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface PaymentInstrument
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PaymentInstrumentID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPaymentInstrumentID();
+
+ void setPaymentInstrumentID(java.lang.Integer _paymentInstrumentID);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FriendlyName",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getFriendlyName();
+
+ void setFriendlyName(java.lang.String _friendlyName);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CreatedDate",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getCreatedDate();
+
+ void setCreatedDate(java.util.Calendar _createdDate);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "TheStoredPI",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "StoredPIs",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI
+ getTheStoredPI();
+
+ void
+ setTheStoredPI(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI _theStoredPI);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "BackupStoredPI",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "StoredPIs",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI
+ getBackupStoredPI();
+
+ void
+ setBackupStoredPI(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI _backupStoredPI);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PaymentInstrumentID",
+ type = "Edm.Int32")
+ Annotatable getPaymentInstrumentIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FriendlyName",
+ type = "Edm.String")
+ Annotatable getFriendlyNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CreatedDate",
+ type = "Edm.DateTimeOffset")
+ Annotatable getCreatedDateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "TheStoredPI",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI")
+ Annotatable getTheStoredPIAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "BillingStatements",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Statement")
+ Annotatable getBillingStatementsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "BackupStoredPI",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI")
+ Annotatable getBackupStoredPIAnnotations();
+ }
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "BillingStatements",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "StoredPIs",
+ containsTarget = true)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.BillingStatements
+ getBillingStatements();
+
+ void
+ setBillingStatements(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.BillingStatements _billingStatements);
+
+ @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "BillingStatements", contained = true)
+ interface BillingStatements
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Statement, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StatementCollection> {
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Statement
+ newStatement();
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StatementCollection
+ newStatementCollection();
}
+
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java
index b30e7c5..e6057de 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface PaymentInstrumentCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument> {
+public interface PaymentInstrumentCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java
index f6693e8..4eb9df0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java
@@ -1,332 +1,302 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.ext.proxy.api.annotations.Key;
+import org.apache.olingo.ext.proxy.api.annotations.Parameter;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Person",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Person
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPersonID();
-
- void setPersonID(java.lang.Integer _personID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getFirstName();
-
- void setFirstName(java.lang.String _firstName);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getLastName();
-
- void setLastName(java.lang.String _lastName);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MiddleName",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getMiddleName();
-
- void setMiddleName(java.lang.String _middleName);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Address",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address getHomeAddress();
-
- void setHomeAddress(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Home",
- type = "Edm.GeographyPoint",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.commons.api.edm.geo.Point getHome();
-
- void setHome(org.apache.olingo.commons.api.edm.geo.Point _home);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Numbers",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.lang.String> getNumbers();
-
- void setNumbers(java.util.Collection<java.lang.String> _numbers);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Emails",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.lang.String> getEmails();
-
- void setEmails(java.util.Collection<java.lang.String> _emails);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Parent",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Person",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "People",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person getParent();
-
- void setParent(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person _parent);
-
-
- Operations operations();
-
- interface Operations {
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetHomeAddress",
- type = OperationType.FUNCTION,
- isComposable = true,
- returnType = "Microsoft.Test.OData.Services.ODataWCFService.HomeAddress")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress getHomeAddress(
- );
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ResetAddress",
- type = OperationType.ACTION,
- returnType = "Microsoft.Test.OData.Services.ODataWCFService.Person")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person resetAddress(
- @Parameter(name = "addresses", type = "Collection(Microsoft.Test.OData.Services.ODataWCFService.Address)", nullable = false) java.util.Collection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address> addresses,
- @Parameter(name = "index", type = "Edm.Int32", nullable = false) java.lang.Integer index
- );
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newHomeAddress();
-
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonID",
- type = "Edm.Int32")
- Annotatable getPersonIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FirstName",
- type = "Edm.String")
- Annotatable getFirstNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LastName",
- type = "Edm.String")
- Annotatable getLastNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "MiddleName",
- type = "Edm.String")
- Annotatable getMiddleNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HomeAddress",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
- Annotatable getHomeAddressAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Home",
- type = "Edm.GeographyPoint")
- Annotatable getHomeAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Numbers",
- type = "Edm.String")
- Annotatable getNumbersAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Emails",
- type = "Edm.String")
- Annotatable getEmailsAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Parent",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Person")
- Annotatable getParentAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Person
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPersonID();
+
+ void setPersonID(java.lang.Integer _personID);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getFirstName();
+
+ void setFirstName(java.lang.String _firstName);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getLastName();
+
+ void setLastName(java.lang.String _lastName);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MiddleName",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getMiddleName();
+
+ void setMiddleName(java.lang.String _middleName);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Address",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address
+ getHomeAddress();
+
+ void
+ setHomeAddress(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Home",
+ type = "Edm.GeographyPoint",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.Point getHome();
+
+ void setHome(org.apache.olingo.commons.api.edm.geo.Point _home);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Numbers",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.lang.String> getNumbers();
+
+ void setNumbers(java.util.Collection<java.lang.String> _numbers);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Emails",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.lang.String> getEmails();
+
+ void setEmails(java.util.Collection<java.lang.String> _emails);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Parent",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Person",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "People",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person getParent();
+
+ void setParent(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person _parent);
+
+ Operations operations();
+
+ interface Operations {
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetHomeAddress",
+ type = OperationType.FUNCTION,
+ isComposable = true,
+ returnType = "Microsoft.Test.OData.Services.ODataWCFService.HomeAddress")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress
+ getHomeAddress(
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ResetAddress",
+ type = OperationType.ACTION,
+ returnType = "Microsoft.Test.OData.Services.ODataWCFService.Person")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person
+ resetAddress(
+ @Parameter(name = "addresses", type = "Collection(Microsoft.Test.OData.Services.ODataWCFService.Address)",
+ nullable = false) java.util.Collection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address> addresses,
+ @Parameter(name = "index", type = "Edm.Int32", nullable = false) java.lang.Integer index
+ );
+
+ }
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address
+ newHomeAddress();
+
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonID",
+ type = "Edm.Int32")
+ Annotatable getPersonIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FirstName",
+ type = "Edm.String")
+ Annotatable getFirstNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LastName",
+ type = "Edm.String")
+ Annotatable getLastNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "MiddleName",
+ type = "Edm.String")
+ Annotatable getMiddleNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HomeAddress",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
+ Annotatable getHomeAddressAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Home",
+ type = "Edm.GeographyPoint")
+ Annotatable getHomeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Numbers",
+ type = "Edm.String")
+ Annotatable getNumbersAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Emails",
+ type = "Edm.String")
+ Annotatable getEmailsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Parent",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Person")
+ Annotatable getParentAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java
index 2642070..5bdb747 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface PersonCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person> {
+public interface PersonCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java
index a1ea927..33d5e6a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java
@@ -1,355 +1,329 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.ext.proxy.api.annotations.Key;
+import org.apache.olingo.ext.proxy.api.annotations.Parameter;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Product",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Product
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductID();
-
- void setProductID(java.lang.Integer _productID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "QuantityPerUnit",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getQuantityPerUnit();
-
- void setQuantityPerUnit(java.lang.String _quantityPerUnit);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "UnitPrice",
- type = "Edm.Single",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Float getUnitPrice();
-
- void setUnitPrice(java.lang.Float _unitPrice);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "QuantityInStock",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getQuantityInStock();
-
- void setQuantityInStock(java.lang.Integer _quantityInStock);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Discontinued",
- type = "Edm.Boolean",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Boolean getDiscontinued();
-
- void setDiscontinued(java.lang.Boolean _discontinued);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "UserAccess",
- type = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel getUserAccess();
-
- void setUserAccess(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel _userAccess);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SkinColor",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Color",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color getSkinColor();
-
- void setSkinColor(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color _skinColor);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CoverColors",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Color",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color> getCoverColors();
-
- void setCoverColors(java.util.Collection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color> _coverColors);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Details",
- type = "Microsoft.Test.OData.Services.ODataWCFService.ProductDetail",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "ProductDetails",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection getDetails();
-
- void setDetails(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection _details);
-
-
- Operations operations();
-
- interface Operations {
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetProductDetails",
- type = OperationType.FUNCTION,
- isComposable = true,
- returnType = "Collection(Microsoft.Test.OData.Services.ODataWCFService.ProductDetail)")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection getProductDetails(
- @Parameter(name = "count", type = "Edm.Int32", nullable = true) java.lang.Integer count
- );
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "AddAccessRight",
- type = OperationType.ACTION,
- returnType = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel addAccessRight(
- @Parameter(name = "accessRight", type = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", nullable = true) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel accessRight
- );
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductID",
- type = "Edm.Int32")
- Annotatable getProductIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "QuantityPerUnit",
- type = "Edm.String")
- Annotatable getQuantityPerUnitAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "UnitPrice",
- type = "Edm.Single")
- Annotatable getUnitPriceAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "QuantityInStock",
- type = "Edm.Int32")
- Annotatable getQuantityInStockAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Discontinued",
- type = "Edm.Boolean")
- Annotatable getDiscontinuedAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "UserAccess",
- type = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel")
- Annotatable getUserAccessAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "SkinColor",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Color")
- Annotatable getSkinColorAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CoverColors",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Color")
- Annotatable getCoverColorsAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Details",
- type = "Microsoft.Test.OData.Services.ODataWCFService.ProductDetail")
- Annotatable getDetailsAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Product
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductID();
+
+ void setProductID(java.lang.Integer _productID);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "QuantityPerUnit",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getQuantityPerUnit();
+
+ void setQuantityPerUnit(java.lang.String _quantityPerUnit);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "UnitPrice",
+ type = "Edm.Single",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Float getUnitPrice();
+
+ void setUnitPrice(java.lang.Float _unitPrice);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "QuantityInStock",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getQuantityInStock();
+
+ void setQuantityInStock(java.lang.Integer _quantityInStock);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Discontinued",
+ type = "Edm.Boolean",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Boolean getDiscontinued();
+
+ void setDiscontinued(java.lang.Boolean _discontinued);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "UserAccess",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel
+ getUserAccess();
+
+ void
+ setUserAccess(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel _userAccess);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SkinColor",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Color",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color getSkinColor();
+
+ void
+ setSkinColor(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color _skinColor);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CoverColors",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Color",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color>
+ getCoverColors();
+
+ void
+ setCoverColors(
+ java.util.Collection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color> _coverColors);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Details",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.ProductDetail",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "ProductDetails",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection
+ getDetails();
+
+ void
+ setDetails(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection _details);
+
+ Operations operations();
+
+ interface Operations {
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetProductDetails",
+ type = OperationType.FUNCTION,
+ isComposable = true,
+ returnType = "Collection(Microsoft.Test.OData.Services.ODataWCFService.ProductDetail)")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection
+ getProductDetails(
+ @Parameter(name = "count", type = "Edm.Int32", nullable = true) java.lang.Integer count
+ );
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "AddAccessRight",
+ type = OperationType.ACTION,
+ returnType = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel
+ addAccessRight(
+ @Parameter(name = "accessRight", type = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel",
+ nullable = true) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel accessRight
+ );
+
+ }
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductID",
+ type = "Edm.Int32")
+ Annotatable getProductIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "QuantityPerUnit",
+ type = "Edm.String")
+ Annotatable getQuantityPerUnitAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "UnitPrice",
+ type = "Edm.Single")
+ Annotatable getUnitPriceAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "QuantityInStock",
+ type = "Edm.Int32")
+ Annotatable getQuantityInStockAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Discontinued",
+ type = "Edm.Boolean")
+ Annotatable getDiscontinuedAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "UserAccess",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel")
+ Annotatable getUserAccessAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "SkinColor",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Color")
+ Annotatable getSkinColorAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CoverColors",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Color")
+ Annotatable getCoverColorsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Details",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.ProductDetail")
+ Annotatable getDetailsAnnotations();
+ }
}
[42/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
index 1c38805..3c34c60 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface BackOrderLine2Collection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2> {
+public interface BackOrderLine2Collection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
index b3703e4..943212a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface BackOrderLineCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine> {
+public interface BackOrderLineCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Car.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
index 5053016..1a0f1bd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
@@ -1,189 +1,154 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Car",
- openType = false,
- hasStream = true,
- isAbstract = false)
-public interface Car
- extends Annotatable,java.io.Serializable {
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Photo",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.io.InputStream getPhoto();
-
- void setPhoto(java.io.InputStream _photo);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Video",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.io.InputStream getVideo();
-
- void setVideo(java.io.InputStream _video);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "VIN",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getVIN();
-
- void setVIN(java.lang.Integer _vIN);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getDescription();
-
- void setDescription(java.lang.String _description);
-
-
-
- void setStream(java.io.InputStream stream);
-
- java.io.InputStream getStream();
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Photo",
- type = "Edm.Stream")
- Annotatable getPhotoAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Video",
- type = "Edm.Stream")
- Annotatable getVideoAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "VIN",
- type = "Edm.Int32")
- Annotatable getVINAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
- type = "Edm.String")
- Annotatable getDescriptionAnnotations();
-
-
- }
+ openType = false,
+ hasStream = true,
+ isAbstract = false)
+public interface Car
+ extends Annotatable, java.io.Serializable {
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Photo",
+ type = "Edm.Stream",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.io.InputStream getPhoto();
+
+ void setPhoto(java.io.InputStream _photo);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Video",
+ type = "Edm.Stream",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.io.InputStream getVideo();
+
+ void setVideo(java.io.InputStream _video);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "VIN",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getVIN();
+
+ void setVIN(java.lang.Integer _vIN);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getDescription();
+
+ void setDescription(java.lang.String _description);
+
+ void setStream(java.io.InputStream stream);
+
+ java.io.InputStream getStream();
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Photo",
+ type = "Edm.Stream")
+ Annotatable getPhotoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Video",
+ type = "Edm.Stream")
+ Annotatable getVideoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "VIN",
+ type = "Edm.Int32")
+ Annotatable getVINAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
+ type = "Edm.String")
+ Annotatable getDescriptionAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
index 3a76468..2a39000 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface CarCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Car> {
+public interface CarCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Car> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
index f40fe98..5e2306b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
@@ -1,82 +1,45 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ComplexToCategory")
-public interface ComplexToCategory
+public interface ComplexToCategory
extends java.io.Serializable {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Term", type = "Edm.String", nullable = true)
+ java.lang.String getTerm();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Term", type = "Edm.String", nullable = true)
- java.lang.String getTerm();
-
- void setTerm(java.lang.String _term);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Scheme", type = "Edm.String", nullable = true)
- java.lang.String getScheme();
-
- void setScheme(java.lang.String _scheme);
+ void setTerm(java.lang.String _term);
-
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Scheme", type = "Edm.String", nullable = true)
+ java.lang.String getScheme();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Label", type = "Edm.String", nullable = true)
- java.lang.String getLabel();
+ void setScheme(java.lang.String _scheme);
- void setLabel(java.lang.String _label);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Label", type = "Edm.String", nullable = true)
+ java.lang.String getLabel();
-
+ void setLabel(java.lang.String _label);
- ComplexFactory factory();
+ ComplexFactory factory();
- interface ComplexFactory {
- }
+ interface ComplexFactory {}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
index 1b9b9b3..49a209b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
@@ -1,146 +1,114 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Computer",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Computer
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComputerId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getComputerId();
-
- void setComputerId(java.lang.Integer _computerId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ComputerDetail",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "ComputerDetail",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail getComputerDetail();
-
- void setComputerDetail(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail _computerDetail);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComputerId",
- type = "Edm.Int32")
- Annotatable getComputerIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ComputerDetail",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail")
- Annotatable getComputerDetailAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Computer
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComputerId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getComputerId();
+
+ void setComputerId(java.lang.Integer _computerId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ComputerDetail",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "ComputerDetail",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail
+ getComputerDetail();
+
+ void
+ setComputerDetail(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail _computerDetail);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComputerId",
+ type = "Edm.Int32")
+ Annotatable getComputerIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ComputerDetail",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail")
+ Annotatable getComputerDetailAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
index 4e0e1be..b55b6d6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface ComputerCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer> {
+public interface ComputerCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
index acaa884..7572aa3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
@@ -1,285 +1,253 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ComputerDetail",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface ComputerDetail
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComputerDetailId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getComputerDetailId();
-
- void setComputerDetailId(java.lang.Integer _computerDetailId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Manufacturer",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getManufacturer();
-
- void setManufacturer(java.lang.String _manufacturer);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Model",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getModel();
-
- void setModel(java.lang.String _model);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Serial",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getSerial();
-
- void setSerial(java.lang.String _serial);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SpecificationsBag",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.lang.String> getSpecificationsBag();
-
- void setSpecificationsBag(java.util.Collection<java.lang.String> _specificationsBag);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PurchaseDate",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getPurchaseDate();
-
- void setPurchaseDate(java.util.Calendar _purchaseDate);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions getDimensions();
-
- void setDimensions(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Computer",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Computer",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer getComputer();
-
- void setComputer(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer _computer);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions();
-
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComputerDetailId",
- type = "Edm.Int32")
- Annotatable getComputerDetailIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Manufacturer",
- type = "Edm.String")
- Annotatable getManufacturerAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Model",
- type = "Edm.String")
- Annotatable getModelAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Serial",
- type = "Edm.String")
- Annotatable getSerialAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "SpecificationsBag",
- type = "Edm.String")
- Annotatable getSpecificationsBagAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PurchaseDate",
- type = "Edm.DateTime")
- Annotatable getPurchaseDateAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
- Annotatable getDimensionsAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Computer",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer")
- Annotatable getComputerAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface ComputerDetail
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComputerDetailId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getComputerDetailId();
+
+ void setComputerDetailId(java.lang.Integer _computerDetailId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Manufacturer",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getManufacturer();
+
+ void setManufacturer(java.lang.String _manufacturer);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Model",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getModel();
+
+ void setModel(java.lang.String _model);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Serial",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getSerial();
+
+ void setSerial(java.lang.String _serial);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SpecificationsBag",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.lang.String> getSpecificationsBag();
+
+ void setSpecificationsBag(java.util.Collection<java.lang.String> _specificationsBag);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PurchaseDate",
+ type = "Edm.DateTime",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getPurchaseDate();
+
+ void setPurchaseDate(java.util.Calendar _purchaseDate);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions
+ getDimensions();
+
+ void
+ setDimensions(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Computer",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Computer",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer
+ getComputer();
+
+ void
+ setComputer(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer _computer);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions
+ newDimensions();
+
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComputerDetailId",
+ type = "Edm.Int32")
+ Annotatable getComputerDetailIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Manufacturer",
+ type = "Edm.String")
+ Annotatable getManufacturerAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Model",
+ type = "Edm.String")
+ Annotatable getModelAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Serial",
+ type = "Edm.String")
+ Annotatable getSerialAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "SpecificationsBag",
+ type = "Edm.String")
+ Annotatable getSpecificationsBagAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PurchaseDate",
+ type = "Edm.DateTime")
+ Annotatable getPurchaseDateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Dimensions",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
+ Annotatable getDimensionsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Computer",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer")
+ Annotatable getComputerAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
index db2cf21..8a386ee 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface ComputerDetailCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail> {
+public interface ComputerDetailCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
index 9f3325a..891ad00 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
@@ -1,75 +1,41 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ConcurrencyInfo")
-public interface ConcurrencyInfo
+public interface ConcurrencyInfo
extends java.io.Serializable {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Token", type = "Edm.String", nullable = true)
+ java.lang.String getToken();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Token", type = "Edm.String", nullable = true)
- java.lang.String getToken();
-
- void setToken(java.lang.String _token);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "QueriedDateTime", type = "Edm.DateTime", nullable = true)
- java.util.Calendar getQueriedDateTime();
+ void setToken(java.lang.String _token);
- void setQueriedDateTime(java.util.Calendar _queriedDateTime);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "QueriedDateTime", type = "Edm.DateTime",
+ nullable = true)
+ java.util.Calendar getQueriedDateTime();
-
+ void setQueriedDateTime(java.util.Calendar _queriedDateTime);
- ComplexFactory factory();
+ ComplexFactory factory();
- interface ComplexFactory {
- }
+ interface ComplexFactory {}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
index 942f038..17dbc9b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
@@ -1,119 +1,98 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ContactDetails")
-public interface ContactDetails
+public interface ContactDetails
extends java.io.Serializable {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "EmailBag", type = "Edm.String", nullable = false)
+ java.util.Collection<java.lang.String> getEmailBag();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "EmailBag", type = "Edm.String", nullable = false)
- java.util.Collection<java.lang.String> getEmailBag();
-
- void setEmailBag(java.util.Collection<java.lang.String> _emailBag);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AlternativeNames", type = "Edm.String", nullable = false)
- java.util.Collection<java.lang.String> getAlternativeNames();
-
- void setAlternativeNames(java.util.Collection<java.lang.String> _alternativeNames);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactAlias", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases", nullable = true)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases getContactAlias();
-
- void setContactAlias(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases _contactAlias);
+ void setEmailBag(java.util.Collection<java.lang.String> _emailBag);
-
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AlternativeNames", type = "Edm.String",
+ nullable = false)
+ java.util.Collection<java.lang.String> getAlternativeNames();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomePhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone getHomePhone();
+ void setAlternativeNames(java.util.Collection<java.lang.String> _alternativeNames);
- void setHomePhone(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _homePhone);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactAlias",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases", nullable = true)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases
+ getContactAlias();
-
+ void
+ setContactAlias(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases _contactAlias);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "WorkPhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone getWorkPhone();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomePhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone
+ getHomePhone();
- void setWorkPhone(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _workPhone);
+ void
+ setHomePhone(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _homePhone);
-
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "WorkPhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone
+ getWorkPhone();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MobilePhoneBag", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = false)
- java.util.Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone> getMobilePhoneBag();
+ void
+ setWorkPhone(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _workPhone);
- void setMobilePhoneBag(java.util.Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone> _mobilePhoneBag);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MobilePhoneBag",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = false)
+ java.util.Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone>
+ getMobilePhoneBag();
-
+ void
+ setMobilePhoneBag(
+ java.util.Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone> _mobilePhoneBag);
- ComplexFactory factory();
+ ComplexFactory factory();
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactAlias",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases newContactAlias();
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactAlias",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases
+ newContactAlias();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomePhone",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone newHomePhone();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomePhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone
+ newHomePhone();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "WorkPhone",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone newWorkPhone();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "WorkPhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone
+ newWorkPhone();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MobilePhoneBag",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone newMobilePhoneBag();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MobilePhoneBag",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone
+ newMobilePhoneBag();
- }
+ }
}
[36/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java
index 8f70362..50a90b7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface PersonCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person> {
+public interface PersonCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java
index e152ac0..bbadf59 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java
@@ -1,200 +1,166 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "PersonMetadata",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface PersonMetadata
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonMetadataId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPersonMetadataId();
-
- void setPersonMetadataId(java.lang.Integer _personMetadataId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPersonId();
-
- void setPersonId(java.lang.Integer _personId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PropertyName",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getPropertyName();
-
- void setPropertyName(java.lang.String _propertyName);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PropertyValue",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getPropertyValue();
-
- void setPropertyValue(java.lang.String _propertyValue);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Person",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Person",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person getPerson();
-
- void setPerson(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person _person);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonMetadataId",
- type = "Edm.Int32")
- Annotatable getPersonMetadataIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
- type = "Edm.Int32")
- Annotatable getPersonIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PropertyName",
- type = "Edm.String")
- Annotatable getPropertyNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PropertyValue",
- type = "Edm.String")
- Annotatable getPropertyValueAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Person",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person")
- Annotatable getPersonAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface PersonMetadata
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonMetadataId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPersonMetadataId();
+
+ void setPersonMetadataId(java.lang.Integer _personMetadataId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPersonId();
+
+ void setPersonId(java.lang.Integer _personId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PropertyName",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getPropertyName();
+
+ void setPropertyName(java.lang.String _propertyName);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PropertyValue",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getPropertyValue();
+
+ void setPropertyValue(java.lang.String _propertyValue);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Person",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Person",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person
+ getPerson();
+
+ void
+ setPerson(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person _person);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonMetadataId",
+ type = "Edm.Int32")
+ Annotatable getPersonMetadataIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
+ type = "Edm.Int32")
+ Annotatable getPersonIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PropertyName",
+ type = "Edm.String")
+ Annotatable getPropertyNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PropertyValue",
+ type = "Edm.String")
+ Annotatable getPropertyValueAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Person",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person")
+ Annotatable getPersonAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java
index bc5084f..043c4a9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface PersonMetadataCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata> {
+public interface PersonMetadataCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
index fb66c4c..5b5e77f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
@@ -1,75 +1,40 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Phone")
-public interface Phone
+public interface Phone
extends java.io.Serializable {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PhoneNumber", type = "Edm.String", nullable = true)
+ java.lang.String getPhoneNumber();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PhoneNumber", type = "Edm.String", nullable = true)
- java.lang.String getPhoneNumber();
-
- void setPhoneNumber(java.lang.String _phoneNumber);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Extension", type = "Edm.String", nullable = true)
- java.lang.String getExtension();
+ void setPhoneNumber(java.lang.String _phoneNumber);
- void setExtension(java.lang.String _extension);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Extension", type = "Edm.String", nullable = true)
+ java.lang.String getExtension();
-
+ void setExtension(java.lang.String _extension);
- ComplexFactory factory();
+ ComplexFactory factory();
- interface ComplexFactory {
- }
+ interface ComplexFactory {}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
index 6586645..95bef2c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
@@ -1,346 +1,333 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Product",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Product
- extends Annotatable,java.io.Serializable {
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Picture",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.io.InputStream getPicture();
-
- void setPicture(java.io.InputStream _picture);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductId();
-
- void setProductId(java.lang.Integer _productId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getDescription();
-
- void setDescription(java.lang.String _description);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions getDimensions();
-
- void setDimensions(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BaseConcurrency",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getBaseConcurrency();
-
- void setBaseConcurrency(java.lang.String _baseConcurrency);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getComplexConcurrency();
-
- void setComplexConcurrency(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _complexConcurrency);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "NestedComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo getNestedComplexConcurrency();
-
- void setNestedComplexConcurrency(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _nestedComplexConcurrency);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "RelatedProducts",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Product",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection getRelatedProducts();
-
- void setRelatedProducts(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection _relatedProducts);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Detail",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "ProductDetail",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail getDetail();
-
- void setDetail(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail _detail);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Reviews",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "ProductReview",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection getReviews();
-
- void setReviews(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection _reviews);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Photos",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "ProductPhoto",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection getPhotos();
-
- void setPhotos(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection _photos);
-
-
- Operations operations();
-
- interface Operations {
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "RetrieveProduct",
- type = OperationType.ACTION,
- returnType = "Edm.Int32")
- java.lang.Integer retrieveProduct(
- );
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newComplexConcurrency();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "NestedComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newNestedComplexConcurrency();
-
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Picture",
- type = "Edm.Stream")
- Annotatable getPictureAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
- type = "Edm.Int32")
- Annotatable getProductIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
- type = "Edm.String")
- Annotatable getDescriptionAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
- Annotatable getDimensionsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BaseConcurrency",
- type = "Edm.String")
- Annotatable getBaseConcurrencyAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
- Annotatable getComplexConcurrencyAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "NestedComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
- Annotatable getNestedComplexConcurrencyAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "RelatedProducts",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
- Annotatable getRelatedProductsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Detail",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail")
- Annotatable getDetailAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Reviews",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview")
- Annotatable getReviewsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Photos",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto")
- Annotatable getPhotosAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Product
+ extends Annotatable, java.io.Serializable {
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Picture",
+ type = "Edm.Stream",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.io.InputStream getPicture();
+
+ void setPicture(java.io.InputStream _picture);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductId();
+
+ void setProductId(java.lang.Integer _productId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getDescription();
+
+ void setDescription(java.lang.String _description);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions
+ getDimensions();
+
+ void
+ setDimensions(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BaseConcurrency",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getBaseConcurrency();
+
+ void setBaseConcurrency(java.lang.String _baseConcurrency);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo
+ getComplexConcurrency();
+
+ void
+ setComplexConcurrency(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _complexConcurrency);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "NestedComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo
+ getNestedComplexConcurrency();
+
+ void
+ setNestedComplexConcurrency(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _nestedComplexConcurrency);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "RelatedProducts",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Product",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection
+ getRelatedProducts();
+
+ void
+ setRelatedProducts(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection _relatedProducts);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Detail",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "ProductDetail",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail
+ getDetail();
+
+ void
+ setDetail(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail _detail);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Reviews",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "ProductReview",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection
+ getReviews();
+
+ void
+ setReviews(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection _reviews);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Photos",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "ProductPhoto",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection
+ getPhotos();
+
+ void
+ setPhotos(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection _photos);
+
+ Operations operations();
+
+ interface Operations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "RetrieveProduct",
+ type = OperationType.ACTION,
+ returnType = "Edm.Int32")
+ java.lang.Integer retrieveProduct(
+ );
+
+ }
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions
+ newDimensions();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo
+ newComplexConcurrency();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "NestedComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo
+ newNestedComplexConcurrency();
+
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Picture",
+ type = "Edm.Stream")
+ Annotatable getPictureAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
+ type = "Edm.String")
+ Annotatable getDescriptionAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Dimensions",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
+ Annotatable getDimensionsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BaseConcurrency",
+ type = "Edm.String")
+ Annotatable getBaseConcurrencyAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
+ Annotatable getComplexConcurrencyAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "NestedComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
+ Annotatable getNestedComplexConcurrencyAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "RelatedProducts",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getRelatedProductsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Detail",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail")
+ Annotatable getDetailAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Reviews",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview")
+ Annotatable getReviewsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Photos",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto")
+ Annotatable getPhotosAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java
index 4002f3d..6058275 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface ProductCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product> {
+public interface ProductCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java
index aeb66ed..46540bf 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java
@@ -1,146 +1,114 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ProductDetail",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface ProductDetail
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductId();
-
- void setProductId(java.lang.Integer _productId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Details",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getDetails();
-
- void setDetails(java.lang.String _details);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Product",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product getProduct();
-
- void setProduct(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
- type = "Edm.Int32")
- Annotatable getProductIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Details",
- type = "Edm.String")
- Annotatable getDetailsAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
- Annotatable getProductAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface ProductDetail
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductId();
+
+ void setProductId(java.lang.Integer _productId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Details",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getDetails();
+
+ void setDetails(java.lang.String _details);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Product",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product
+ getProduct();
+
+ void
+ setProduct(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Details",
+ type = "Edm.String")
+ Annotatable getDetailsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getProductAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java
index c92fd75..3138a40 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface ProductDetailCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail> {
+public interface ProductDetailCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail> {
Object getAnnotation(Class<? extends AbstractTerm> term);
[41/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
index 06c15b9..08c120d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
@@ -1,266 +1,251 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Contractor",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person")
-public interface Contractor
- extends Annotatable,org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getPersonId();
-
- void setPersonId(java.lang.Integer _personId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContratorCompanyId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getContratorCompanyId();
-
- void setContratorCompanyId(java.lang.Integer _contratorCompanyId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BillingRate",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getBillingRate();
-
- void setBillingRate(java.lang.Integer _billingRate);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TeamContactPersonId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getTeamContactPersonId();
-
- void setTeamContactPersonId(java.lang.Integer _teamContactPersonId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "JobDescription",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getJobDescription();
-
- void setJobDescription(java.lang.String _jobDescription);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonMetadata",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "PersonMetadata",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection getPersonMetadata();
-
- void setPersonMetadata(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
-
-
- @Override
- Operations operations();
-
- interface Operations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.Operations{
-
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "UpdatePersonInfo",
- type = OperationType.ACTION)
- void updatePersonInfo(
- );
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.ComplexFactory{
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
- type = "Edm.Int32")
- Annotatable getPersonIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ContratorCompanyId",
- type = "Edm.Int32")
- Annotatable getContratorCompanyIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BillingRate",
- type = "Edm.Int32")
- Annotatable getBillingRateAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TeamContactPersonId",
- type = "Edm.Int32")
- Annotatable getTeamContactPersonIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "JobDescription",
- type = "Edm.String")
- Annotatable getJobDescriptionAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonMetadata",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata")
- Annotatable getPersonMetadataAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person")
+public interface Contractor
+ extends Annotatable,
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person {
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPersonId();
+
+ @Override
+ void setPersonId(java.lang.Integer _personId);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ @Override
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContratorCompanyId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getContratorCompanyId();
+
+ void setContratorCompanyId(java.lang.Integer _contratorCompanyId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BillingRate",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getBillingRate();
+
+ void setBillingRate(java.lang.Integer _billingRate);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TeamContactPersonId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getTeamContactPersonId();
+
+ void setTeamContactPersonId(java.lang.Integer _teamContactPersonId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "JobDescription",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getJobDescription();
+
+ void setJobDescription(java.lang.String _jobDescription);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonMetadata",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "PersonMetadata",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection
+ getPersonMetadata();
+
+ @Override
+ void
+ setPersonMetadata(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
+
+ @Override
+ Operations operations();
+
+ interface Operations
+ extends
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.Operations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "UpdatePersonInfo",
+ type = OperationType.ACTION)
+ void updatePersonInfo(
+ );
+
+ }
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory
+ extends
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.ComplexFactory {}
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations
+ extends
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
+ type = "Edm.Int32")
+ Annotatable getPersonIdAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ContratorCompanyId",
+ type = "Edm.Int32")
+ Annotatable getContratorCompanyIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BillingRate",
+ type = "Edm.Int32")
+ Annotatable getBillingRateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TeamContactPersonId",
+ type = "Edm.Int32")
+ Annotatable getTeamContactPersonIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "JobDescription",
+ type = "Edm.String")
+ Annotatable getJobDescriptionAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonMetadata",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata")
+ Annotatable getPersonMetadataAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
index 761b0fe..7ae9bf6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface ContractorCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Contractor> {
+public interface ContractorCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Contractor> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
index e07e8ec..bc4bc7a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
@@ -1,349 +1,337 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Customer",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Customer
- extends Annotatable,java.io.Serializable {
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Thumbnail",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.io.InputStream getThumbnail();
-
- void setThumbnail(java.io.InputStream _thumbnail);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Video",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.io.InputStream getVideo();
-
- void setVideo(java.io.InputStream _video);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getCustomerId();
-
- void setCustomerId(java.lang.Integer _customerId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PrimaryContactInfo",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails getPrimaryContactInfo();
-
- void setPrimaryContactInfo(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _primaryContactInfo);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BackupContactInfo",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> getBackupContactInfo();
-
- void setBackupContactInfo(java.util.Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> _backupContactInfo);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Auditing",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo getAuditing();
-
- void setAuditing(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _auditing);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Orders",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Order",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection getOrders();
-
- void setOrders(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection _orders);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Logins",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection getLogins();
-
- void setLogins(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection _logins);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Husband",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Customer",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer getHusband();
-
- void setHusband(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer _husband);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Wife",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Customer",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer getWife();
-
- void setWife(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer _wife);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Info",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "CustomerInfo",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo getInfo();
-
- void setInfo(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo _info);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PrimaryContactInfo",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newPrimaryContactInfo();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BackupContactInfo",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newBackupContactInfo();
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Auditing",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newAuditing();
-
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Thumbnail",
- type = "Edm.Stream")
- Annotatable getThumbnailAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Video",
- type = "Edm.Stream")
- Annotatable getVideoAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerId",
- type = "Edm.Int32")
- Annotatable getCustomerIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PrimaryContactInfo",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
- Annotatable getPrimaryContactInfoAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BackupContactInfo",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
- Annotatable getBackupContactInfoAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Auditing",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
- Annotatable getAuditingAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Orders",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
- Annotatable getOrdersAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Logins",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
- Annotatable getLoginsAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Husband",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
- Annotatable getHusbandAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Wife",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
- Annotatable getWifeAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Info",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo")
- Annotatable getInfoAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Customer
+ extends Annotatable, java.io.Serializable {
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Thumbnail",
+ type = "Edm.Stream",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.io.InputStream getThumbnail();
+
+ void setThumbnail(java.io.InputStream _thumbnail);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Video",
+ type = "Edm.Stream",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.io.InputStream getVideo();
+
+ void setVideo(java.io.InputStream _video);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getCustomerId();
+
+ void setCustomerId(java.lang.Integer _customerId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PrimaryContactInfo",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails
+ getPrimaryContactInfo();
+
+ void
+ setPrimaryContactInfo(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _primaryContactInfo);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BackupContactInfo",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails>
+ getBackupContactInfo();
+
+ void
+ setBackupContactInfo(
+ java.util.Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> _backupContactInfo);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Auditing",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo
+ getAuditing();
+
+ void
+ setAuditing(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _auditing);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Orders",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Order",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection
+ getOrders();
+
+ void
+ setOrders(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection _orders);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Logins",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Login",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection
+ getLogins();
+
+ void
+ setLogins(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection _logins);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Husband",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Customer",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer
+ getHusband();
+
+ void
+ setHusband(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer _husband);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Wife",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "Customer",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer
+ getWife();
+
+ void
+ setWife(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer _wife);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Info",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
+ targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
+ targetContainer = "DefaultContainer",
+ targetEntitySet = "CustomerInfo",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo
+ getInfo();
+
+ void
+ setInfo(
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo _info);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PrimaryContactInfo",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails
+ newPrimaryContactInfo();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BackupContactInfo",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails
+ newBackupContactInfo();
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Auditing",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo
+ newAuditing();
+
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Thumbnail",
+ type = "Edm.Stream")
+ Annotatable getThumbnailAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Video",
+ type = "Edm.Stream")
+ Annotatable getVideoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerId",
+ type = "Edm.Int32")
+ Annotatable getCustomerIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PrimaryContactInfo",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
+ Annotatable getPrimaryContactInfoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BackupContactInfo",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
+ Annotatable getBackupContactInfoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Auditing",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
+ Annotatable getAuditingAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Orders",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
+ Annotatable getOrdersAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Logins",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getLoginsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Husband",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
+ Annotatable getHusbandAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Wife",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
+ Annotatable getWifeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Info",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo")
+ Annotatable getInfoAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
index 04b2391..56eb2b9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface CustomerCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer> {
+public interface CustomerCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
index bc7fa13..4c3bc69 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
@@ -1,135 +1,102 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "CustomerInfo",
- openType = false,
- hasStream = true,
- isAbstract = false)
-public interface CustomerInfo
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerInfoId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getCustomerInfoId();
-
- void setCustomerInfoId(java.lang.Integer _customerInfoId);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Information",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getInformation();
-
- void setInformation(java.lang.String _information);
-
-
-
- void setStream(java.io.InputStream stream);
-
- java.io.InputStream getStream();
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerInfoId",
- type = "Edm.Int32")
- Annotatable getCustomerInfoIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Information",
- type = "Edm.String")
- Annotatable getInformationAnnotations();
-
-
- }
+ openType = false,
+ hasStream = true,
+ isAbstract = false)
+public interface CustomerInfo
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerInfoId",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getCustomerInfoId();
+
+ void setCustomerInfoId(java.lang.Integer _customerInfoId);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Information",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getInformation();
+
+ void setInformation(java.lang.String _information);
+
+ void setStream(java.io.InputStream stream);
+
+ java.io.InputStream getStream();
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerInfoId",
+ type = "Edm.Int32")
+ Annotatable getCustomerInfoIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Information",
+ type = "Edm.String")
+ Annotatable getInformationAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
index 4071f42..d3bf6ae 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface CustomerInfoCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo> {
+public interface CustomerInfoCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
index 72c24b6..2f07f2f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
@@ -1,82 +1,45 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Dimensions")
-public interface Dimensions
+public interface Dimensions
extends java.io.Serializable {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Width", type = "Edm.Decimal", nullable = false)
+ java.math.BigDecimal getWidth();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Width", type = "Edm.Decimal", nullable = false)
- java.math.BigDecimal getWidth();
-
- void setWidth(java.math.BigDecimal _width);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Height", type = "Edm.Decimal", nullable = false)
- java.math.BigDecimal getHeight();
-
- void setHeight(java.math.BigDecimal _height);
+ void setWidth(java.math.BigDecimal _width);
-
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Height", type = "Edm.Decimal", nullable = false)
+ java.math.BigDecimal getHeight();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Depth", type = "Edm.Decimal", nullable = false)
- java.math.BigDecimal getDepth();
+ void setHeight(java.math.BigDecimal _height);
- void setDepth(java.math.BigDecimal _depth);
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Depth", type = "Edm.Decimal", nullable = false)
+ java.math.BigDecimal getDepth();
-
+ void setDepth(java.math.BigDecimal _depth);
- ComplexFactory factory();
+ ComplexFactory factory();
- interface ComplexFactory {
- }
+ interface ComplexFactory {}
}
[10/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java
index a04718c..4e4262b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface EmployeeCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee> {
+public interface EmployeeCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java
index 4d04417..52363a1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java
@@ -1,226 +1,191 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.ext.proxy.api.annotations.Key;
+import org.apache.olingo.ext.proxy.api.annotations.Parameter;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "GiftCard",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface GiftCard
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GiftCardID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getGiftCardID();
-
- void setGiftCardID(java.lang.Integer _giftCardID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GiftCardNO",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getGiftCardNO();
-
- void setGiftCardNO(java.lang.String _giftCardNO);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Amount",
- type = "Edm.Double",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Double getAmount();
-
- void setAmount(java.lang.Double _amount);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ExperationDate",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getExperationDate();
-
- void setExperationDate(java.util.Calendar _experationDate);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OwnerName",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getOwnerName();
-
- void setOwnerName(java.lang.String _ownerName);
-
-
-
-
- Operations operations();
-
- interface Operations {
- @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetActualAmount",
- type = OperationType.FUNCTION,
- isComposable = false,
- returnType = "Edm.Double")
- java.lang.Double getActualAmount(
- @Parameter(name = "bonusRate", type = "Edm.Double", nullable = true) java.lang.Double bonusRate
- );
-
-
- }
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GiftCardID",
- type = "Edm.Int32")
- Annotatable getGiftCardIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GiftCardNO",
- type = "Edm.String")
- Annotatable getGiftCardNOAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Amount",
- type = "Edm.Double")
- Annotatable getAmountAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ExperationDate",
- type = "Edm.DateTimeOffset")
- Annotatable getExperationDateAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OwnerName",
- type = "Edm.String")
- Annotatable getOwnerNameAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface GiftCard
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GiftCardID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getGiftCardID();
+
+ void setGiftCardID(java.lang.Integer _giftCardID);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GiftCardNO",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getGiftCardNO();
+
+ void setGiftCardNO(java.lang.String _giftCardNO);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Amount",
+ type = "Edm.Double",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Double getAmount();
+
+ void setAmount(java.lang.Double _amount);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ExperationDate",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getExperationDate();
+
+ void setExperationDate(java.util.Calendar _experationDate);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OwnerName",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getOwnerName();
+
+ void setOwnerName(java.lang.String _ownerName);
+
+ Operations operations();
+
+ interface Operations {
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetActualAmount",
+ type = OperationType.FUNCTION,
+ isComposable = false,
+ returnType = "Edm.Double")
+ java.lang.Double getActualAmount(
+ @Parameter(name = "bonusRate", type = "Edm.Double", nullable = true) java.lang.Double bonusRate
+ );
+
+ }
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GiftCardID",
+ type = "Edm.Int32")
+ Annotatable getGiftCardIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GiftCardNO",
+ type = "Edm.String")
+ Annotatable getGiftCardNOAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Amount",
+ type = "Edm.Double")
+ Annotatable getAmountAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ExperationDate",
+ type = "Edm.DateTimeOffset")
+ Annotatable getExperationDateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OwnerName",
+ type = "Edm.String")
+ Annotatable getOwnerNameAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java
index 9dd828b..694340d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface GiftCardCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard> {
+public interface GiftCardCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java
index 8261557..459b80f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java
@@ -1,158 +1,134 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "HomeAddress",
- isOpenType = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.ODataWCFService.Address")
-public interface HomeAddress
- extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address,java.io.Serializable {
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.String getStreet();
-
- void setStreet(java.lang.String _street);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.String getCity();
-
- void setCity(java.lang.String _city);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PostalCode",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.String getPostalCode();
-
- void setPostalCode(java.lang.String _postalCode);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FamilyName",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- java.lang.String getFamilyName();
-
- void setFamilyName(java.lang.String _familyName);
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address.ComplexFactory{
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Street",
- type = "Edm.String")
- Annotatable getStreetAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "City",
- type = "Edm.String")
- Annotatable getCityAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PostalCode",
- type = "Edm.String")
- Annotatable getPostalCodeAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FamilyName",
- type = "Edm.String")
- Annotatable getFamilyNameAnnotations();
-
-
- }
-
+ isOpenType = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.ODataWCFService.Address")
+public interface HomeAddress
+ extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address,
+ java.io.Serializable {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getStreet();
+
+ @Override
+ void setStreet(java.lang.String _street);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getCity();
+
+ @Override
+ void setCity(java.lang.String _city);
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PostalCode",
+ type = "Edm.String",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getPostalCode();
+
+ @Override
+ void setPostalCode(java.lang.String _postalCode);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FamilyName",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getFamilyName();
+
+ void setFamilyName(java.lang.String _familyName);
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory
+ extends
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address.ComplexFactory {}
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations
+ extends
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Street",
+ type = "Edm.String")
+ Annotatable getStreetAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "City",
+ type = "Edm.String")
+ Annotatable getCityAnnotations();
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PostalCode",
+ type = "Edm.String")
+ Annotatable getPostalCodeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FamilyName",
+ type = "Edm.String")
+ Annotatable getFamilyNameAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java
index c186d4b..fe77da2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java
@@ -1,32 +1,27 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.Term;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.Term(name = "IsBoss",
- type="Edm.Boolean")
-public interface IsBoss extends AbstractTerm {
-}
+ type = "Edm.Boolean")
+public interface IsBoss extends AbstractTerm {}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java
index 604c0a2..19eae98 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java
@@ -1,132 +1,98 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "LabourUnion",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface LabourUnion
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LabourUnionID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getLabourUnionID();
-
- void setLabourUnionID(java.lang.Integer _labourUnionID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.String getName();
-
- void setName(java.lang.String _name);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LabourUnionID",
- type = "Edm.Int32")
- Annotatable getLabourUnionIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
- type = "Edm.String")
- Annotatable getNameAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface LabourUnion
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LabourUnionID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getLabourUnionID();
+
+ void setLabourUnionID(java.lang.Integer _labourUnionID);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LabourUnionID",
+ type = "Edm.Int32")
+ Annotatable getLabourUnionIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java
index 0343f3a..6513381 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface LabourUnionCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnion> {
+public interface LabourUnionCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnion> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java
index f1a1398..0e7c30e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java
@@ -1,228 +1,200 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Order",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Order
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getOrderID();
-
- void setOrderID(java.lang.Integer _orderID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderDate",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getOrderDate();
-
- void setOrderDate(java.util.Calendar _orderDate);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ShelfLife",
- type = "Edm.Duration",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.math.BigDecimal getShelfLife();
-
- void setShelfLife(java.math.BigDecimal _shelfLife);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderShelfLifes",
- type = "Edm.Duration",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<java.math.BigDecimal> getOrderShelfLifes();
-
- void setOrderShelfLifes(java.util.Collection<java.math.BigDecimal> _orderShelfLifes);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "LoggedInEmployee",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Employee",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "Employees",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee getLoggedInEmployee();
-
- void setLoggedInEmployee(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee _loggedInEmployee);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "CustomerForOrder",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Customer",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "Customers",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer getCustomerForOrder();
-
- void setCustomerForOrder(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer _customerForOrder);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "OrderDetails",
- type = "Microsoft.Test.OData.Services.ODataWCFService.OrderDetail",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "OrderDetails",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection getOrderDetails();
-
- void setOrderDetails(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection _orderDetails);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderID",
- type = "Edm.Int32")
- Annotatable getOrderIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderDate",
- type = "Edm.DateTimeOffset")
- Annotatable getOrderDateAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ShelfLife",
- type = "Edm.Duration")
- Annotatable getShelfLifeAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderShelfLifes",
- type = "Edm.Duration")
- Annotatable getOrderShelfLifesAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "LoggedInEmployee",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Employee")
- Annotatable getLoggedInEmployeeAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "CustomerForOrder",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Customer")
- Annotatable getCustomerForOrderAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "OrderDetails",
- type = "Microsoft.Test.OData.Services.ODataWCFService.OrderDetail")
- Annotatable getOrderDetailsAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Order
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getOrderID();
+
+ void setOrderID(java.lang.Integer _orderID);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderDate",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getOrderDate();
+
+ void setOrderDate(java.util.Calendar _orderDate);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ShelfLife",
+ type = "Edm.Duration",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.math.BigDecimal getShelfLife();
+
+ void setShelfLife(java.math.BigDecimal _shelfLife);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderShelfLifes",
+ type = "Edm.Duration",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<java.math.BigDecimal> getOrderShelfLifes();
+
+ void setOrderShelfLifes(java.util.Collection<java.math.BigDecimal> _orderShelfLifes);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "LoggedInEmployee",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Employee",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "Employees",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee
+ getLoggedInEmployee();
+
+ void
+ setLoggedInEmployee(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee _loggedInEmployee);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "CustomerForOrder",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Customer",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "Customers",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer
+ getCustomerForOrder();
+
+ void
+ setCustomerForOrder(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer _customerForOrder);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "OrderDetails",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.OrderDetail",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "OrderDetails",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection
+ getOrderDetails();
+
+ void
+ setOrderDetails(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection _orderDetails);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderID",
+ type = "Edm.Int32")
+ Annotatable getOrderIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderDate",
+ type = "Edm.DateTimeOffset")
+ Annotatable getOrderDateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ShelfLife",
+ type = "Edm.Duration")
+ Annotatable getShelfLifeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderShelfLifes",
+ type = "Edm.Duration")
+ Annotatable getOrderShelfLifesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "LoggedInEmployee",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Employee")
+ Annotatable getLoggedInEmployeeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "CustomerForOrder",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Customer")
+ Annotatable getCustomerForOrderAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "OrderDetails",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.OrderDetail")
+ Annotatable getOrderDetailsAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java
index 9b0210a..dbac9c1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface OrderCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order> {
+public interface OrderCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java
index b2ad224..1612d90 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java
@@ -1,241 +1,212 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.client.api.edm.ConcurrencyMode;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
@KeyRef(OrderDetailKey.class)
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "OrderDetail",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface OrderDetail
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getOrderID();
-
- void setOrderID(java.lang.Integer _orderID);
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getProductID();
-
- void setProductID(java.lang.Integer _productID);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderPlaced",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Calendar getOrderPlaced();
-
- void setOrderPlaced(java.util.Calendar _orderPlaced);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getQuantity();
-
- void setQuantity(java.lang.Integer _quantity);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "UnitPrice",
- type = "Edm.Single",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Float getUnitPrice();
-
- void setUnitPrice(java.lang.Float _unitPrice);
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ProductOrdered",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Product",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "Products",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection getProductOrdered();
-
- void setProductOrdered(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection _productOrdered);
-
- @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "AssociatedOrder",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Order",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "InMemoryEntities",
- targetEntitySet = "Orders",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order getAssociatedOrder();
-
- void setAssociatedOrder(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order _associatedOrder);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderID",
- type = "Edm.Int32")
- Annotatable getOrderIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductID",
- type = "Edm.Int32")
- Annotatable getProductIDAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderPlaced",
- type = "Edm.DateTimeOffset")
- Annotatable getOrderPlacedAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Quantity",
- type = "Edm.Int32")
- Annotatable getQuantityAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "UnitPrice",
- type = "Edm.Single")
- Annotatable getUnitPriceAnnotations();
-
-
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ProductOrdered",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Product")
- Annotatable getProductOrderedAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "AssociatedOrder",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Order")
- Annotatable getAssociatedOrderAnnotations();
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface OrderDetail
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getOrderID();
+
+ void setOrderID(java.lang.Integer _orderID);
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductID();
+
+ void setProductID(java.lang.Integer _productID);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderPlaced",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getOrderPlaced();
+
+ void setOrderPlaced(java.util.Calendar _orderPlaced);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getQuantity();
+
+ void setQuantity(java.lang.Integer _quantity);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "UnitPrice",
+ type = "Edm.Single",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Float getUnitPrice();
+
+ void setUnitPrice(java.lang.Float _unitPrice);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ProductOrdered",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Product",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "Products",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection
+ getProductOrdered();
+
+ void
+ setProductOrdered(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection _productOrdered);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "AssociatedOrder",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Order",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "Orders",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order
+ getAssociatedOrder();
+
+ void
+ setAssociatedOrder(
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order _associatedOrder);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderID",
+ type = "Edm.Int32")
+ Annotatable getOrderIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductID",
+ type = "Edm.Int32")
+ Annotatable getProductIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderPlaced",
+ type = "Edm.DateTimeOffset")
+ Annotatable getOrderPlacedAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Quantity",
+ type = "Edm.Int32")
+ Annotatable getQuantityAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "UnitPrice",
+ type = "Edm.Single")
+ Annotatable getUnitPriceAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ProductOrdered",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Product")
+ Annotatable getProductOrderedAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "AssociatedOrder",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Order")
+ Annotatable getAssociatedOrderAnnotations();
+ }
}
[44/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Person.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Person.java
index 2d42a62..f79e556 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Person.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Person.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,39 +20,33 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Person")
-public interface Person
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection> {
-
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person newPerson();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection newPersonCollection();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Contractor newContractor();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContractorCollection newContractorCollection();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee newEmployee();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection newEmployeeCollection();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee newSpecialEmployee();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployeeCollection newSpecialEmployeeCollection();
+public interface Person
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection> {
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person
+ newPerson();
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection
+ newPersonCollection();
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Contractor
+ newContractor();
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContractorCollection
+ newContractorCollection();
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee
+ newEmployee();
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection
+ newEmployeeCollection();
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee
+ newSpecialEmployee();
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployeeCollection
+ newSpecialEmployeeCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
index 42205d5..dbed5e9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "PersonMetadata")
-public interface PersonMetadata
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection> {
+public interface PersonMetadata
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection> {
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata
+ newPersonMetadata();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata newPersonMetadata();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection newPersonMetadataCollection();
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection
+ newPersonMetadataCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Product.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Product.java
index dd65646..e6f996a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Product.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Product.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,35 +20,21 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Product")
+public interface Product
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection> {
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product
+ newProduct();
-@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Product")
-public interface Product
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection> {
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection
+ newProductCollection();
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.DiscontinuedProduct
+ newDiscontinuedProduct();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product newProduct();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection newProductCollection();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.DiscontinuedProduct newDiscontinuedProduct();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.DiscontinuedProductCollection newDiscontinuedProductCollection();
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.DiscontinuedProductCollection
+ newDiscontinuedProductCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
index 5f83169..a9cf8f7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductDetail")
-public interface ProductDetail
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetailCollection> {
+public interface ProductDetail
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetailCollection> {
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail
+ newProductDetail();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail newProductDetail();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetailCollection newProductDetailCollection();
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetailCollection
+ newProductDetailCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
index d407ca9..651a4c4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,16 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
+import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoKey;
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductPhoto")
-public interface ProductPhoto
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto, ProductPhotoKey, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection> {
+public interface ProductPhoto
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto, ProductPhotoKey, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection> {
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto
+ newProductPhoto();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto newProductPhoto();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection newProductPhotoCollection();
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection
+ newProductPhotoCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
index 9ae0fc8..9926613 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,16 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
+import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewKey;
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductReview")
-public interface ProductReview
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview, ProductReviewKey, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection> {
+public interface ProductReview
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview, ProductReviewKey, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection> {
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview
+ newProductReview();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview newProductReview();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection newProductReviewCollection();
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection
+ newProductReviewCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
index 6788bdf..5e52840 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -20,33 +20,15 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "RSAToken")
-public interface RSAToken
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken, java.lang.String, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.RSATokenCollection> {
+public interface RSAToken
+ extends
+ AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken, java.lang.String, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.RSATokenCollection> {
+
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken
+ newRSAToken();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken newRSAToken();
- org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.RSATokenCollection newRSATokenCollection();
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.RSATokenCollection
+ newRSATokenCollection();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/package-info.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/package-info.java
index 9277a69..d302654 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/package-info.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/package-info.java
@@ -1,18 +1,18 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
index b21e155..13647b4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
@@ -1,68 +1,36 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-
-
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Aliases")
-public interface Aliases
+public interface Aliases
extends java.io.Serializable {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AlternativeNames", type = "Edm.String",
+ nullable = false)
+ java.util.Collection<java.lang.String> getAlternativeNames();
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AlternativeNames", type = "Edm.String", nullable = false)
- java.util.Collection<java.lang.String> getAlternativeNames();
-
- void setAlternativeNames(java.util.Collection<java.lang.String> _alternativeNames);
-
-
+ void setAlternativeNames(java.util.Collection<java.lang.String> _alternativeNames);
- ComplexFactory factory();
+ ComplexFactory factory();
- interface ComplexFactory {
- }
+ interface ComplexFactory {}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
index f8c08b1..5e49a20 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
@@ -1,105 +1,72 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "AllSpatialCollectionTypes",
- openType = false,
- hasStream = false,
- isAbstract = true)
-public interface AllSpatialCollectionTypes
- extends Annotatable,java.io.Serializable {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getId();
-
- void setId(java.lang.Integer _id);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- }
-
- Annotations annotations();
-
- interface Annotations {
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Int32")
- Annotatable getIdAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = true)
+public interface AllSpatialCollectionTypes
+ extends Annotatable, java.io.Serializable {
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getId();
+
+ void setId(java.lang.Integer _id);
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {}
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
index 7c4e952..9d6271b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface AllSpatialCollectionTypesCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes> {
+public interface AllSpatialCollectionTypesCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
index bc77581..f575c25 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
@@ -1,268 +1,240 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
-import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.ext.proxy.api.annotations.Key;
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "AllSpatialCollectionTypes_Simple",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialCollectionTypes")
-public interface AllSpatialCollectionTypes_Simple
- extends Annotatable,org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes {
-
-
- @Key
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.lang.Integer getId();
-
- void setId(java.lang.Integer _id);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeogPoint",
- type = "Edm.GeographyPoint",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> getManyGeogPoint();
-
- void setManyGeogPoint(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> _manyGeogPoint);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeogLine",
- type = "Edm.GeographyLineString",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> getManyGeogLine();
-
- void setManyGeogLine(java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> _manyGeogLine);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeogPolygon",
- type = "Edm.GeographyPolygon",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> getManyGeogPolygon();
-
- void setManyGeogPolygon(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> _manyGeogPolygon);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeomPoint",
- type = "Edm.GeometryPoint",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> getManyGeomPoint();
-
- void setManyGeomPoint(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> _manyGeomPoint);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeomLine",
- type = "Edm.GeometryLineString",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> getManyGeomLine();
-
- void setManyGeomLine(java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> _manyGeomLine);
-
-
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeomPolygon",
- type = "Edm.GeometryPolygon",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> getManyGeomPolygon();
-
- void setManyGeomPolygon(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> _manyGeomPolygon);
-
-
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes.ComplexFactory{
- }
-
- Annotations annotations();
-
- interface Annotations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes.Annotations{
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
- type = "Edm.Int32")
- Annotatable getIdAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeogPoint",
- type = "Edm.GeographyPoint")
- Annotatable getManyGeogPointAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeogLine",
- type = "Edm.GeographyLineString")
- Annotatable getManyGeogLineAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeogPolygon",
- type = "Edm.GeographyPolygon")
- Annotatable getManyGeogPolygonAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeomPoint",
- type = "Edm.GeometryPoint")
- Annotatable getManyGeomPointAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeomLine",
- type = "Edm.GeometryLineString")
- Annotatable getManyGeomLineAnnotations();
-
- @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeomPolygon",
- type = "Edm.GeometryPolygon")
- Annotatable getManyGeomPolygonAnnotations();
-
-
- }
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialCollectionTypes")
+public interface AllSpatialCollectionTypes_Simple
+ extends
+ Annotatable,
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes {
+
+ @Override
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getId();
+
+ @Override
+ void setId(java.lang.Integer _id);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeogPoint",
+ type = "Edm.GeographyPoint",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> getManyGeogPoint();
+
+ void setManyGeogPoint(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> _manyGeogPoint);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeogLine",
+ type = "Edm.GeographyLineString",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> getManyGeogLine();
+
+ void setManyGeogLine(java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> _manyGeogLine);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeogPolygon",
+ type = "Edm.GeographyPolygon",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> getManyGeogPolygon();
+
+ void setManyGeogPolygon(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> _manyGeogPolygon);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeomPoint",
+ type = "Edm.GeometryPoint",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> getManyGeomPoint();
+
+ void setManyGeomPoint(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> _manyGeomPoint);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeomLine",
+ type = "Edm.GeometryLineString",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> getManyGeomLine();
+
+ void setManyGeomLine(java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> _manyGeomLine);
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeomPolygon",
+ type = "Edm.GeometryPolygon",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> getManyGeomPolygon();
+
+ void setManyGeomPolygon(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> _manyGeomPolygon);
+
+ @Override
+ ComplexFactory factory();
+
+ interface ComplexFactory
+ extends
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes.ComplexFactory {}
+
+ @Override
+ Annotations annotations();
+
+ interface Annotations
+ extends
+ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes.Annotations {
+
+ @Override
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeogPoint",
+ type = "Edm.GeographyPoint")
+ Annotatable getManyGeogPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeogLine",
+ type = "Edm.GeographyLineString")
+ Annotatable getManyGeogLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeogPolygon",
+ type = "Edm.GeographyPolygon")
+ Annotatable getManyGeogPolygonAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeomPoint",
+ type = "Edm.GeometryPoint")
+ Annotatable getManyGeomPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeomLine",
+ type = "Edm.GeometryLineString")
+ Annotatable getManyGeomLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeomPolygon",
+ type = "Edm.GeometryPolygon")
+ Annotatable getManyGeomPolygonAnnotations();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
index f3e2467..f0e4542 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
@@ -1,50 +1,32 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
-import org.apache.olingo.client.api.http.HttpMethod;
+import java.util.Collection;
+
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Operation;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
-import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-import org.apache.olingo.commons.api.edm.geo.MultiPoint;
-import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
-import org.apache.olingo.commons.api.edm.geo.Point;
-import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-public interface AllSpatialCollectionTypes_SimpleCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes_Simple> {
+public interface AllSpatialCollectionTypes_SimpleCollection
+ extends
+ AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes_Simple> {
Object getAnnotation(Class<? extends AbstractTerm> term);
[49/51] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle
issues
Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/V3KeyAsSegment.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/V3KeyAsSegment.java b/fit/src/main/java/org/apache/olingo/fit/V3KeyAsSegment.java
index 35db43e..fb6a446 100644
--- a/fit/src/main/java/org/apache/olingo/fit/V3KeyAsSegment.java
+++ b/fit/src/main/java/org/apache/olingo/fit/V3KeyAsSegment.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -21,6 +21,7 @@ package org.apache.olingo.fit;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
+
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
@@ -36,6 +37,7 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
+
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.fit.methods.MERGE;
@@ -50,13 +52,13 @@ public class V3KeyAsSegment {
private final V3Services services;
public V3KeyAsSegment() throws Exception {
- this.services = new V3Services();
+ services = new V3Services();
}
private Response replaceServiceName(final Response response) {
try {
final String content = IOUtils.toString((InputStream) response.getEntity(), Constants.ENCODING).
- replaceAll("Static\\.svc", "KeyAsSegment.svc");
+ replaceAll("Static\\.svc", "KeyAsSegment.svc");
final Response.ResponseBuilder builder = Response.status(response.getStatus());
for (String headerName : response.getHeaders().keySet()) {
@@ -82,91 +84,91 @@ public class V3KeyAsSegment {
@GET
@Path("/{entitySetName}/{entityId}")
public Response getEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
- @QueryParam("$expand") @DefaultValue(StringUtils.EMPTY) String expand,
- @QueryParam("$select") @DefaultValue(StringUtils.EMPTY) String select) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+ @QueryParam("$expand") @DefaultValue(StringUtils.EMPTY) final String expand,
+ @QueryParam("$select") @DefaultValue(StringUtils.EMPTY) final String select) {
return replaceServiceName(services.getEntityInternal(uriInfo.getRequestUri().toASCIIString(),
- accept, entitySetName, entityId, format, expand, select, true));
+ accept, entitySetName, entityId, format, expand, select, true));
}
@DELETE
@Path("/{entitySetName}/{entityId}")
public Response removeEntity(
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId) {
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId) {
return replaceServiceName(services.removeEntity(entitySetName, entityId));
}
@MERGE
@Path("/{entitySetName}/{entityId}")
- @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
- @Consumes({MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
+ @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+ @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
public Response mergeEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @HeaderParam("If-Match") @DefaultValue(StringUtils.EMPTY) String ifMatch,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- final String changes) {
-
- return replaceServiceName(
- services.patchEntity(uriInfo, accept, contentType, prefer, ifMatch, entitySetName, entityId, changes));
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @HeaderParam("If-Match") @DefaultValue(StringUtils.EMPTY) final String ifMatch,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ final String changes) {
+
+ return replaceServiceName(services.patchEntity(uriInfo, accept, contentType, prefer, ifMatch, entitySetName,
+ entityId, changes));
}
@PATCH
@Path("/{entitySetName}/{entityId}")
- @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
- @Consumes({MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
+ @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+ @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
public Response patchEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @HeaderParam("If-Match") @DefaultValue(StringUtils.EMPTY) String ifMatch,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- final String changes) {
-
- return replaceServiceName(
- services.patchEntity(uriInfo, accept, contentType, prefer, ifMatch, entitySetName, entityId, changes));
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @HeaderParam("If-Match") @DefaultValue(StringUtils.EMPTY) final String ifMatch,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ final String changes) {
+
+ return replaceServiceName(services.patchEntity(uriInfo, accept, contentType, prefer, ifMatch, entitySetName,
+ entityId, changes));
}
@PUT
@Path("/{entitySetName}/{entityId}")
- @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
- @Consumes({MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
+ @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+ @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
public Response putNewEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- final String entity) {
-
- return replaceServiceName(
- services.replaceEntity(uriInfo, accept, contentType, prefer, entitySetName, entityId, entity));
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ final String entity) {
+
+ return replaceServiceName(services.replaceEntity(uriInfo, accept, contentType, prefer, entitySetName, entityId,
+ entity));
}
@POST
@Path("/{entitySetName}")
- @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
- @Consumes({MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_OCTET_STREAM})
+ @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+ @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_OCTET_STREAM })
public Response postNewEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @PathParam("entitySetName") String entitySetName,
- final String entity) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @PathParam("entitySetName") final String entitySetName,
+ final String entity) {
return replaceServiceName(services.postNewEntity(uriInfo, accept, contentType, prefer, entitySetName, entity));
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/V3OpenType.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/V3OpenType.java b/fit/src/main/java/org/apache/olingo/fit/V3OpenType.java
index 23d644b..55abc3b 100644
--- a/fit/src/main/java/org/apache/olingo/fit/V3OpenType.java
+++ b/fit/src/main/java/org/apache/olingo/fit/V3OpenType.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -23,6 +23,7 @@ import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
@@ -37,6 +38,7 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
+
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
@@ -55,14 +57,14 @@ public class V3OpenType extends V3Services {
public V3OpenType() throws Exception {
super(new Metadata(FSManager.instance(ODataServiceVersion.V30).
- readRes("openType" + StringUtils.capitalize(Constants.get(ODataServiceVersion.V30, ConstantKey.METADATA)),
+ readRes("openType" + StringUtils.capitalize(Constants.get(ODataServiceVersion.V30, ConstantKey.METADATA)),
Accept.XML), ODataServiceVersion.V30));
}
private Response replaceServiceName(final Response response) {
try {
final String content = IOUtils.toString((InputStream) response.getEntity(), Constants.ENCODING).
- replaceAll("Static\\.svc", "OpenType.svc");
+ replaceAll("Static\\.svc", "OpenType.svc");
final Response.ResponseBuilder builder = Response.status(response.getStatus());
for (String headerName : response.getHeaders().keySet()) {
@@ -87,7 +89,7 @@ public class V3OpenType extends V3Services {
/**
* Provide sample large metadata.
- *
+ *
* @return metadata.
*/
@GET
@@ -96,39 +98,39 @@ public class V3OpenType extends V3Services {
@Override
public Response getMetadata() {
return super.getMetadata("openType" + StringUtils.capitalize(
- Constants.get(ODataServiceVersion.V30, ConstantKey.METADATA)));
+ Constants.get(ODataServiceVersion.V30, ConstantKey.METADATA)));
}
@GET
@Path("/{entitySetName}({entityId})")
@Override
public Response getEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
- @QueryParam("$expand") @DefaultValue(StringUtils.EMPTY) String expand,
- @QueryParam("$select") @DefaultValue(StringUtils.EMPTY) String select) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+ @QueryParam("$expand") @DefaultValue(StringUtils.EMPTY) final String expand,
+ @QueryParam("$select") @DefaultValue(StringUtils.EMPTY) final String select) {
final Matcher matcher = GUID.matcher(entityId);
return replaceServiceName(super.getEntityInternal(
- uriInfo.getRequestUri().toASCIIString(), accept, entitySetName,
- matcher.matches() ? matcher.group(1) : entityId, format, expand, select, false));
+ uriInfo.getRequestUri().toASCIIString(), accept, entitySetName,
+ matcher.matches() ? matcher.group(1) : entityId, format, expand, select, false));
}
@POST
@Path("/{entitySetName}")
- @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
- @Consumes({MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_OCTET_STREAM})
+ @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+ @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_OCTET_STREAM })
@Override
public Response postNewEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @PathParam("entitySetName") final String entitySetName,
- final String entity) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @PathParam("entitySetName") final String entitySetName,
+ final String entity) {
return replaceServiceName(super.postNewEntity(uriInfo, accept, contentType, prefer, entitySetName, entity));
}
@@ -137,11 +139,11 @@ public class V3OpenType extends V3Services {
@Path("/{entitySetName}({entityId})")
@Override
public Response removeEntity(
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId) {
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId) {
final Matcher matcher = GUID.matcher(entityId);
return replaceServiceName(super.removeEntity(entitySetName,
- matcher.matches() ? matcher.group(1) : entityId));
+ matcher.matches() ? matcher.group(1) : entityId));
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/V3PrimitiveKeys.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/V3PrimitiveKeys.java b/fit/src/main/java/org/apache/olingo/fit/V3PrimitiveKeys.java
index d235bc0..2368b13 100644
--- a/fit/src/main/java/org/apache/olingo/fit/V3PrimitiveKeys.java
+++ b/fit/src/main/java/org/apache/olingo/fit/V3PrimitiveKeys.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -23,6 +23,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+
import org.apache.olingo.fit.utils.Accept;
import org.apache.olingo.fit.utils.FSManager;
import org.springframework.stereotype.Service;
@@ -37,7 +38,7 @@ public class V3PrimitiveKeys extends V3Services {
/**
* Provide sample large metadata.
- *
+ *
* @return metadata.
*/
@GET
@@ -47,7 +48,7 @@ public class V3PrimitiveKeys extends V3Services {
public Response getMetadata() {
try {
return xml.createResponse(
- null, FSManager.instance(version).readRes("primitiveKeysMetadata", Accept.XML), null, Accept.XML);
+ null, FSManager.instance(version).readRes("primitiveKeysMetadata", Accept.XML), null, Accept.XML);
} catch (Exception e) {
return xml.createFaultResponse(Accept.XML.toString(version), e);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/V3Services.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/V3Services.java b/fit/src/main/java/org/apache/olingo/fit/V3Services.java
index a036fd2..be2a297 100644
--- a/fit/src/main/java/org/apache/olingo/fit/V3Services.java
+++ b/fit/src/main/java/org/apache/olingo/fit/V3Services.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -26,6 +26,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
+
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMultipart;
import javax.ws.rs.BadRequestException;
@@ -36,7 +37,6 @@ import javax.ws.rs.GET;
import javax.ws.rs.HeaderParam;
import javax.ws.rs.POST;
import javax.ws.rs.PUT;
-import org.apache.olingo.fit.utils.XHTTPMethodInterceptor;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
@@ -45,6 +45,7 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
+
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.cxf.interceptor.InInterceptors;
@@ -61,6 +62,7 @@ import org.apache.olingo.fit.utils.ConstantKey;
import org.apache.olingo.fit.utils.Constants;
import org.apache.olingo.fit.utils.FSManager;
import org.apache.olingo.fit.utils.LinkInfo;
+import org.apache.olingo.fit.utils.XHTTPMethodInterceptor;
import org.springframework.stereotype.Service;
@Service
@@ -79,8 +81,8 @@ public class V3Services extends AbstractServices {
@GET
@Path("/InStreamErrorGetCustomer")
public Response instreamErrorGetCustomer(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
final Accept acceptType;
if (StringUtils.isNotBlank(format)) {
@@ -93,9 +95,9 @@ public class V3Services extends AbstractServices {
final InputStream error = FSManager.instance(version).readFile("InStreamErrorGetCustomer", acceptType);
return Response.ok(error).
- header(Constants.get(version, ConstantKey.ODATA_SERVICE_VERSION), version + ";").
- header("Content-Type", acceptType.toString(version)).
- build();
+ header(Constants.get(version, ConstantKey.ODATA_SERVICE_VERSION), version + ";").
+ header("Content-Type", acceptType.toString(version)).
+ build();
} catch (Exception e) {
if (acceptType == Accept.XML || acceptType == Accept.TEXT) {
throw new UnsupportedMediaTypeException("Unsupported media type");
@@ -107,7 +109,7 @@ public class V3Services extends AbstractServices {
/**
* Provide sample large metadata.
- *
+ *
* @return metadata.
*/
@GET
@@ -126,8 +128,8 @@ public class V3Services extends AbstractServices {
@Override
public InputStream exploreMultipart(
- final List<Attachment> attachments, final String boundary, final boolean contineOnError)
- throws IOException {
+ final List<Attachment> attachments, final String boundary, final boolean contineOnError)
+ throws IOException {
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
Response res = null;
@@ -213,15 +215,15 @@ public class V3Services extends AbstractServices {
@GET
@Path("/Car/{type:.*}")
public Response filterCar(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @QueryParam("$top") @DefaultValue(StringUtils.EMPTY) String top,
- @QueryParam("$skip") @DefaultValue(StringUtils.EMPTY) String skip,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
- @QueryParam("$inlinecount") @DefaultValue(StringUtils.EMPTY) String count,
- @QueryParam("$filter") @DefaultValue(StringUtils.EMPTY) String filter,
- @QueryParam("$orderby") @DefaultValue(StringUtils.EMPTY) String orderby,
- @QueryParam("$skiptoken") @DefaultValue(StringUtils.EMPTY) String skiptoken) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @QueryParam("$top") @DefaultValue(StringUtils.EMPTY) final String top,
+ @QueryParam("$skip") @DefaultValue(StringUtils.EMPTY) final String skip,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+ @QueryParam("$inlinecount") @DefaultValue(StringUtils.EMPTY) final String count,
+ @QueryParam("$filter") @DefaultValue(StringUtils.EMPTY) final String filter,
+ @QueryParam("$orderby") @DefaultValue(StringUtils.EMPTY) final String orderby,
+ @QueryParam("$skiptoken") @DefaultValue(StringUtils.EMPTY) final String skiptoken) {
return super.getEntitySet(uriInfo, accept, "Car", top, skip, format, count, filter, orderby, skiptoken);
}
@@ -229,27 +231,27 @@ public class V3Services extends AbstractServices {
@GET
@Path("/Login({entityId})")
public Response getLogin(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @PathParam("entityId") String entityId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
- @QueryParam("$expand") @DefaultValue(StringUtils.EMPTY) String expand,
- @QueryParam("$select") @DefaultValue(StringUtils.EMPTY) String select) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entityId") final String entityId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+ @QueryParam("$expand") @DefaultValue(StringUtils.EMPTY) final String expand,
+ @QueryParam("$select") @DefaultValue(StringUtils.EMPTY) final String select) {
return super.getEntityInternal(uriInfo.getRequestUri().toASCIIString(), accept,
- "Login", StringUtils.remove(entityId, "'"), format, expand, select, false);
+ "Login", StringUtils.remove(entityId, "'"), format, expand, select, false);
}
@POST
@Path("/Login")
- @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
- @Consumes({MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_OCTET_STREAM})
+ @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+ @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_OCTET_STREAM })
public Response postLogin(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- final String entity) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ final String entity) {
if ("{\"odata.type\":\"Microsoft.Test.OData.Services.AstoriaDefaultService.Login\"}".equals(entity)) {
return xml.createFaultResponse(accept, new BadRequestException());
@@ -261,14 +263,14 @@ public class V3Services extends AbstractServices {
@DELETE
@Path("/Login({entityId})")
public Response removeLogin(
- @PathParam("entityId") String entityId) {
+ @PathParam("entityId") final String entityId) {
return super.removeEntity("Login", StringUtils.remove(entityId, "'"));
}
/**
* Retrieve links sample.
- *
+ *
* @param accept Accept header.
* @param entitySetName Entity set name.
* @param entityId entity id.
@@ -279,11 +281,11 @@ public class V3Services extends AbstractServices {
@GET
@Path("/{entitySetName}({entityId})/$links/{linkName}")
public Response getLinks(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- @PathParam("linkName") String linkName,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ @PathParam("linkName") final String linkName,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
try {
final Accept acceptType;
if (StringUtils.isNotBlank(format)) {
@@ -299,9 +301,9 @@ public class V3Services extends AbstractServices {
final LinkInfo links = xml.readLinks(entitySetName, entityId, linkName, acceptType);
return xml.createResponse(
- links.getLinks(),
- links.getEtag(),
- acceptType);
+ links.getLinks(),
+ links.getEtag(),
+ acceptType);
} catch (Exception e) {
return xml.createFaultResponse(accept, e);
}
@@ -310,13 +312,13 @@ public class V3Services extends AbstractServices {
@POST
@Path("/{entitySetName}({entityId})/$links/{linkName}")
public Response postLink(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- @PathParam("linkName") String linkName,
- String link,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ @PathParam("linkName") final String linkName,
+ final String link,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
try {
final Accept acceptType;
if (StringUtils.isNotBlank(format)) {
@@ -346,11 +348,11 @@ public class V3Services extends AbstractServices {
}
utils.putLinksInMemory(
- Commons.getEntityBasePath(entitySetName, entityId),
- entitySetName,
- entityId,
- linkName,
- links);
+ Commons.getEntityBasePath(entitySetName, entityId),
+ entitySetName,
+ entityId,
+ linkName,
+ links);
return xml.createResponse(null, null, null, Response.Status.NO_CONTENT);
} catch (Exception e) {
@@ -361,39 +363,39 @@ public class V3Services extends AbstractServices {
@MERGE
@Path("/{entitySetName}({entityId})/$links/{linkName}")
public Response mergeLink(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- @PathParam("linkName") String linkName,
- String link,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ @PathParam("linkName") final String linkName,
+ final String link,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
return putLink(accept, contentType, entitySetName, entityId, linkName, link, format);
}
@PATCH
@Path("/{entitySetName}({entityId})/$links/{linkName}")
public Response patchLink(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- @PathParam("linkName") String linkName,
- String link,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ @PathParam("linkName") final String linkName,
+ final String link,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
return putLink(accept, contentType, entitySetName, entityId, linkName, link, format);
}
@PUT
@Path("/{entitySetName}({entityId})/$links/{linkName}")
public Response putLink(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- @PathParam("linkName") String linkName,
- String link,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ @PathParam("linkName") final String linkName,
+ final String link,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
try {
final Accept acceptType;
if (StringUtils.isNotBlank(format)) {
@@ -423,10 +425,10 @@ public class V3Services extends AbstractServices {
}
utils.putLinksInMemory(
- Commons.getEntityBasePath(entitySetName, entityId),
- entitySetName,
- linkName,
- links);
+ Commons.getEntityBasePath(entitySetName, entityId),
+ entitySetName,
+ linkName,
+ links);
return xml.createResponse(null, null, null, Response.Status.NO_CONTENT);
} catch (Exception e) {
@@ -437,13 +439,13 @@ public class V3Services extends AbstractServices {
@DELETE
@Path("/{entitySetName}({entityId})/$links/{linkName}({linkId})")
public Response deleteLink(
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- @PathParam("linkName") String linkName,
- @PathParam("linkId") String linkId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format) {
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ @PathParam("linkName") final String linkName,
+ @PathParam("linkId") final String linkId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) {
try {
final Accept acceptType;
if (StringUtils.isNotBlank(format)) {
@@ -459,19 +461,19 @@ public class V3Services extends AbstractServices {
final AbstractUtilities utils = getUtilities(acceptType);
final Map.Entry<String, List<String>> currents = json.extractLinkURIs(utils.readLinks(
- entitySetName, entityId, linkName, Accept.JSON_FULLMETA).getLinks());
+ entitySetName, entityId, linkName, Accept.JSON_FULLMETA).getLinks());
final Map.Entry<String, List<String>> toBeRemoved = json.extractLinkURIs(utils.readLinks(
- entitySetName, entityId, linkName + "(" + linkId + ")", Accept.JSON_FULLMETA).getLinks());
+ entitySetName, entityId, linkName + "(" + linkId + ")", Accept.JSON_FULLMETA).getLinks());
final List<String> remains = currents.getValue();
remains.removeAll(toBeRemoved.getValue());
utils.putLinksInMemory(
- Commons.getEntityBasePath(entitySetName, entityId),
- entitySetName,
- linkName,
- remains);
+ Commons.getEntityBasePath(entitySetName, entityId),
+ entitySetName,
+ linkName,
+ remains);
return xml.createResponse(null, null, null, Response.Status.NO_CONTENT);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/V4Demo.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/V4Demo.java b/fit/src/main/java/org/apache/olingo/fit/V4Demo.java
index c308a08..1c6f501 100644
--- a/fit/src/main/java/org/apache/olingo/fit/V4Demo.java
+++ b/fit/src/main/java/org/apache/olingo/fit/V4Demo.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -21,6 +21,7 @@ package org.apache.olingo.fit;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
+
import javax.ws.rs.Consumes;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
@@ -35,6 +36,7 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
+
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
@@ -52,14 +54,14 @@ public class V4Demo extends V4Services {
public V4Demo() throws Exception {
super(new Metadata(FSManager.instance(ODataServiceVersion.V40).
- readRes("demo" + StringUtils.capitalize(Constants.get(ODataServiceVersion.V40, ConstantKey.METADATA)),
+ readRes("demo" + StringUtils.capitalize(Constants.get(ODataServiceVersion.V40, ConstantKey.METADATA)),
Accept.XML), ODataServiceVersion.V40));
}
private Response replaceServiceName(final Response response) {
try {
final String content = IOUtils.toString((InputStream) response.getEntity(), Constants.ENCODING).
- replaceAll("Static\\.svc", "Demo.svc");
+ replaceAll("Static\\.svc", "Demo.svc");
final Response.ResponseBuilder builder = Response.status(response.getStatus());
for (String headerName : response.getHeaders().keySet()) {
@@ -88,84 +90,84 @@ public class V4Demo extends V4Services {
@Override
public Response getMetadata() {
return super.getMetadata(
- "demo" + StringUtils.capitalize(Constants.get(ODataServiceVersion.V40, ConstantKey.METADATA)));
+ "demo" + StringUtils.capitalize(Constants.get(ODataServiceVersion.V40, ConstantKey.METADATA)));
}
@GET
@Path("/{entitySetName}({entityId})")
@Override
public Response getEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
- @QueryParam("$expand") @DefaultValue(StringUtils.EMPTY) String expand,
- @QueryParam("$select") @DefaultValue(StringUtils.EMPTY) String select) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+ @QueryParam("$expand") @DefaultValue(StringUtils.EMPTY) final String expand,
+ @QueryParam("$select") @DefaultValue(StringUtils.EMPTY) final String select) {
return replaceServiceName(super.getEntityInternal(uriInfo.getRequestUri().toASCIIString(),
- accept, entitySetName, entityId, format, expand, select, false));
+ accept, entitySetName, entityId, format, expand, select, false));
}
@GET
@Path("/{entitySetName}({entityId})/$value")
@Override
public Response getMediaEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId) {
return super.getMediaEntity(uriInfo, accept, entitySetName, entityId);
}
@POST
@Path("/{entitySetName}")
- @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
- @Consumes({MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_OCTET_STREAM})
+ @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+ @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_OCTET_STREAM })
@Override
public Response postNewEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @PathParam("entitySetName") String entitySetName,
- final String entity) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @PathParam("entitySetName") final String entitySetName,
+ final String entity) {
return replaceServiceName(super.postNewEntity(uriInfo, accept, contentType, prefer, entitySetName, entity));
}
@PATCH
@Path("/{entitySetName}({entityId})")
- @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
- @Consumes({MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
+ @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+ @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
@Override
public Response patchEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @HeaderParam("If-Match") @DefaultValue(StringUtils.EMPTY) String ifMatch,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- final String changes) {
-
- return replaceServiceName(
- super.patchEntity(uriInfo, accept, contentType, prefer, ifMatch, entitySetName, entityId, changes));
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @HeaderParam("If-Match") @DefaultValue(StringUtils.EMPTY) final String ifMatch,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ final String changes) {
+
+ return replaceServiceName(super.patchEntity(uriInfo, accept, contentType, prefer, ifMatch, entitySetName, entityId,
+ changes));
}
@PUT
- @Produces({MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
- @Consumes({MediaType.WILDCARD, MediaType.APPLICATION_OCTET_STREAM})
+ @Produces({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+ @Consumes({ MediaType.WILDCARD, MediaType.APPLICATION_OCTET_STREAM })
@Path("/{entitySetName}({entityId})/$value")
@Override
public Response replaceMediaEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
- String value) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+ final String value) {
return super.replaceMediaEntity(uriInfo, prefer, entitySetName, entityId, format, value);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/V4KeyAsSegment.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/V4KeyAsSegment.java b/fit/src/main/java/org/apache/olingo/fit/V4KeyAsSegment.java
index f8879c0..1474c1f 100644
--- a/fit/src/main/java/org/apache/olingo/fit/V4KeyAsSegment.java
+++ b/fit/src/main/java/org/apache/olingo/fit/V4KeyAsSegment.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -21,6 +21,7 @@ package org.apache.olingo.fit;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
+
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
@@ -34,6 +35,7 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
+
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.fit.methods.PATCH;
@@ -54,7 +56,7 @@ public class V4KeyAsSegment extends V4Services {
private Response replaceServiceName(final Response response) {
try {
final String content = IOUtils.toString((InputStream) response.getEntity(), Constants.ENCODING).
- replaceAll("Static\\.svc", "KeyAsSegment.svc");
+ replaceAll("Static\\.svc", "KeyAsSegment.svc");
final Response.ResponseBuilder builder = Response.status(response.getStatus());
for (String headerName : response.getHeaders().keySet()) {
@@ -80,67 +82,67 @@ public class V4KeyAsSegment extends V4Services {
@Override
public Response getEntitySet(final String accept, final String name, final String type) {
return replaceServiceName(super.getEntityInternal(uriInfo.getRequestUri().toASCIIString(),
- accept, name, type, null, null, null, true));
+ accept, name, type, null, null, null, true));
}
@DELETE
@Path("/{entitySetName}/{entityId}")
@Override
public Response removeEntity(
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId) {
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId) {
return replaceServiceName(super.removeEntity(entitySetName, entityId));
}
@PATCH
@Path("/{entitySetName}/{entityId}")
- @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
- @Consumes({MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
+ @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+ @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
@Override
public Response patchEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @HeaderParam("If-Match") @DefaultValue(StringUtils.EMPTY) String ifMatch,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- final String changes) {
-
- return replaceServiceName(
- super.patchEntity(uriInfo, accept, contentType, prefer, ifMatch, entitySetName, entityId, changes));
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @HeaderParam("If-Match") @DefaultValue(StringUtils.EMPTY) final String ifMatch,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ final String changes) {
+
+ return replaceServiceName(super.patchEntity(uriInfo, accept, contentType, prefer, ifMatch, entitySetName, entityId,
+ changes));
}
@PUT
@Path("/{entitySetName}/{entityId}")
- @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
- @Consumes({MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
+ @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+ @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
public Response putNewEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- final String entity) {
-
- return replaceServiceName(
- super.replaceEntity(uriInfo, accept, contentType, prefer, entitySetName, entityId, entity));
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ final String entity) {
+
+ return replaceServiceName(super
+ .replaceEntity(uriInfo, accept, contentType, prefer, entitySetName, entityId, entity));
}
@POST
@Path("/{entitySetName}")
- @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
- @Consumes({MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_OCTET_STREAM})
+ @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+ @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_OCTET_STREAM })
@Override
public Response postNewEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @PathParam("entitySetName") String entitySetName,
- final String entity) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @PathParam("entitySetName") final String entitySetName,
+ final String entity) {
return replaceServiceName(super.postNewEntity(uriInfo, accept, contentType, prefer, entitySetName, entity));
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/V4NorthWind.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/V4NorthWind.java b/fit/src/main/java/org/apache/olingo/fit/V4NorthWind.java
index 7a4a9c9..1fc5eab 100644
--- a/fit/src/main/java/org/apache/olingo/fit/V4NorthWind.java
+++ b/fit/src/main/java/org/apache/olingo/fit/V4NorthWind.java
@@ -1,29 +1,30 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.fit;
-import org.apache.olingo.fit.utils.XHTTPMethodInterceptor;
import javax.ws.rs.Path;
import javax.ws.rs.core.Response;
+
import org.apache.cxf.interceptor.InInterceptors;
import org.apache.olingo.fit.utils.ConstantKey;
import org.apache.olingo.fit.utils.Constants;
+import org.apache.olingo.fit.utils.XHTTPMethodInterceptor;
import org.springframework.stereotype.Service;
@Service
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/V4NorthWindExt.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/V4NorthWindExt.java b/fit/src/main/java/org/apache/olingo/fit/V4NorthWindExt.java
index e8838a6..7daddf8 100644
--- a/fit/src/main/java/org/apache/olingo/fit/V4NorthWindExt.java
+++ b/fit/src/main/java/org/apache/olingo/fit/V4NorthWindExt.java
@@ -1,35 +1,36 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.fit;
-import org.apache.olingo.fit.utils.XHTTPMethodInterceptor;
import javax.ws.rs.Path;
import javax.ws.rs.core.Response;
+
import org.apache.cxf.interceptor.InInterceptors;
import org.apache.olingo.fit.utils.ConstantKey;
import org.apache.olingo.fit.utils.Constants;
import org.apache.olingo.fit.utils.ResolvingReferencesInterceptor;
+import org.apache.olingo.fit.utils.XHTTPMethodInterceptor;
import org.springframework.stereotype.Service;
@Service
@Path("/V40/NorthWindExt.svc")
-@InInterceptors(classes = {XHTTPMethodInterceptor.class, ResolvingReferencesInterceptor.class})
+@InInterceptors(classes = { XHTTPMethodInterceptor.class, ResolvingReferencesInterceptor.class })
public class V4NorthWindExt extends V4Services {
public V4NorthWindExt() throws Exception {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java b/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java
index b76293a..aac908a 100644
--- a/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java
+++ b/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
@@ -21,6 +21,7 @@ package org.apache.olingo.fit;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
+
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
@@ -35,6 +36,7 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
+
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
@@ -51,14 +53,14 @@ public class V4OpenType extends V4Services {
public V4OpenType() throws Exception {
super(new Metadata(FSManager.instance(ODataServiceVersion.V40).
- readRes("openType" + StringUtils.capitalize(Constants.get(ODataServiceVersion.V40, ConstantKey.METADATA)),
+ readRes("openType" + StringUtils.capitalize(Constants.get(ODataServiceVersion.V40, ConstantKey.METADATA)),
Accept.XML), ODataServiceVersion.V40));
}
private Response replaceServiceName(final Response response) {
try {
final String content = IOUtils.toString((InputStream) response.getEntity(), Constants.ENCODING).
- replaceAll("Static\\.svc", "OpenType.svc");
+ replaceAll("Static\\.svc", "OpenType.svc");
final Response.ResponseBuilder builder = Response.status(response.getStatus());
for (String headerName : response.getHeaders().keySet()) {
@@ -83,7 +85,7 @@ public class V4OpenType extends V4Services {
/**
* Provide sample large metadata.
- *
+ *
* @return metadata.
*/
@GET
@@ -92,37 +94,37 @@ public class V4OpenType extends V4Services {
@Override
public Response getMetadata() {
return super.getMetadata("openType" + StringUtils.capitalize(
- Constants.get(ODataServiceVersion.V40, ConstantKey.METADATA)));
+ Constants.get(ODataServiceVersion.V40, ConstantKey.METADATA)));
}
@GET
@Path("/{entitySetName}({entityId})")
@Override
public Response getEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId,
- @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) String format,
- @QueryParam("$expand") @DefaultValue(StringUtils.EMPTY) String expand,
- @QueryParam("$select") @DefaultValue(StringUtils.EMPTY) String select) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId,
+ @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+ @QueryParam("$expand") @DefaultValue(StringUtils.EMPTY) final String expand,
+ @QueryParam("$select") @DefaultValue(StringUtils.EMPTY) final String select) {
return replaceServiceName(super.getEntityInternal(
- uriInfo.getRequestUri().toASCIIString(), accept, entitySetName, entityId, format, expand, select, false));
+ uriInfo.getRequestUri().toASCIIString(), accept, entitySetName, entityId, format, expand, select, false));
}
@POST
@Path("/{entitySetName}")
- @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON})
- @Consumes({MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_OCTET_STREAM})
+ @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+ @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_OCTET_STREAM })
@Override
public Response postNewEntity(
- @Context UriInfo uriInfo,
- @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) String accept,
- @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) String contentType,
- @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) String prefer,
- @PathParam("entitySetName") final String entitySetName,
- final String entity) {
+ @Context final UriInfo uriInfo,
+ @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+ @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+ @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+ @PathParam("entitySetName") final String entitySetName,
+ final String entity) {
return replaceServiceName(super.postNewEntity(uriInfo, accept, contentType, prefer, entitySetName, entity));
}
@@ -131,8 +133,8 @@ public class V4OpenType extends V4Services {
@Path("/{entitySetName}({entityId})")
@Override
public Response removeEntity(
- @PathParam("entitySetName") String entitySetName,
- @PathParam("entityId") String entityId) {
+ @PathParam("entitySetName") final String entitySetName,
+ @PathParam("entityId") final String entityId) {
return replaceServiceName(super.removeEntity(entitySetName, entityId));
}