commit 7d449680c5527ead02653b9a505e96d7bd9fefb5
author David Pursehouse <david.pursehouse@sonymobile.com> Fri May 22 11:08:15 2015 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> Fri May 22 14:46:15 2015 +0000
tree dafa00e87fc1e6ce4877f240ec2d89834e1b1a82
parent 7ba73555bc97f5f93f9f1df83de7327c7fc21e91

AMQProperties: Fix IllegalArgumentException when setting properties

IllegalArgumentException is raised:

  Attempt to get java.lang.Integer field "<name>" with illegal data
  type conversion to int

Instead of calling getInt() and friends, use the valueOf() methods on
the boxing classes with toString() on the value returned from the basic
get() method.

Change-Id: Iba95aba743bb76eeef5a193950de4f1b1f7c3e71

src/main/java/com/googlesource/gerrit/plugins/rabbitmq/config/AMQProperties.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/config/AMQProperties.java b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/config/AMQProperties.java
index f38a9cc..ed892a0 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/config/AMQProperties.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/config/AMQProperties.java
@@ -47,23 +47,27 @@
         if (f.isAnnotationPresent(MessageHeader.class)) {
           MessageHeader mh = f.getAnnotation(MessageHeader.class);
           try {
+            Object value = f.get(section);
+            if (value == null) {
+              continue;
+            }
             switch(f.getType().getSimpleName()) {
               case "String":
-                headers.put(mh.value(), f.get(section).toString());
+                headers.put(mh.value(), value.toString());
                 break;
               case "Integer":
-                headers.put(mh.value(), f.getInt(section));
+                headers.put(mh.value(), Integer.valueOf(value.toString()));
                 break;
               case "Long":
-                headers.put(mh.value(), f.getLong(section));
+                headers.put(mh.value(), Long.valueOf(value.toString()));
                 break;
               case "Boolean":
-                headers.put(mh.value(), f.getBoolean(section));
+                headers.put(mh.value(), Boolean.valueOf(value.toString()));
                 break;
               default:
                 break;
             }
-          } catch (IllegalAccessException ex) {
+          } catch (IllegalAccessException | IllegalArgumentException ex) {
             LOGGER.warn("Cannot access field {}. Cause: {}",
                 f.getName(), ex.getMessage());
           }