You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2015/09/17 09:25:35 UTC
[10/10] olingo-odata4 git commit: [OLINGO-659] Renamed setter/getter
to fit code conventions
[OLINGO-659] Renamed setter/getter to fit code conventions
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/87f829e5
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/87f829e5
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/87f829e5
Branch: refs/heads/master
Commit: 87f829e5aea7f8900e5876ecae0ba06da1895f57
Parents: 547cd0a
Author: Michael Bolz <mi...@sap.com>
Authored: Thu Sep 17 09:18:24 2015 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Thu Sep 17 09:18:24 2015 +0200
----------------------------------------------------------------------
.../serializer/EntityCollectionSerializerOptions.java | 12 ++++++------
.../server/api/serializer/EntitySerializerOptions.java | 10 +++++-----
.../org/apache/olingo/server/core/ServiceRequest.java | 6 +++---
.../core/serializer/json/ODataJsonSerializer.java | 4 ++--
.../server/core/serializer/xml/ODataXmlSerializer.java | 4 ++--
.../tecsvc/processor/TechnicalEntityProcessor.java | 2 +-
.../core/serializer/xml/ODataXmlSerializerTest.java | 10 +++++-----
.../service/DemoEntityCollectionProcessor.java | 2 +-
.../service/DemoEntityCollectionProcessor.java | 2 +-
.../service/DemoEntityCollectionProcessor.java | 2 +-
10 files changed, 27 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/87f829e5/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntityCollectionSerializerOptions.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntityCollectionSerializerOptions.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntityCollectionSerializerOptions.java
index 0eab699..c1f9869 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntityCollectionSerializerOptions.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntityCollectionSerializerOptions.java
@@ -30,7 +30,7 @@ public class EntityCollectionSerializerOptions {
private CountOption count;
private ExpandOption expand;
private SelectOption select;
- private boolean onlyReferences;
+ private boolean writeOnlyReferences;
private String id;
/** Gets the {@link ContextURL}. */
@@ -54,8 +54,8 @@ public class EntityCollectionSerializerOptions {
}
/** only writes the references of the entities */
- public boolean onlyReferences() {
- return onlyReferences;
+ public boolean getWriteOnlyReferences() {
+ return writeOnlyReferences;
}
/** Gets the id of the entity collection */
@@ -102,13 +102,13 @@ public class EntityCollectionSerializerOptions {
}
/** Sets to serialize only references */
- public Builder setWriteOnlyReferences(final boolean ref) {
- options.onlyReferences = ref;
+ public Builder writeOnlyReferences(final boolean ref) {
+ options.writeOnlyReferences = ref;
return this;
}
/** Sets id of the collection */
- public Builder setId(final String id) {
+ public Builder id(final String id) {
options.id = id;
return this;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/87f829e5/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntitySerializerOptions.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntitySerializerOptions.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntitySerializerOptions.java
index db73c43..b6dfa48 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntitySerializerOptions.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntitySerializerOptions.java
@@ -27,7 +27,7 @@ public class EntitySerializerOptions {
private ContextURL contextURL;
private ExpandOption expand;
private SelectOption select;
- private boolean onlyReferences;
+ private boolean writeOnlyReferences;
/** Gets the {@link ContextURL}. */
public ContextURL getContextURL() {
@@ -45,8 +45,8 @@ public class EntitySerializerOptions {
}
/** only writes the references of the entities */
- public boolean onlyReferences() {
- return onlyReferences;
+ public boolean getWriteOnlyReferences() {
+ return writeOnlyReferences;
}
private EntitySerializerOptions() {}
@@ -84,8 +84,8 @@ public class EntitySerializerOptions {
}
/** Sets to serialize only references */
- public Builder setWriteOnlyReferences(final boolean ref) {
- options.onlyReferences = ref;
+ public Builder writeOnlyReferences(final boolean ref) {
+ options.writeOnlyReferences = ref;
return this;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/87f829e5/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceRequest.java
----------------------------------------------------------------------
diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceRequest.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceRequest.java
index 7f3f234..8195b85 100644
--- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceRequest.java
+++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ServiceRequest.java
@@ -147,13 +147,13 @@ public abstract class ServiceRequest {
return (T) EntitySerializerOptions.with()
.contextURL(isODataMetadataNone(getResponseContentType()) ? null : contextUrl)
.expand(uriInfo.getExpandOption()).select(this.uriInfo.getSelectOption())
- .setWriteOnlyReferences(references).build();
+ .writeOnlyReferences(references).build();
} else if (serilizerOptions.isAssignableFrom(EntityCollectionSerializerOptions.class)) {
return (T) EntityCollectionSerializerOptions.with()
.contextURL(isODataMetadataNone(getResponseContentType()) ? null : contextUrl)
.count(uriInfo.getCountOption()).expand(uriInfo.getExpandOption())
- .select(uriInfo.getSelectOption()).setWriteOnlyReferences(references)
- .setId(getODataRequest().getRawBaseUri()+getODataRequest().getRawODataPath()).build();
+ .select(uriInfo.getSelectOption()).writeOnlyReferences(references)
+ .id(getODataRequest().getRawBaseUri() + getODataRequest().getRawODataPath()).build();
} else if (serilizerOptions.isAssignableFrom(ComplexSerializerOptions.class)) {
return (T) ComplexSerializerOptions.with().contextURL(contextUrl)
.expand(this.uriInfo.getExpandOption()).select(this.uriInfo.getSelectOption()).build();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/87f829e5/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java
index f9c0c8f..642a91e 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java
@@ -157,7 +157,7 @@ public class ODataJsonSerializer extends AbstractODataSerializer {
writeEntitySet(metadata, entityType, entitySet, null, null, false, json);
} else {
writeEntitySet(metadata, entityType, entitySet,
- options.getExpand(), options.getSelect(), options.onlyReferences(), json);
+ options.getExpand(), options.getSelect(), options.getWriteOnlyReferences(), json);
}
writeNextLink(entitySet, json);
@@ -186,7 +186,7 @@ public class ODataJsonSerializer extends AbstractODataSerializer {
writeEntity(metadata, entityType, entity, contextURL,
options == null ? null : options.getExpand(),
options == null ? null : options.getSelect(),
- options == null ? false : options.onlyReferences(),
+ options == null ? false : options.getWriteOnlyReferences(),
json);
json.close();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/87f829e5/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializer.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializer.java
index 57cdc95..4e1ba56 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializer.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializer.java
@@ -213,7 +213,7 @@ public class ODataXmlSerializer extends AbstractODataSerializer {
final EntityCollectionSerializerOptions options) throws SerializerException {
final ContextURL contextURL = checkContextURL(options == null ? null : options.getContextURL());
- if (options != null && options.onlyReferences()) {
+ if (options != null && options.getWriteOnlyReferences()) {
ReferenceCollectionSerializerOptions rso = ReferenceCollectionSerializerOptions.with()
.contextURL(contextURL).build();
return entityReferenceCollection(entitySet, rso);
@@ -282,7 +282,7 @@ public class ODataXmlSerializer extends AbstractODataSerializer {
final Entity entity, final EntitySerializerOptions options) throws SerializerException {
final ContextURL contextURL = checkContextURL(options == null ? null : options.getContextURL());
- if (options != null && options.onlyReferences()) {
+ if (options != null && options.getWriteOnlyReferences()) {
return entityReference(entity,
ReferenceSerializerOptions.with().contextURL(contextURL).build());
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/87f829e5/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java
index efa8dda..59d9a2a 100644
--- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java
+++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java
@@ -536,7 +536,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor
getContextUrl(request.getRawODataPath(), edmEntitySet, edmEntityType, false, expand, select))
.count(countOption)
.expand(expand).select(select)
- .setId(id)
+ .id(id)
.build());
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/87f829e5/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerTest.java
----------------------------------------------------------------------
diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerTest.java
index 9ef0845..1feb17e 100644
--- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerTest.java
+++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerTest.java
@@ -270,7 +270,7 @@ public class ODataXmlSerializerTest {
EntityCollectionSerializerOptions.with()
.contextURL(ContextURL.with().serviceRoot(new URI("http://host:port"))
.entitySet(edmEntitySet).build())
- .setId("http://host/svc/ESCompAllPrim")
+ .id("http://host/svc/ESCompAllPrim")
.count(countOption)
.build()).getContent();
final String resultString = IOUtils.toString(result);
@@ -635,7 +635,7 @@ public class ODataXmlSerializerTest {
edmEntitySet.getEntityType(), entitySet,
EntityCollectionSerializerOptions.with()
.contextURL(ContextURL.with().entitySet(edmEntitySet).build())
- .setId("http://host/svc/ESMedia")
+ .id("http://host/svc/ESMedia")
.build()).getContent();
final String resultString = IOUtils.toString(content);
@@ -732,7 +732,7 @@ public class ODataXmlSerializerTest {
EntityCollectionSerializerOptions.with()
.contextURL(ContextURL.with().serviceRoot(URI.create("http://host/svc"))
.entitySet(edmEntitySet).build())
- .setId("http://host/svc/ESAllNullable")
+ .id("http://host/svc/ESAllNullable")
.build()).getContent();
final String resultString = IOUtils.toString(content);
String expected = "<?xml version='1.0' encoding='UTF-8'?>\n" +
@@ -928,7 +928,7 @@ public class ODataXmlSerializerTest {
.contextURL(ContextURL.with().entitySet(edmEntitySet)
.selectList(helper.buildContextURLSelectList(entityType, null, select))
.build())
- .setId("http://host/svc/ESCompComp")
+ .id("http://host/svc/ESCompComp")
.select(select)
.build()).getContent();
final String resultString = IOUtils.toString(result);
@@ -1002,7 +1002,7 @@ public class ODataXmlSerializerTest {
.contextURL(ContextURL.with().entitySet(edmEntitySet)
.selectList(helper.buildContextURLSelectList(entityType, null, select))
.build())
- .setId("http://host/svc/ESCompComp")
+ .id("http://host/svc/ESCompComp")
.select(select)
.build()).getContent();
final String resultString = IOUtils.toString(inputStream);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/87f829e5/samples/tutorials/p3_write/src/main/java/myservice/mynamespace/service/DemoEntityCollectionProcessor.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/p3_write/src/main/java/myservice/mynamespace/service/DemoEntityCollectionProcessor.java b/samples/tutorials/p3_write/src/main/java/myservice/mynamespace/service/DemoEntityCollectionProcessor.java
index 77614e3..6eb4e21 100755
--- a/samples/tutorials/p3_write/src/main/java/myservice/mynamespace/service/DemoEntityCollectionProcessor.java
+++ b/samples/tutorials/p3_write/src/main/java/myservice/mynamespace/service/DemoEntityCollectionProcessor.java
@@ -82,7 +82,7 @@ public class DemoEntityCollectionProcessor implements EntityCollectionProcessor
final String id = request.getRawBaseUri() + "/" + edmEntitySet.getName();
EntityCollectionSerializerOptions opts =
- EntityCollectionSerializerOptions.with().setId(id).contextURL(contextUrl).build();
+ EntityCollectionSerializerOptions.with().id(id).contextURL(contextUrl).build();
SerializerResult serializedContent = serializer.entityCollection(serviceMetadata, edmEntityType, entitySet, opts);
// Finally: configure the response object: set the body, headers and status code
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/87f829e5/samples/tutorials/p7_queryoptions-o/src/main/java/myservice/mynamespace/service/DemoEntityCollectionProcessor.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/p7_queryoptions-o/src/main/java/myservice/mynamespace/service/DemoEntityCollectionProcessor.java b/samples/tutorials/p7_queryoptions-o/src/main/java/myservice/mynamespace/service/DemoEntityCollectionProcessor.java
index 48f4660..c9119ac 100644
--- a/samples/tutorials/p7_queryoptions-o/src/main/java/myservice/mynamespace/service/DemoEntityCollectionProcessor.java
+++ b/samples/tutorials/p7_queryoptions-o/src/main/java/myservice/mynamespace/service/DemoEntityCollectionProcessor.java
@@ -136,7 +136,7 @@ public class DemoEntityCollectionProcessor implements EntityCollectionProcessor
final String id = request.getRawBaseUri() + "/" + edmEntitySet.getName();
EntityCollectionSerializerOptions opts =
- EntityCollectionSerializerOptions.with().setId(id).contextURL(contextUrl).build();
+ EntityCollectionSerializerOptions.with().id(id).contextURL(contextUrl).build();
SerializerResult serializerResult = serializer.entityCollection(serviceMetadata, edmEntityType,
entityCollection, opts);
InputStream serializedContent = serializerResult.getContent();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/87f829e5/samples/tutorials/p8_queryoptions-f/src/main/java/myservice/mynamespace/service/DemoEntityCollectionProcessor.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/p8_queryoptions-f/src/main/java/myservice/mynamespace/service/DemoEntityCollectionProcessor.java b/samples/tutorials/p8_queryoptions-f/src/main/java/myservice/mynamespace/service/DemoEntityCollectionProcessor.java
index 140d0e7..349cb8c 100644
--- a/samples/tutorials/p8_queryoptions-f/src/main/java/myservice/mynamespace/service/DemoEntityCollectionProcessor.java
+++ b/samples/tutorials/p8_queryoptions-f/src/main/java/myservice/mynamespace/service/DemoEntityCollectionProcessor.java
@@ -124,7 +124,7 @@ public class DemoEntityCollectionProcessor implements EntityCollectionProcessor
final String id = request.getRawBaseUri() + "/" + edmEntitySet.getName();
EntityCollectionSerializerOptions opts = EntityCollectionSerializerOptions.with()
- .contextURL(contextUrl).setId(id).build();
+ .contextURL(contextUrl).id(id).build();
SerializerResult serializerResult = serializer.entityCollection(serviceMetadata, edmEntityType, entityCollection,
opts);