killbill-memoizeit

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxrsResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxrsResource.java
index 4c5dabb..d29d527 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxrsResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxrsResource.java
@@ -223,4 +223,6 @@ public interface JaxrsResource {
 
     public static final String UPCOMING_INVOICE_TARGET_DATE = "upcomingInvoiceTargetDate";
 
+    public static final String COMBO = "combo";
+
 }

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/PaymentResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/PaymentResource.java
index 11c37c0..ea98904 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/PaymentResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/PaymentResource.java
@@ -274,6 +274,7 @@ public class PaymentResource extends JaxRsResourceBase {
     @POST
     @Consumes(APPLICATION_JSON)
     @Produces(APPLICATION_JSON)
+    @Path("/" + COMBO)
     @ApiOperation(value = "Combo api to create a new payment transaction on a existing (or not) account ")
     @ApiResponses(value = {@ApiResponse(code = 400, message = "Invalid data for Account or PaymentMethod")})
     public Response createPayment(final ComboPaymentTransactionJson json,

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 a885e76..7098b96 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
@@ -159,7 +159,7 @@ public class TestPayment extends TestJaxrsBase {
         Assert.assertEquals(paymentsForAccount.get(PaymentNb - 1), Payment);
     }
 
-    private void verifyComboPayment(final Payment Payment,
+    private void verifyComboPayment(final Payment payment,
                                     final String paymentExternalKey,
                                     final BigDecimal authAmount,
                                     final BigDecimal capturedAmount,
@@ -167,17 +167,16 @@ public class TestPayment extends TestJaxrsBase {
                                     final int nbTransactions,
                                     final int PaymentNb) throws KillBillClientException {
 
-        Assert.assertNotNull(Payment.getPaymentId());
-        Assert.assertNotNull(Payment.getPaymentNumber());
-        Assert.assertEquals(Payment.getPaymentExternalKey(), paymentExternalKey);
-        Assert.assertEquals(Payment.getAuthAmount().compareTo(authAmount), 0);
-        Assert.assertEquals(Payment.getCapturedAmount().compareTo(capturedAmount), 0);
-        Assert.assertEquals(Payment.getRefundedAmount().compareTo(refundedAmount), 0);
-        Assert.assertEquals(Payment.getTransactions().size(), nbTransactions);
+        Assert.assertNotNull(payment.getPaymentNumber());
+        Assert.assertEquals(payment.getPaymentExternalKey(), paymentExternalKey);
+        Assert.assertEquals(payment.getAuthAmount().compareTo(authAmount), 0);
+        Assert.assertEquals(payment.getCapturedAmount().compareTo(capturedAmount), 0);
+        Assert.assertEquals(payment.getRefundedAmount().compareTo(refundedAmount), 0);
+        Assert.assertEquals(payment.getTransactions().size(), nbTransactions);
 
         final Payments Payments = killBillClient.getPayments();
         Assert.assertEquals(Payments.size(), PaymentNb);
-        Assert.assertEquals(Payments.get(PaymentNb - 1), Payment);
+        Assert.assertEquals(Payments.get(PaymentNb - 1), payment);
 
     }