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/03/05 21:21:21 UTC
olingo-odata2 git commit: [OLINGO-410] Ordered
FunctionImportParameter-Names as in EDM
Repository: olingo-odata2
Updated Branches:
refs/heads/master ba4c02a00 -> 956cb60fe
[OLINGO-410] Ordered FunctionImportParameter-Names as in EDM
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/956cb60f
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/956cb60f
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/956cb60f
Branch: refs/heads/master
Commit: 956cb60fecf2fc43d8f6b2853c5215c5c4d74972
Parents: ba4c02a
Author: Michael Bolz <mi...@apache.org>
Authored: Mon Sep 1 09:08:04 2014 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Thu Mar 5 21:17:45 2015 +0100
----------------------------------------------------------------------
.../edm/provider/EdmFunctionImportImplProv.java | 26 +++++++++-----------
.../provider/EdmFunctionImportImplProvTest.java | 25 +++++++++++++++++++
2 files changed, 37 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/956cb60f/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProv.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProv.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProv.java
index 76346dc..29f0f20 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProv.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProv.java
@@ -18,12 +18,6 @@
******************************************************************************/
package org.apache.olingo.odata2.core.edm.provider;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
import org.apache.olingo.odata2.api.edm.EdmAnnotatable;
import org.apache.olingo.odata2.api.edm.EdmAnnotations;
@@ -38,6 +32,11 @@ import org.apache.olingo.odata2.api.edm.provider.FunctionImport;
import org.apache.olingo.odata2.api.edm.provider.FunctionImportParameter;
import org.apache.olingo.odata2.api.edm.provider.ReturnType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
*
*/
@@ -67,10 +66,8 @@ public class EdmFunctionImportImplProv extends EdmNamedImplProv implements EdmFu
List<FunctionImportParameter> parameters = functionImport.getParameters();
if (parameters != null) {
- FunctionImportParameter functionImportParameter;
- for (Iterator<FunctionImportParameter> iterator = parameters.iterator(); iterator.hasNext();) {
- functionImportParameter = iterator.next();
- this.parameters.put(functionImportParameter.getName(), functionImportParameter);
+ for (FunctionImportParameter parameter : parameters) {
+ this.parameters.put(parameter.getName(), parameter);
}
}
}
@@ -102,10 +99,11 @@ public class EdmFunctionImportImplProv extends EdmNamedImplProv implements EdmFu
if (parametersList == null) {
parametersList = new ArrayList<String>();
- Set<String> keySet = parameters.keySet();
- Iterator<String> iterator = keySet.iterator();
- while (iterator.hasNext()) {
- parametersList.add(iterator.next());
+ List<FunctionImportParameter> parameters = functionImport.getParameters();
+ if(parameters != null) {
+ for (FunctionImportParameter parameter : parameters) {
+ parametersList.add(parameter.getName());
+ }
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/956cb60f/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProvTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProvTest.java
index 84cab5e..ec1be65 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProvTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProvTest.java
@@ -144,6 +144,31 @@ public class EdmFunctionImportImplProvTest extends BaseTest {
assertEquals("fooParameter3", parameter.getName());
}
+
+ @Test
+ public void parametersAreSorted() throws Exception {
+ List<String> parameterNames = edmFunctionImport.getParameterNames();
+ assertEquals("fooParameter1", parameterNames.get(0));
+ assertEquals("fooParameter2", parameterNames.get(1));
+ assertEquals("fooParameter3", parameterNames.get(2));
+
+ EdmParameter parameter = edmFunctionImport.getParameter("fooParameter1");
+ assertNotNull(parameter);
+ assertEquals("fooParameter1", parameter.getName());
+
+ parameter = edmFunctionImport.getParameter("fooParameter1");
+ assertNotNull(parameter);
+ assertEquals("fooParameter1", parameter.getName());
+
+ parameter = edmFunctionImport.getParameter("fooParameter2");
+ assertNotNull(parameter);
+ assertEquals("fooParameter2", parameter.getName());
+
+ parameter = edmFunctionImport.getParameter("fooParameter3");
+ assertNotNull(parameter);
+ assertEquals("fooParameter3", parameter.getName());
+ }
+
@Test
public void parameterNotExisting() throws Exception {
assertNotNull(edmFunctionImportWithoutParameters.getParameterNames());