[OLINGO-251] clean up code
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/2541c88f Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/2541c88f Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/2541c88f Branch: refs/heads/Olingo-129_PocJpaDataStore Commit: 2541c88f1ec4e0a5f38f693f708b2527fd891910 Parents: b9bcff1 Author: Stephan Klevenz <[email protected]> Authored: Wed Apr 23 10:41:02 2014 +0200 Committer: Stephan Klevenz <[email protected]> Committed: Wed Apr 23 10:41:02 2014 +0200 ---------------------------------------------------------------------- .../olingo/odata2/api/ep/EntityProviderWriteProperties.java | 8 ++++---- .../odata2/core/ep/ODataEntityProviderPropertiesTest.java | 4 ++-- .../odata2/core/ep/producer/AtomEntryProducerTest.java | 4 ++-- .../apache/olingo/odata2/fit/ref/EntryJsonChangeTest.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/2541c88f/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java index 93c1082..822fc84 100644 --- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java +++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java @@ -122,8 +122,8 @@ public class EntityProviderWriteProperties { /** * Gets the additional links that should be in the payload. * @return the additional links as Map where the navigation-property name is the key and - * a key predicate is the value - - * a key predicate is a Map from key-property names to their values + * a key predicate is the value - + * a key predicate is a Map from key-property names to their values */ public final Map<String, Map<String, Object>> getAdditionalLinks() { return additionalLinks; @@ -220,8 +220,8 @@ public class EntityProviderWriteProperties { /** * Sets additional links from this entity to other entities. * @param links a Map where the navigation-property name is the key and - * a key predicate is the value - - * a key predicate is a Map from key-property names to their values + * a key predicate is the value - + * a key predicate is a Map from key-property names to their values * @return properties builder */ public ODataEntityProviderPropertiesBuilder additionalLinks(final Map<String, Map<String, Object>> links) { http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/2541c88f/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ODataEntityProviderPropertiesTest.java ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ODataEntityProviderPropertiesTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ODataEntityProviderPropertiesTest.java index b5d178e..3b0d5ab 100644 --- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ODataEntityProviderPropertiesTest.java +++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ODataEntityProviderPropertiesTest.java @@ -62,7 +62,7 @@ public class ODataEntityProviderPropertiesTest extends BaseTest { callbacks.put("aCallback", new MyCallback(null, null)); ExpandSelectTreeNode expandSelectTree = new ExpandSelectTreeNodeImpl(); URI selfLink = new URI("http://some.uri";); - Map<String, Map<String, Object>> links = new HashMap<String, Map<String,Object>>(); + Map<String, Map<String, Object>> links = new HashMap<String, Map<String, Object>>(); links.put("aNavigationProperty", Collections.<String, Object> emptyMap()); final EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(serviceRoot) .callbacks(callbacks) @@ -106,7 +106,7 @@ public class ODataEntityProviderPropertiesTest extends BaseTest { callbacks.put("aCallback", new MyCallback(null, null)); ExpandSelectTreeNode expandSelectTree = new ExpandSelectTreeNodeImpl(); URI selfLink = new URI("http://some.uri";); - Map<String, Map<String, Object>> links = new HashMap<String, Map<String,Object>>(); + Map<String, Map<String, Object>> links = new HashMap<String, Map<String, Object>>(); links.put("aNavigationProperty", Collections.<String, Object> emptyMap()); final EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(serviceRoot) .callbacks(callbacks) http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/2541c88f/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryProducerTest.java ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryProducerTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryProducerTest.java index c4bcb22..a87698d 100644 --- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryProducerTest.java +++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryProducerTest.java @@ -725,7 +725,7 @@ public class AtomEntryProducerTest extends AbstractProviderTest { links.put("nr_Building", buildingData); final ODataResponse response = createAtomEntityProvider().writeEntry( MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData, - EntityProviderWriteProperties.serviceRoot(BASE_URI).additionalLinks(links).build()); + EntityProviderWriteProperties.serviceRoot(BASE_URI).additionalLinks(links).build()); final String xmlString = verifyResponse(response); assertXpathExists("/a:entry/a:link[@title='nr_Building']", xmlString); @@ -740,7 +740,7 @@ public class AtomEntryProducerTest extends AbstractProviderTest { links.put("nr_Employees", employeeData); final ODataResponse response = createAtomEntityProvider().writeEntry( MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms"), roomData, - EntityProviderWriteProperties.serviceRoot(BASE_URI).additionalLinks(links).build()); + EntityProviderWriteProperties.serviceRoot(BASE_URI).additionalLinks(links).build()); final String xmlString = verifyResponse(response); assertXpathExists("/a:entry/a:link[@title='nr_Employees']", xmlString); http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/2541c88f/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonChangeTest.java ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonChangeTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonChangeTest.java index 9c1df43..7be20f2 100644 --- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonChangeTest.java +++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonChangeTest.java @@ -93,7 +93,7 @@ public class EntryJsonChangeTest extends AbstractRefTest { data.put("Version", 42); Map<String, Object> key = new HashMap<String, Object>(); key.put("Id", "1"); - Map<String, Map<String, Object>> links = new HashMap<String, Map<String,Object>>(); + Map<String, Map<String, Object>> links = new HashMap<String, Map<String, Object>>(); links.put("nr_Building", key); final String requestBody = StringHelper.inputStreamToString( (InputStream) EntityProvider.writeEntry(HttpContentType.APPLICATION_JSON, linkedEntitySet, data,
