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/10/05 10:13:49 UTC

olingo-odata4 git commit: [OLINGO-789] Minor clean up

Repository: olingo-odata4
Updated Branches:
  refs/heads/master b736c4349 -> 26c923b6f


[OLINGO-789] Minor clean up


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/26c923b6
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/26c923b6
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/26c923b6

Branch: refs/heads/master
Commit: 26c923b6f3b0ac64956fcf8550c8cd1902692c5f
Parents: b736c43
Author: Michael Bolz <mi...@sap.com>
Authored: Mon Oct 5 08:24:48 2015 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Mon Oct 5 08:24:48 2015 +0200

----------------------------------------------------------------------
 .../org/apache/olingo/server/tecsvc/data/ActionData.java  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/26c923b6/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/ActionData.java
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/ActionData.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/ActionData.java
index 1169959..d14267d 100644
--- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/ActionData.java
+++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/ActionData.java
@@ -54,8 +54,7 @@ public class ActionData {
       return DataCreator.createPrimitive(null, "UARTString string value");
     } else if ("UARTByteNineParam".equals(name)) {
       short count = 0;  // counts non-empty parameters
-      for (final String parameterName : parameters.keySet()) {
-        final Parameter parameter = parameters.get(parameterName);
+      for (final Parameter parameter : parameters.values()) {
         if (!(parameter.isNull()
             || !parameter.isCollection()
                 && (parameter.isComplex() && parameter.asComplex().getValue().isEmpty()
@@ -81,10 +80,9 @@ public class ActionData {
           String param16String = valueAsString(paramInt16, EdmPrimitiveTypeKind.Int16, oData);
           String paramDurationString = valueAsString(paramDuration, EdmPrimitiveTypeKind.Duration, oData);
 
-          return new Property(null, name, ValueType.COLLECTION_PRIMITIVE, Arrays.asList(new String[] {
-              name + " int16 value: " + param16String,
-              name + " duration value: " + paramDurationString
-          }));
+          return new Property(null, name, ValueType.COLLECTION_PRIMITIVE, Arrays.asList(
+                  name + " int16 value: " + param16String,
+                  name + " duration value: " + paramDurationString));
         } catch(EdmPrimitiveTypeException e) {
           throw new DataProviderException("EdmPrimitiveTypeException", e);
         }