killbill-memoizeit

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/GatewayNotificationJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/GatewayNotificationJson.java
index 33cfa31..b8ef5ca 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/GatewayNotificationJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/GatewayNotificationJson.java
@@ -37,14 +37,14 @@ public class GatewayNotificationJson extends JsonBase {
     private final Integer status;
     private final String entity;
     private final Map<String, List<String>> headers;
-    private final Map<String, String> properties;
+    private final Map<String, Object> properties;
 
     @JsonCreator
     public GatewayNotificationJson(@JsonProperty("kbPaymentId") final String kbPaymentId,
                                    @JsonProperty("status") final Integer status,
                                    @JsonProperty("entity") final String entity,
                                    @JsonProperty("headers") final Map<String, List<String>> headers,
-                                   @JsonProperty("properties") final Map<String, String> properties) {
+                                   @JsonProperty("properties") final Map<String, Object> properties) {
         this.kbPaymentId = kbPaymentId;
         this.status = status;
         this.entity = entity;
@@ -94,7 +94,7 @@ public class GatewayNotificationJson extends JsonBase {
         return headers;
     }
 
-    public Map<String, String> getProperties() {
+    public Map<String, Object> getProperties() {
         return properties;
     }
 

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/HostedPaymentPageFormDescriptorJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/HostedPaymentPageFormDescriptorJson.java
index 311b475..24b292c 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/HostedPaymentPageFormDescriptorJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/HostedPaymentPageFormDescriptorJson.java
@@ -31,15 +31,15 @@ public class HostedPaymentPageFormDescriptorJson extends JsonBase {
     private final String kbAccountId;
     private final String formMethod;
     private final String formUrl;
-    private final Map<String, String> formFields;
-    private final Map<String, String> properties;
+    private final Map<String, Object> formFields;
+    private final Map<String, Object> properties;
 
     @JsonCreator
     public HostedPaymentPageFormDescriptorJson(@JsonProperty("kbAccountId") final String kbAccountId,
                                                @JsonProperty("formMethod") final String formMethod,
                                                @JsonProperty("formUrl") final String formUrl,
-                                               @JsonProperty("formFields") final Map<String, String> formFields,
-                                               @JsonProperty("properties") final Map<String, String> properties) {
+                                               @JsonProperty("formFields") final Map<String, Object> formFields,
+                                               @JsonProperty("properties") final Map<String, Object> properties) {
         this.kbAccountId = kbAccountId;
         this.formMethod = formMethod;
         this.formUrl = formUrl;
@@ -67,11 +67,11 @@ public class HostedPaymentPageFormDescriptorJson extends JsonBase {
         return formUrl;
     }
 
-    public Map<String, String> getFormFields() {
+    public Map<String, Object> getFormFields() {
         return formFields;
     }
 
-    public Map<String, String> getProperties() {
+    public Map<String, Object> getProperties() {
         return properties;
     }
 

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/JsonBase.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/JsonBase.java
index a92f6e9..936cb71 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/JsonBase.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/JsonBase.java
@@ -74,11 +74,11 @@ public abstract class JsonBase {
         return properties;
     }
 
-    protected Map<String, String> propertiesToMap(final Iterable<PluginProperty> properties) {
-        final Map<String, String> propertiesMap = new HashMap<String, String>();
+    protected Map<String, Object> propertiesToMap(final Iterable<PluginProperty> properties) {
+        final Map<String, Object> propertiesMap = new HashMap<String, Object>();
         for (final PluginProperty pluginProperty : properties) {
             if (pluginProperty.getValue() != null) {
-                propertiesMap.put(pluginProperty.getKey(), pluginProperty.getValue().toString());
+                propertiesMap.put(pluginProperty.getKey(), pluginProperty.getValue());
             }
         }
         return propertiesMap;

diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPayment.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPayment.java
index cdf5c3d..9c418c8 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPayment.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPayment.java
@@ -241,17 +241,9 @@ public class TestPayment extends TestJaxrsBase {
         mockPaymentProviderPlugin.makeNextPaymentFailWithError();
         createAccountWithPMBundleAndSubscriptionAndWaitForFirstInvoice();
 
-        HashMultimap<String, String> queryParams = HashMultimap.create();
-        queryParams.put("withAttempts", "true");
-        RequestOptions inputOptions = RequestOptions.builder()
-                                                    .withCreatedBy(createdBy)
-                                                    .withReason(reason)
-                                                    .withComment(comment)
-                                                    .withQueryParams(queryParams).build();
-
-        Payments payments = killBillClient.searchPayments("", 0L, 100L, AuditLevel.NONE, inputOptions);
+        Payments payments = killBillClient.searchPayments("", 0L, 100L, AuditLevel.NONE, requestOptions);
         Assert.assertNotNull(payments.get(0));
-        Payment payment = killBillClient.getPayment(payments.get(0).getPaymentId(), inputOptions);
+        Payment payment = killBillClient.getPayment(payments.get(0).getPaymentId(), false, true, ImmutableMap.<String, String>of(), AuditLevel.NONE, requestOptions);
 
         Assert.assertNotNull(payment.getPaymentAttempts());
         Assert.assertEquals(payment.getPaymentAttempts().get(0).getStateName(), "RETRIED");