You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2013/09/20 15:33:37 UTC
[15/59] [abbrv] Cleanup of core
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFunctionImportTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFunctionImportTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFunctionImportTest.java
index 3777ffa..001e7f1 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFunctionImportTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFunctionImportTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -46,7 +46,8 @@ public class JsonFunctionImportTest extends BaseTest {
@Test
public void singleSimpleType() throws Exception {
- final EdmFunctionImport functionImport = MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("MaximalAge");
+ final EdmFunctionImport functionImport =
+ MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("MaximalAge");
final ODataResponse response = new JsonEntityProvider().writeFunctionImport(functionImport, 42, null);
assertNotNull(response);
@@ -60,7 +61,8 @@ public class JsonFunctionImportTest extends BaseTest {
@Test
public void singleComplexType() throws Exception {
- final EdmFunctionImport functionImport = MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("MostCommonLocation");
+ final EdmFunctionImport functionImport =
+ MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("MostCommonLocation");
Map<String, Object> cityData = new HashMap<String, Object>();
cityData.put("PostalCode", "8392");
cityData.put("CityName", "Å");
@@ -84,9 +86,11 @@ public class JsonFunctionImportTest extends BaseTest {
@Test
public void collectionOfSimpleTypes() throws Exception {
- final EdmFunctionImport functionImport = MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("AllUsedRoomIds");
+ final EdmFunctionImport functionImport =
+ MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("AllUsedRoomIds");
- final ODataResponse response = new JsonEntityProvider().writeFunctionImport(functionImport, Arrays.asList("1", "2", "3"), null);
+ final ODataResponse response =
+ new JsonEntityProvider().writeFunctionImport(functionImport, Arrays.asList("1", "2", "3"), null);
assertNotNull(response);
assertNotNull(response.getEntity());
assertNull("EntitypProvider must not set content header", response.getContentHeader());
@@ -100,7 +104,8 @@ public class JsonFunctionImportTest extends BaseTest {
@Test
public void collectionOfComplexTypes() throws Exception {
- final EdmFunctionImport functionImport = MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("AllLocations");
+ final EdmFunctionImport functionImport =
+ MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("AllLocations");
Map<String, Object> locationData = new HashMap<String, Object>();
locationData.put("Country", "NO");
List<Map<String, Object>> locations = new ArrayList<Map<String, Object>>();
@@ -122,7 +127,8 @@ public class JsonFunctionImportTest extends BaseTest {
@Test
public void singleEntityType() throws Exception {
- final EdmFunctionImport functionImport = MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("OldestEmployee");
+ final EdmFunctionImport functionImport =
+ MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("OldestEmployee");
final String uri = "http://host:80/service/";
final EntityProviderWriteProperties properties =
EntityProviderWriteProperties.serviceRoot(URI.create(uri)).build();
@@ -130,7 +136,8 @@ public class JsonFunctionImportTest extends BaseTest {
employeeData.put("EmployeeId", "1");
employeeData.put("getImageType", "image/jpeg");
- final ODataResponse response = new JsonEntityProvider().writeFunctionImport(functionImport, employeeData, properties);
+ final ODataResponse response =
+ new JsonEntityProvider().writeFunctionImport(functionImport, employeeData, properties);
assertNotNull(response);
assertNotNull(response.getEntity());
assertNull("EntitypProvider must not set content header", response.getContentHeader());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducerTest.java
index ac7b71f..b23ac7b 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducerTest.java
index 36832ad..bef9ecb 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyProducerTest.java
index 0a00f91..ac31a80 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -46,7 +46,8 @@ public class JsonPropertyProducerTest extends BaseTest {
@Test
public void serializeString() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EmployeeName");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EmployeeName");
final ODataResponse response = new JsonEntityProvider().writeProperty(property, "\"Игорь\tНиколаевич\tЛарионов\"");
assertNotNull(response);
@@ -64,7 +65,8 @@ public class JsonPropertyProducerTest extends BaseTest {
char[] chars = new char[32768];
Arrays.fill(chars, 0, 32768, 'a');
String propertyValue = new String(chars);
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EmployeeName");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EmployeeName");
final ODataResponse response = new JsonEntityProvider().writeProperty(property, propertyValue);
assertNotNull(response);
@@ -79,21 +81,24 @@ public class JsonPropertyProducerTest extends BaseTest {
@Test
public void serializeNumber() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
final ODataResponse response = new JsonEntityProvider().writeProperty(property, 42);
assertEquals("{\"d\":{\"Age\":42}}", StringHelper.inputStreamToString((InputStream) response.getEntity()));
}
@Test
public void serializeBinary() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Building").getProperty("Image");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Building").getProperty("Image");
final ODataResponse response = new JsonEntityProvider().writeProperty(property, new byte[] { 42, -42 });
assertEquals("{\"d\":{\"Image\":\"KtY=\"}}", StringHelper.inputStreamToString((InputStream) response.getEntity()));
}
@Test
public void serializeBinaryWithContentType() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario2", "Photo").getProperty("Image");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario2", "Photo").getProperty("Image");
Map<String, Object> content = new HashMap<String, Object>();
content.put("getImageType", "image/jpeg");
content.put("Image", new byte[] { 1, 2, 3 });
@@ -103,14 +108,17 @@ public class JsonPropertyProducerTest extends BaseTest {
@Test
public void serializeBoolean() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Team").getProperty("isScrumTeam");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Team").getProperty("isScrumTeam");
final ODataResponse response = new JsonEntityProvider().writeProperty(property, false);
- assertEquals("{\"d\":{\"isScrumTeam\":false}}", StringHelper.inputStreamToString((InputStream) response.getEntity()));
+ assertEquals("{\"d\":{\"isScrumTeam\":false}}", StringHelper
+ .inputStreamToString((InputStream) response.getEntity()));
}
@Test
public void serializeNull() throws Exception {
- EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("ImageUrl");
+ EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("ImageUrl");
ODataResponse response = new JsonEntityProvider().writeProperty(property, null);
assertEquals("{\"d\":{\"ImageUrl\":null}}", StringHelper.inputStreamToString((InputStream) response.getEntity()));
@@ -129,16 +137,19 @@ public class JsonPropertyProducerTest extends BaseTest {
@Test
public void serializeDateTime() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EntryDate");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EntryDate");
Calendar dateTime = Calendar.getInstance();
dateTime.setTimeInMillis(-42);
final ODataResponse response = new JsonEntityProvider().writeProperty(property, dateTime);
- assertEquals("{\"d\":{\"EntryDate\":\"\\/Date(-42)\\/\"}}", StringHelper.inputStreamToString((InputStream) response.getEntity()));
+ assertEquals("{\"d\":{\"EntryDate\":\"\\/Date(-42)\\/\"}}", StringHelper.inputStreamToString((InputStream) response
+ .getEntity()));
}
@Test
public void serializeComplexProperty() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
Map<String, Object> cityData = new LinkedHashMap<String, Object>();
cityData.put("PostalCode", "8392");
cityData.put("CityName", "Å");
@@ -155,7 +166,8 @@ public class JsonPropertyProducerTest extends BaseTest {
@Test
public void serializeComplexPropertyNull() throws Exception {
- final EdmProperty property = (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
+ final EdmProperty property =
+ (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Location");
final ODataResponse response = new JsonEntityProvider().writeProperty(property, null);
assertEquals("{\"d\":{\"Location\":{\"__metadata\":{\"type\":\"RefScenario.c_Location\"},"
+ "\"City\":{\"__metadata\":{\"type\":\"RefScenario.c_City\"},"
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducerTest.java
index eaf4e8c..038f561 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/MyCallback.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/MyCallback.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/MyCallback.java
index 364a8ae..bdea75a 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/MyCallback.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/MyCallback.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -56,16 +56,21 @@ public class MyCallback implements OnWriteEntryContent, OnWriteFeedContent {
if ("Rooms".equals(context.getSourceEntitySet().getName())) {
if ("nr_Employees".equals(context.getNavigationProperty().getName())) {
HashMap<String, ODataCallback> callbacks = new HashMap<String, ODataCallback>();
- for (String navPropName : context.getSourceEntitySet().getRelatedEntitySet(context.getNavigationProperty()).getEntityType().getNavigationPropertyNames()) {
+ for (String navPropName : context.getSourceEntitySet().getRelatedEntitySet(context.getNavigationProperty())
+ .getEntityType().getNavigationPropertyNames()) {
callbacks.put(navPropName, this);
}
- EntityProviderWriteProperties inlineProperties = EntityProviderWriteProperties.serviceRoot(baseUri).callbacks(callbacks).expandSelectTree(context.getCurrentExpandSelectTreeNode()).selfLink(context.getSelfLink()).build();
+ EntityProviderWriteProperties inlineProperties =
+ EntityProviderWriteProperties.serviceRoot(baseUri).callbacks(callbacks).expandSelectTree(
+ context.getCurrentExpandSelectTreeNode()).selfLink(context.getSelfLink()).build();
result.setFeedData(dataProvider.getEmployeesData());
result.setInlineProperties(inlineProperties);
}
} else if ("Buildings".equals(context.getSourceEntitySet().getName())) {
- EntityProviderWriteProperties inlineProperties = EntityProviderWriteProperties.serviceRoot(baseUri).expandSelectTree(context.getCurrentExpandSelectTreeNode()).selfLink(context.getSelfLink()).build();
+ EntityProviderWriteProperties inlineProperties =
+ EntityProviderWriteProperties.serviceRoot(baseUri).expandSelectTree(
+ context.getCurrentExpandSelectTreeNode()).selfLink(context.getSelfLink()).build();
List<Map<String, Object>> emptyData = new ArrayList<Map<String, Object>>();
result.setFeedData(emptyData);
result.setInlineProperties(inlineProperties);
@@ -83,10 +88,13 @@ public class MyCallback implements OnWriteEntryContent, OnWriteFeedContent {
if ("Employees".equals(context.getSourceEntitySet().getName())) {
if ("ne_Room".equals(context.getNavigationProperty().getName())) {
HashMap<String, ODataCallback> callbacks = new HashMap<String, ODataCallback>();
- for (String navPropName : context.getSourceEntitySet().getRelatedEntitySet(context.getNavigationProperty()).getEntityType().getNavigationPropertyNames()) {
+ for (String navPropName : context.getSourceEntitySet().getRelatedEntitySet(context.getNavigationProperty())
+ .getEntityType().getNavigationPropertyNames()) {
callbacks.put(navPropName, this);
}
- EntityProviderWriteProperties inlineProperties = EntityProviderWriteProperties.serviceRoot(baseUri).callbacks(callbacks).expandSelectTree(context.getCurrentExpandSelectTreeNode()).build();
+ EntityProviderWriteProperties inlineProperties =
+ EntityProviderWriteProperties.serviceRoot(baseUri).callbacks(callbacks).expandSelectTree(
+ context.getCurrentExpandSelectTreeNode()).build();
result.setEntryData(dataProvider.getRoomData());
result.setInlineProperties(inlineProperties);
} else if ("ne_Team".equals(context.getNavigationProperty().getName())) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/ServiceDocumentProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/ServiceDocumentProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/ServiceDocumentProducerTest.java
index bfe4a54..fb04f70 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/ServiceDocumentProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/ServiceDocumentProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -69,7 +69,8 @@ public class ServiceDocumentProducerTest extends AbstractXmlProducerTestHelper {
@Test
public void testServiceDocumentXml() throws EntityProviderException, ODataException {
- ODataResponse response = EntityProvider.writeServiceDocument(HttpContentType.APPLICATION_ATOM_XML, edm, "http://localhost/");
+ ODataResponse response =
+ EntityProvider.writeServiceDocument(HttpContentType.APPLICATION_ATOM_XML, edm, "http://localhost/");
assertNull("EntityProvider should not set content header", response.getContentHeader());
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/TombstoneCallbackImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/TombstoneCallbackImpl.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/TombstoneCallbackImpl.java
index f65c13f..81cbd2f 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/TombstoneCallbackImpl.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/TombstoneCallbackImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/TombstoneProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/TombstoneProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/TombstoneProducerTest.java
index 7414d4c..11fc21a 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/TombstoneProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/TombstoneProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -67,12 +67,14 @@ public class TombstoneProducerTest extends AbstractProviderTest {
OutputStream outStream = csb.getOutputStream();
writer = XMLOutputFactory.newInstance().createXMLStreamWriter(outStream, DEFAULT_CHARSET);
defaultProperties = EntityProviderWriteProperties.serviceRoot(BASE_URI).build();
- defaultEia = EntityInfoAggregator.create(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), defaultProperties.getExpandSelectTree());
+ defaultEia =
+ EntityInfoAggregator.create(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"),
+ defaultProperties.getExpandSelectTree());
}
@Test
public void oneDeletedEntryWithAllProperties() throws Exception {
- //Prepare Data
+ // Prepare Data
List<Map<String, Object>> deletedEntries = new ArrayList<Map<String, Object>>();
Map<String, Object> data = new HashMap<String, Object>();
data.put("Id", "1");
@@ -80,9 +82,9 @@ public class TombstoneProducerTest extends AbstractProviderTest {
data.put("Seats", new Integer(20));
data.put("Version", new Integer(3));
deletedEntries.add(data);
- //Execute producer
+ // Execute producer
execute(deletedEntries);
- //Verify
+ // Verify
String xml = getXML();
assertXpathExists("/a:feed/at:deleted-entry[@ref and @when]", xml);
assertXpathEvaluatesTo("http://host:80/service/Rooms('1')", "/a:feed/at:deleted-entry/@ref", xml);
@@ -90,7 +92,7 @@ public class TombstoneProducerTest extends AbstractProviderTest {
@Test
public void twoDeletedEntriesWithAllProperties() throws Exception {
- //Prepare Data
+ // Prepare Data
List<Map<String, Object>> deletedEntries = new ArrayList<Map<String, Object>>();
Map<String, Object> data = new HashMap<String, Object>();
data.put("Id", "1");
@@ -105,9 +107,9 @@ public class TombstoneProducerTest extends AbstractProviderTest {
data2.put("Seats", new Integer(20));
data2.put("Version", new Integer(3));
deletedEntries.add(data2);
- //Execute producer
+ // Execute producer
execute(deletedEntries);
- //Verify
+ // Verify
String xml = getXML();
assertXpathExists("/a:feed/at:deleted-entry[@ref and @when]", xml);
assertXpathExists("/a:feed/at:deleted-entry[@ref=\"http://host:80/service/Rooms('1')\"]", xml);
@@ -116,14 +118,14 @@ public class TombstoneProducerTest extends AbstractProviderTest {
@Test
public void oneDeletedEntryWithKeyProperties() throws Exception {
- //Prepare Data
+ // Prepare Data
List<Map<String, Object>> deletedEntries = new ArrayList<Map<String, Object>>();
Map<String, Object> data = new HashMap<String, Object>();
data.put("Id", "1");
deletedEntries.add(data);
- //Execute producer
+ // Execute producer
execute(deletedEntries);
- //Verify
+ // Verify
String xml = getXML();
assertXpathExists("/a:feed/at:deleted-entry[@ref and @when]", xml);
assertXpathEvaluatesTo("http://host:80/service/Rooms('1')", "/a:feed/at:deleted-entry/@ref", xml);
@@ -131,21 +133,21 @@ public class TombstoneProducerTest extends AbstractProviderTest {
@Test(expected = EntityProviderException.class)
public void oneDeletedEntryWithoutProperties() throws Exception {
- //Prepare Data
+ // Prepare Data
List<Map<String, Object>> deletedEntries = new ArrayList<Map<String, Object>>();
Map<String, Object> data = new HashMap<String, Object>();
deletedEntries.add(data);
- //Execute producer
+ // Execute producer
execute(deletedEntries);
}
@Test
public void emptyEntryList() throws Exception {
- //Prepare Data
+ // Prepare Data
List<Map<String, Object>> deletedEntries = new ArrayList<Map<String, Object>>();
- //Execute producer
+ // Execute producer
execute(deletedEntries);
- //Verify
+ // Verify
String xml = getXML();
assertXpathExists("/a:feed", xml);
assertXpathNotExists("/a:feed/at:deleted-entry[@ref and @when]", xml);
@@ -153,13 +155,15 @@ public class TombstoneProducerTest extends AbstractProviderTest {
@Test
public void entryWithSyndicatedUpdatedMappingPresent() throws Exception {
- //Prepare Data
+ // Prepare Data
List<Map<String, Object>> deletedEntries = new ArrayList<Map<String, Object>>();
deletedEntries.add(employeeData);
- defaultEia = EntityInfoAggregator.create(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), defaultProperties.getExpandSelectTree());
- //Execute producer
+ defaultEia =
+ EntityInfoAggregator.create(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ defaultProperties.getExpandSelectTree());
+ // Execute producer
execute(deletedEntries);
- //Verify
+ // Verify
String xml = getXML();
assertXpathExists("/a:feed/at:deleted-entry[@ref and @when]", xml);
assertXpathEvaluatesTo("http://host:80/service/Employees('1')", "/a:feed/at:deleted-entry/@ref", xml);
@@ -168,15 +172,17 @@ public class TombstoneProducerTest extends AbstractProviderTest {
@Test
public void entryWithSyndicatedUpdatedMappingNotPresent() throws Exception {
- //Prepare Data
+ // Prepare Data
List<Map<String, Object>> deletedEntries = new ArrayList<Map<String, Object>>();
Map<String, Object> data = new HashMap<String, Object>();
data.put("EmployeeId", "1");
deletedEntries.add(data);
- defaultEia = EntityInfoAggregator.create(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), defaultProperties.getExpandSelectTree());
- //Execute producer
+ defaultEia =
+ EntityInfoAggregator.create(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ defaultProperties.getExpandSelectTree());
+ // Execute producer
execute(deletedEntries);
- //Verify
+ // Verify
String xml = getXML();
assertXpathExists("/a:feed/at:deleted-entry[@ref and @when]", xml);
assertXpathEvaluatesTo("http://host:80/service/Employees('1')", "/a:feed/at:deleted-entry/@ref", xml);
@@ -185,14 +191,16 @@ public class TombstoneProducerTest extends AbstractProviderTest {
@Test
public void entryWithSyndicatedUpdatedMappingNull() throws Exception {
- //Prepare Data
+ // Prepare Data
List<Map<String, Object>> deletedEntries = new ArrayList<Map<String, Object>>();
employeeData.put("EntryDate", null);
deletedEntries.add(employeeData);
- defaultEia = EntityInfoAggregator.create(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), defaultProperties.getExpandSelectTree());
- //Execute producer
+ defaultEia =
+ EntityInfoAggregator.create(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ defaultProperties.getExpandSelectTree());
+ // Execute producer
execute(deletedEntries);
- //Verify
+ // Verify
String xml = getXML();
assertXpathExists("/a:feed/at:deleted-entry[@ref and @when]", xml);
assertXpathEvaluatesTo("http://host:80/service/Employees('1')", "/a:feed/at:deleted-entry/@ref", xml);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlErrorProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlErrorProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlErrorProducerTest.java
index 6049ccc..85538ce 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlErrorProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlErrorProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -219,8 +219,11 @@ public class XmlErrorProducerTest extends AbstractXmlProducerTestHelper {
}
}
- private void serializeError(final String errorCode, final String message, final String innerError, final Locale locale) throws Exception {
- ODataResponse response = new AtomEntityProvider().writeErrorDocument(expectedStatus, errorCode, message, locale, innerError);
+ private void
+ serializeError(final String errorCode, final String message, final String innerError, final Locale locale)
+ throws Exception {
+ ODataResponse response =
+ new AtomEntityProvider().writeErrorDocument(expectedStatus, errorCode, message, locale, innerError);
String errorXml = verifyResponse(response);
verifyXml(errorCode, message, locale, innerError, errorXml);
}
@@ -237,7 +240,8 @@ public class XmlErrorProducerTest extends AbstractXmlProducerTestHelper {
return xmlString;
}
- private void verifyXml(final String errorCode, final String message, final Locale locale, final String innerError, final String errorXml) throws Exception {
+ private void verifyXml(final String errorCode, final String message, final Locale locale, final String innerError,
+ final String errorXml) throws Exception {
assertXpathExists("/a:error", errorXml);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlExpandProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlExpandProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlExpandProducerTest.java
index c8221e1..c9ff16a 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlExpandProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlExpandProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -89,9 +89,13 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
ExpandSelectTreeNode selectTree = getSelectExpandTree("Rooms('1')", "nr_Employees", "nr_Employees");
HashMap<String, ODataCallback> callbacksRoom = createCallbacks("Rooms");
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData,
+ properties);
String xmlString = verifyResponse(response);
assertXpathNotExists("/a:entry/m:properties", xmlString);
@@ -107,7 +111,8 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
ODataCallback employeeCallback = new OnWriteFeedContent() {
@Override
- public WriteFeedCallbackResult retrieveFeedResult(final WriteFeedCallbackContext context) throws ODataApplicationException {
+ public WriteFeedCallbackResult retrieveFeedResult(final WriteFeedCallbackContext context)
+ throws ODataApplicationException {
WriteFeedCallbackResult writeFeedCallbackResult = new WriteFeedCallbackResult();
writeFeedCallbackResult.setInlineProperties(DEFAULT_PROPERTIES);
writeFeedCallbackResult.setFeedData(null);
@@ -115,9 +120,13 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
}
};
callbacksRoom.put("nr_Employees", employeeCallback);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData,
+ properties);
String xmlString = verifyResponse(response);
assertXpathNotExists("/a:entry/m:properties", xmlString);
@@ -135,7 +144,8 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
ODataCallback employeeCallback = new OnWriteFeedContent() {
@Override
- public WriteFeedCallbackResult retrieveFeedResult(final WriteFeedCallbackContext context) throws ODataApplicationException {
+ public WriteFeedCallbackResult retrieveFeedResult(final WriteFeedCallbackContext context)
+ throws ODataApplicationException {
WriteFeedCallbackResult writeFeedCallbackResult = new WriteFeedCallbackResult();
writeFeedCallbackResult.setInlineProperties(DEFAULT_PROPERTIES);
writeFeedCallbackResult.setFeedData(new ArrayList<Map<String, Object>>());
@@ -143,9 +153,13 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
}
};
callbacksRoom.put("nr_Employees", employeeCallback);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData,
+ properties);
String xmlString = verifyResponse(response);
assertXpathNotExists("/a:entry/m:properties", xmlString);
@@ -159,9 +173,13 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
ExpandSelectTreeNode selectTree = getSelectExpandTree("Rooms('1')", "nr_Employees", "nr_Employees");
HashMap<String, ODataCallback> callbacksRoom = createCallbacks("Rooms");
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData,
+ properties);
String xmlString = verifyResponse(response);
assertXpathNotExists("/a:entry/m:properties", xmlString);
@@ -175,25 +193,35 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
ExpandSelectTreeNode selectTree = getSelectExpandTree("Rooms('1')", "nr_Employees/ne_Room", "nr_Employees/ne_Room");
HashMap<String, ODataCallback> callbacksRoom = createCallbacks("Rooms");
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData,
+ properties);
String xmlString = verifyResponse(response);
assertXpathNotExists("/a:entry/m:properties", xmlString);
assertXpathExists(employeeXPathString, xmlString);
assertXpathExists(employeeXPathString + "/m:inline/a:feed" + roomXPathString, xmlString);
- assertXpathExists(employeeXPathString + "/m:inline/a:feed" + roomXPathString + "/m:inline/a:entry/a:content/m:properties", xmlString);
+ assertXpathExists(employeeXPathString + "/m:inline/a:feed" + roomXPathString
+ + "/m:inline/a:entry/a:content/m:properties", xmlString);
}
@Test
public void deepExpandSelectedEmployeesWithRoomId() throws Exception {
- ExpandSelectTreeNode selectTree = getSelectExpandTree("Rooms('1')", "nr_Employees/ne_Room/Id", "nr_Employees/ne_Room");
+ ExpandSelectTreeNode selectTree =
+ getSelectExpandTree("Rooms('1')", "nr_Employees/ne_Room/Id", "nr_Employees/ne_Room");
HashMap<String, ODataCallback> callbacksRoom = createCallbacks("Rooms");
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksRoom)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData,
+ properties);
String xmlString = verifyResponse(response);
assertXpathNotExists("/a:entry/m:properties", xmlString);
@@ -201,7 +229,8 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
assertXpathExists(employeeXPathString + "/m:inline/a:feed" + roomXPathString, xmlString);
assertXpathExists(employeeXPathString + "/m:inline/a:feed" + roomXPathString + "/m:inline", xmlString);
assertXpathExists(employeeXPathString + "/m:inline/a:feed" + roomXPathString + "/m:inline/a:entry", xmlString);
- assertXpathExists(employeeXPathString + "/m:inline/a:feed" + roomXPathString + "/m:inline/a:entry/a:content/m:properties/d:Id", xmlString);
+ assertXpathExists(employeeXPathString + "/m:inline/a:feed" + roomXPathString
+ + "/m:inline/a:entry/a:content/m:properties/d:Id", xmlString);
}
@Test
@@ -209,9 +238,13 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
ExpandSelectTreeNode selectTree = getSelectExpandTree("Employees('1')", "ne_Room", "ne_Room");
HashMap<String, ODataCallback> callbacksEmployee = createCallbacks("Employees");
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksEmployee).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksEmployee)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ employeeData, properties);
String xmlString = verifyResponse(response);
verifyNavigationProperties(xmlString, F, T, F);
@@ -224,9 +257,13 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
ExpandSelectTreeNode selectTree = getSelectExpandTree("Employees('1')", "ne_Team", "ne_Team");
HashMap<String, ODataCallback> callbacksEmployee = createCallbacks("Employees");
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksEmployee).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksEmployee)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ employeeData, properties);
String xmlString = verifyResponse(response);
verifyNavigationProperties(xmlString, F, F, T);
@@ -243,7 +280,8 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
OnWriteEntryContent callback = new OnWriteEntryContent() {
@Override
- public WriteEntryCallbackResult retrieveEntryResult(final WriteEntryCallbackContext context) throws ODataApplicationException {
+ public WriteEntryCallbackResult retrieveEntryResult(final WriteEntryCallbackContext context)
+ throws ODataApplicationException {
WriteEntryCallbackResult result = new WriteEntryCallbackResult();
result.setInlineProperties(DEFAULT_PROPERTIES);
result.setEntryData(new HashMap<String, Object>());
@@ -251,9 +289,13 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
}
};
callbacksEmployee.put("ne_Team", callback);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksEmployee).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksEmployee)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ employeeData, properties);
String xmlString = verifyResponse(response);
verifyNavigationProperties(xmlString, F, F, T);
@@ -267,9 +309,13 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
ExpandSelectTreeNode selectTree = getSelectExpandTree("Buildings('1')", "nb_Rooms", "nb_Rooms");
HashMap<String, ODataCallback> callbacksEmployee = createCallbacks("Buildings");
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksEmployee).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksEmployee)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Buildings"), buildingData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Buildings"),
+ buildingData, properties);
String xmlString = verifyResponse(response);
assertXpathNotExists("/a:entry/m:properties", xmlString);
@@ -291,15 +337,20 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
HashMap<String, ODataCallback> callbacksBuilding = new HashMap<String, ODataCallback>();
callbacksBuilding.put("nb_Rooms", null);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksBuilding).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksBuilding)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Buildings"), buildingData, properties);
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Buildings"), buildingData,
+ properties);
}
- private HashMap<String, ODataCallback> createCallbacks(final String entitySetName) throws EdmException, ODataException {
+ private HashMap<String, ODataCallback> createCallbacks(final String entitySetName) throws EdmException,
+ ODataException {
HashMap<String, ODataCallback> callbacksEmployee = new HashMap<String, ODataCallback>();
MyCallback callback = new MyCallback(this, inlineBaseUri);
- for (String navPropName : MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet(entitySetName).getEntityType().getNavigationPropertyNames()) {
+ for (String navPropName : MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet(entitySetName)
+ .getEntityType().getNavigationPropertyNames()) {
callbacksEmployee.put(navPropName, callback);
}
return callbacksEmployee;
@@ -309,9 +360,12 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
public void expandSelectedRoomWithoutCallback() throws Exception {
ExpandSelectTreeNode selectTree = getSelectExpandTree("Employees('1')", "ne_Room", "ne_Room");
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).build();
AtomEntityProvider provider = createAtomEntityProvider();
- ODataResponse response = provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties);
+ ODataResponse response =
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ employeeData, properties);
String xmlString = verifyResponse(response);
verifyNavigationProperties(xmlString, F, T, F);
@@ -325,12 +379,16 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
HashMap<String, ODataCallback> callbacksEmployee = new HashMap<String, ODataCallback>();
callbacksEmployee.put("ne_Room", null);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksEmployee).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).expandSelectTree(selectTree).callbacks(callbacksEmployee)
+ .build();
AtomEntityProvider provider = createAtomEntityProvider();
- provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties);
+ provider.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData,
+ properties);
}
- private void verifyEmployees(final String path, final String xmlString) throws XpathException, IOException, SAXException {
+ private void verifyEmployees(final String path, final String xmlString) throws XpathException, IOException,
+ SAXException {
assertXpathExists(path, xmlString);
assertXpathExists(path + "/m:inline", xmlString);
@@ -377,7 +435,8 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
assertXpathExists(path + "/m:inline/a:entry/a:content/m:properties/d:Version", xmlString);
}
- private void verifyNavigationProperties(final String xmlString, final boolean neManager, final boolean neRoom, final boolean neTeam) throws IOException, SAXException, XpathException {
+ private void verifyNavigationProperties(final String xmlString, final boolean neManager, final boolean neRoom,
+ final boolean neTeam) throws IOException, SAXException, XpathException {
if (neManager) {
assertXpathExists("/a:entry/a:link[@href=\"Employees('1')/ne_Manager\" and @title='ne_Manager']", xmlString);
} else {
@@ -403,7 +462,8 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
return xmlString;
}
- private ExpandSelectTreeNode getSelectExpandTree(final String pathSegment, final String selectString, final String expandString) throws Exception {
+ private ExpandSelectTreeNode getSelectExpandTree(final String pathSegment, final String selectString,
+ final String expandString) throws Exception {
Edm edm = RuntimeDelegate.createEdm(new EdmTestProvider());
UriParserImpl uriParser = new UriParserImpl(edm);
@@ -420,7 +480,8 @@ public class XmlExpandProducerTest extends AbstractProviderTest {
}
UriInfo uriInfo = uriParser.parse(pathSegments, queryParameters);
- ExpandSelectTreeCreator expandSelectTreeCreator = new ExpandSelectTreeCreator(uriInfo.getSelect(), uriInfo.getExpand());
+ ExpandSelectTreeCreator expandSelectTreeCreator =
+ new ExpandSelectTreeCreator(uriInfo.getSelect(), uriInfo.getExpand());
ExpandSelectTreeNode expandSelectTree = expandSelectTreeCreator.create();
assertNotNull(expandSelectTree);
return expandSelectTree;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFeedWithTombstonesProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFeedWithTombstonesProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFeedWithTombstonesProducerTest.java
index 1b3d830..ae88009 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFeedWithTombstonesProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFeedWithTombstonesProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -55,7 +55,8 @@ public class XmlFeedWithTombstonesProducerTest extends AbstractProviderTest {
initializeRoomData(2);
initializeCallbacks();
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
String xmlString = execute(properties, entitySet);
@@ -68,7 +69,8 @@ public class XmlFeedWithTombstonesProducerTest extends AbstractProviderTest {
initializeRoomData(4);
initializeCallbacks();
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
String xmlString = execute(properties, entitySet);
@@ -83,7 +85,8 @@ public class XmlFeedWithTombstonesProducerTest extends AbstractProviderTest {
callbacks = new HashMap<String, ODataCallback>();
callbacks.put(TombstoneCallback.CALLBACK_KEY_TOMBSTONE, tombstoneCallback);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
String xmlString = execute(properties, entitySet);
@@ -94,16 +97,19 @@ public class XmlFeedWithTombstonesProducerTest extends AbstractProviderTest {
public void deltaLinkPresent() throws Exception {
initializeRoomData(2);
initializeDeletedRoomData();
- TombstoneCallback tombstoneCallback = new TombstoneCallbackImpl(deletedRoomsData, BASE_URI.toASCIIString() + "Rooms?!deltatoken=1234");
+ TombstoneCallback tombstoneCallback =
+ new TombstoneCallbackImpl(deletedRoomsData, BASE_URI.toASCIIString() + "Rooms?!deltatoken=1234");
callbacks = new HashMap<String, ODataCallback>();
callbacks.put(TombstoneCallback.CALLBACK_KEY_TOMBSTONE, tombstoneCallback);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
String xmlString = execute(properties, entitySet);
assertXpathExists("/a:feed/at:deleted-entry", xmlString);
- assertXpathExists("/a:feed/a:link[@rel=\"delta\" and @href=\"" + BASE_URI.toASCIIString() + "Rooms?!deltatoken=1234" + "\"]", xmlString);
+ assertXpathExists("/a:feed/a:link[@rel=\"delta\" and @href=\"" + BASE_URI.toASCIIString()
+ + "Rooms?!deltatoken=1234" + "\"]", xmlString);
}
@Test
@@ -114,7 +120,8 @@ public class XmlFeedWithTombstonesProducerTest extends AbstractProviderTest {
callbacks = new HashMap<String, ODataCallback>();
callbacks.put(TombstoneCallback.CALLBACK_KEY_TOMBSTONE, tombstoneCallback);
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
String xmlString = execute(properties, entitySet);
@@ -122,7 +129,8 @@ public class XmlFeedWithTombstonesProducerTest extends AbstractProviderTest {
assertXpathNotExists("/a:feed/a:link[@rel=\"http://odata.org/delta\" and @href]", xmlString);
}
- private String execute(final EntityProviderWriteProperties properties, final EdmEntitySet entitySet) throws EntityProviderException, IOException {
+ private String execute(final EntityProviderWriteProperties properties, final EdmEntitySet entitySet)
+ throws EntityProviderException, IOException {
ODataResponse response = EntityProvider.writeFeed("application/atom+xml", entitySet, roomsData, properties);
assertNotNull(response);
String xmlString = StringHelper.inputStreamToString((InputStream) response.getEntity());
@@ -134,7 +142,8 @@ public class XmlFeedWithTombstonesProducerTest extends AbstractProviderTest {
initializeRoomData(1);
initializeCallbacks();
- EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
+ EntityProviderWriteProperties properties =
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).callbacks(callbacks).build();
EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
String xmlString = execute(properties, entitySet);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFunctionImportTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFunctionImportTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFunctionImportTest.java
index 126a7b4..de71435 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFunctionImportTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFunctionImportTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;
@@ -44,9 +44,11 @@ public class XmlFunctionImportTest extends AbstractProviderTest {
@Test
public void singleSimpleType() throws Exception {
- final EdmFunctionImport functionImport = MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("MaximalAge");
+ final EdmFunctionImport functionImport =
+ MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("MaximalAge");
- final ODataResponse response = createAtomEntityProvider().writeFunctionImport(functionImport, employeeData.get("Age"), DEFAULT_PROPERTIES);
+ final ODataResponse response =
+ createAtomEntityProvider().writeFunctionImport(functionImport, employeeData.get("Age"), DEFAULT_PROPERTIES);
assertNotNull(response);
assertNotNull(response.getEntity());
assertNull("EntitypProvider must not set content header", response.getContentHeader());
@@ -60,9 +62,12 @@ public class XmlFunctionImportTest extends AbstractProviderTest {
@Test
public void singleComplexType() throws Exception {
- final EdmFunctionImport functionImport = MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("MostCommonLocation");
+ final EdmFunctionImport functionImport =
+ MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("MostCommonLocation");
- final ODataResponse response = createAtomEntityProvider().writeFunctionImport(functionImport, employeeData.get("Location"), DEFAULT_PROPERTIES);
+ final ODataResponse response =
+ createAtomEntityProvider()
+ .writeFunctionImport(functionImport, employeeData.get("Location"), DEFAULT_PROPERTIES);
assertNotNull(response);
assertNotNull(response.getEntity());
assertNull("EntitypProvider must not set content header", response.getContentHeader());
@@ -77,9 +82,12 @@ public class XmlFunctionImportTest extends AbstractProviderTest {
@Test
public void collectionOfSimpleTypes() throws Exception {
- final EdmFunctionImport functionImport = MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("AllUsedRoomIds");
+ final EdmFunctionImport functionImport =
+ MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("AllUsedRoomIds");
- final ODataResponse response = createAtomEntityProvider().writeFunctionImport(functionImport, Arrays.asList("1", "2", "3"), DEFAULT_PROPERTIES);
+ final ODataResponse response =
+ createAtomEntityProvider()
+ .writeFunctionImport(functionImport, Arrays.asList("1", "2", "3"), DEFAULT_PROPERTIES);
assertNotNull(response);
assertNotNull(response.getEntity());
assertNull("EntitypProvider must not set content header", response.getContentHeader());
@@ -95,9 +103,12 @@ public class XmlFunctionImportTest extends AbstractProviderTest {
@Test
public void collectionOfComplexTypes() throws Exception {
- final EdmFunctionImport functionImport = MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("AllLocations");
+ final EdmFunctionImport functionImport =
+ MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("AllLocations");
- final ODataResponse response = createAtomEntityProvider().writeFunctionImport(functionImport, Arrays.asList(employeeData.get("Location")), DEFAULT_PROPERTIES);
+ final ODataResponse response =
+ createAtomEntityProvider().writeFunctionImport(functionImport, Arrays.asList(employeeData.get("Location")),
+ DEFAULT_PROPERTIES);
assertNotNull(response);
assertNotNull(response.getEntity());
assertNull("EntitypProvider must not set content header", response.getContentHeader());
@@ -113,9 +124,11 @@ public class XmlFunctionImportTest extends AbstractProviderTest {
@Test
public void singleEntityType() throws Exception {
- final EdmFunctionImport functionImport = MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("OldestEmployee");
+ final EdmFunctionImport functionImport =
+ MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("OldestEmployee");
- final ODataResponse response = createAtomEntityProvider().writeFunctionImport(functionImport, employeeData, DEFAULT_PROPERTIES);
+ final ODataResponse response =
+ createAtomEntityProvider().writeFunctionImport(functionImport, employeeData, DEFAULT_PROPERTIES);
assertNotNull(response);
assertNotNull(response.getEntity());
assertNull("EntityProvider should not set content header", response.getContentHeader());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducerTest.java
index 9dd2a27..df36b95 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducerTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.ep.producer;