You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dj...@apache.org on 2016/04/04 23:19:15 UTC
[1/2] incubator-quarks git commit: QUARKS-115 Use Java 7
getParameterTypes
Repository: incubator-quarks
Updated Branches:
refs/heads/master e6d978fb7 -> f9af9ddfd
QUARKS-115 Use Java 7 getParameterTypes
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/5535a0e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/5535a0e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/5535a0e0
Branch: refs/heads/master
Commit: 5535a0e0d72e3942cd539c03c30fa46417bd9b09
Parents: 185d018
Author: Dan Debrunner <dj...@debrunners.com>
Authored: Mon Apr 4 13:47:27 2016 -0700
Committer: Dan Debrunner <dj...@debrunners.com>
Committed: Mon Apr 4 13:47:27 2016 -0700
----------------------------------------------------------------------
.../runtime/jsoncontrol/JsonControlService.java | 26 ++++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/5535a0e0/runtime/jsoncontrol/src/main/java/quarks/runtime/jsoncontrol/JsonControlService.java
----------------------------------------------------------------------
diff --git a/runtime/jsoncontrol/src/main/java/quarks/runtime/jsoncontrol/JsonControlService.java b/runtime/jsoncontrol/src/main/java/quarks/runtime/jsoncontrol/JsonControlService.java
index 72849d9..c69bd12 100644
--- a/runtime/jsoncontrol/src/main/java/quarks/runtime/jsoncontrol/JsonControlService.java
+++ b/runtime/jsoncontrol/src/main/java/quarks/runtime/jsoncontrol/JsonControlService.java
@@ -179,37 +179,37 @@ public class JsonControlService implements ControlService {
@SuppressWarnings({ "unchecked", "rawtypes" })
private Object[] getArguments(Method method, JsonArray args) {
- final Parameter[] params = method.getParameters();
+ final Class<?>[] paramTypes = method.getParameterTypes();
- if (params.length == 0 || args == null || args.size() == 0)
+ if (paramTypes.length == 0 || args == null || args.size() == 0)
return null;
- assert params.length == args.size();
+ assert paramTypes.length == args.size();
- Object[] oargs = new Object[params.length];
+ Object[] oargs = new Object[paramTypes.length];
for (int i = 0; i < oargs.length; i++) {
- final Parameter pt = params[i];
+ final Class<?> pt = paramTypes[i];
final JsonElement arg = args.get(i);
Object jarg;
- if (String.class == pt.getType()) {
+ if (String.class == pt) {
if (arg instanceof JsonObject)
jarg = gson.toJson(arg);
else
jarg = arg.getAsString();
}
- else if (Integer.TYPE == pt.getType())
+ else if (Integer.TYPE == pt)
jarg = arg.getAsInt();
- else if (Long.TYPE == pt.getType())
+ else if (Long.TYPE == pt)
jarg = arg.getAsLong();
- else if (Double.TYPE == pt.getType())
+ else if (Double.TYPE == pt)
jarg = arg.getAsDouble();
- else if (Boolean.TYPE == pt.getType())
+ else if (Boolean.TYPE == pt)
jarg = arg.getAsBoolean();
- else if (pt.getType().isEnum())
- jarg = Enum.valueOf((Class<Enum>) pt.getType(), arg.getAsString());
+ else if (pt.isEnum())
+ jarg = Enum.valueOf((Class<Enum>) pt, arg.getAsString());
else
- throw new UnsupportedOperationException(pt.getType().getTypeName());
+ throw new UnsupportedOperationException(pt.getName());
oargs[i] = jarg;
}
[2/2] incubator-quarks git commit: Merge branch 'pr-71'
Posted by dj...@apache.org.
Merge branch 'pr-71'
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/f9af9ddf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/f9af9ddf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/f9af9ddf
Branch: refs/heads/master
Commit: f9af9ddfd553c2993f342446cac274da91825fbe
Parents: e6d978f 5535a0e
Author: Daniel J. Debrunner <de...@us.ibm.com>
Authored: Mon Apr 4 14:15:40 2016 -0700
Committer: Daniel J. Debrunner <de...@us.ibm.com>
Committed: Mon Apr 4 14:15:40 2016 -0700
----------------------------------------------------------------------
.../runtime/jsoncontrol/JsonControlService.java | 26 ++++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------