diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/InvoiceResource.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/InvoiceResource.java
index c957c86..85f8831 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/InvoiceResource.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/InvoiceResource.java
@@ -16,13 +16,6 @@
package com.ning.billing.jaxrs.resources;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.UUID;
-
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
@@ -35,12 +28,14 @@ import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.UUID;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
import com.google.inject.Inject;
@@ -64,12 +59,11 @@ import com.ning.billing.util.api.CustomFieldUserApi;
import com.ning.billing.util.api.TagUserApi;
import com.ning.billing.util.dao.ObjectType;
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+
@Path(JaxrsResource.INVOICES_PATH)
public class InvoiceResource extends JaxRsResourceBase {
-
- private static final Logger log = LoggerFactory.getLogger(InvoiceResource.class);
-
private static final String ID_PARAM_NAME = "invoiceId";
private static final String CUSTOM_FIELD_URI = JaxrsResource.CUSTOM_FIELDS + "/{" + ID_PARAM_NAME + ":" + UUID_PATTERN + "}";
private static final String TAG_URI = JaxrsResource.TAGS + "/{" + ID_PARAM_NAME + ":" + UUID_PATTERN + "}";
@@ -84,13 +78,13 @@ public class InvoiceResource extends JaxRsResourceBase {
@Inject
public InvoiceResource(final AccountUserApi accountApi,
- final InvoiceUserApi invoiceApi,
- final PaymentApi paymentApi,
- final Context context,
- final JaxrsUriBuilder uriBuilder,
- final TagUserApi tagUserApi,
- final TagHelper tagHelper,
- final CustomFieldUserApi customFieldUserApi) {
+ final InvoiceUserApi invoiceApi,
+ final PaymentApi paymentApi,
+ final Context context,
+ final JaxrsUriBuilder uriBuilder,
+ final TagUserApi tagUserApi,
+ final TagHelper tagHelper,
+ final CustomFieldUserApi customFieldUserApi) {
super(uriBuilder, tagUserApi, tagHelper, customFieldUserApi);
this.accountApi = accountApi;
this.invoiceApi = invoiceApi;
@@ -106,9 +100,9 @@ public class InvoiceResource extends JaxRsResourceBase {
Preconditions.checkNotNull(accountId, "% query parameter must be specified", QUERY_ACCOUNT_ID);
accountApi.getAccountById(UUID.fromString(accountId));
- List<Invoice> invoices = invoiceApi.getInvoicesByAccount(UUID.fromString(accountId));
- List<InvoiceJsonSimple> result = new LinkedList<InvoiceJsonSimple>();
- for (Invoice cur : invoices) {
+ final List<Invoice> invoices = invoiceApi.getInvoicesByAccount(UUID.fromString(accountId));
+ final List<InvoiceJsonSimple> result = new LinkedList<InvoiceJsonSimple>();
+ for (final Invoice cur : invoices) {
result.add(new InvoiceJsonSimple(cur));
}
return Response.status(Status.OK).entity(result).build();
@@ -122,13 +116,12 @@ public class InvoiceResource extends JaxRsResourceBase {
@GET
@Path("/{invoiceId:\\w+-\\w+-\\w+-\\w+-\\w+}")
@Produces(APPLICATION_JSON)
- public Response getInvoice(@PathParam("invoiceId") String invoiceId, @QueryParam("withItems") @DefaultValue("false") boolean withItems) {
- Invoice invoice = invoiceApi.getInvoice(UUID.fromString(invoiceId));
+ public Response getInvoice(@PathParam("invoiceId") final String invoiceId, @QueryParam("withItems") @DefaultValue("false") final boolean withItems) {
+ final Invoice invoice = invoiceApi.getInvoice(UUID.fromString(invoiceId));
if (invoice == null) {
return Response.status(Status.NO_CONTENT).build();
- }
- else {
- InvoiceJsonSimple json = withItems ? new InvoiceJsonWithItems(invoice) : new InvoiceJsonSimple(invoice);
+ } else {
+ final InvoiceJsonSimple json = withItems ? new InvoiceJsonWithItems(invoice) : new InvoiceJsonSimple(invoice);
return Response.status(Status.OK).entity(json).build();
}
}
@@ -137,27 +130,26 @@ public class InvoiceResource extends JaxRsResourceBase {
@Consumes(APPLICATION_JSON)
@Produces(APPLICATION_JSON)
public Response createFutureInvoice(final InvoiceJsonSimple invoice,
- @QueryParam(QUERY_ACCOUNT_ID) final String accountId,
- @QueryParam(QUERY_TARGET_DATE) final String targetDate,
- @QueryParam(QUERY_DRY_RUN) @DefaultValue("false") final Boolean dryRun,
- @HeaderParam(HDR_CREATED_BY) final String createdBy,
- @HeaderParam(HDR_REASON) final String reason,
- @HeaderParam(HDR_COMMENT) final String comment) {
-
+ @QueryParam(QUERY_ACCOUNT_ID) final String accountId,
+ @QueryParam(QUERY_TARGET_DATE) final String targetDate,
+ @QueryParam(QUERY_DRY_RUN) @DefaultValue("false") final Boolean dryRun,
+ @HeaderParam(HDR_CREATED_BY) final String createdBy,
+ @HeaderParam(HDR_REASON) final String reason,
+ @HeaderParam(HDR_COMMENT) final String comment) {
try {
Preconditions.checkNotNull(accountId, "% needs to be specified", QUERY_ACCOUNT_ID);
Preconditions.checkNotNull(targetDate, "% needs to be specified", QUERY_TARGET_DATE);
- DateTime inputDate = (targetDate != null) ? DATE_TIME_FORMATTER.parseDateTime(targetDate) : null;
+ final DateTime inputDate = (targetDate != null) ? DATE_TIME_FORMATTER.parseDateTime(targetDate) : null;
accountApi.getAccountById(UUID.fromString(accountId));
- Invoice generatedInvoice = invoiceApi.triggerInvoiceGeneration(UUID.fromString(accountId), inputDate, dryRun.booleanValue(),
- context.createContext(createdBy, reason, comment));
+ final Invoice generatedInvoice = invoiceApi.triggerInvoiceGeneration(UUID.fromString(accountId), inputDate, dryRun,
+ context.createContext(createdBy, reason, comment));
if (dryRun) {
return Response.status(Status.OK).entity(new InvoiceJsonSimple(generatedInvoice)).build();
} else {
- return uriBuilder.buildResponse(InvoiceResource.class, "getInvoice", generatedInvoice.getId());
+ return uriBuilder.buildResponse(InvoiceResource.class, "getInvoice", generatedInvoice.getId());
}
} catch (AccountApiException e) {
return Response.status(Status.BAD_REQUEST).entity(e.getMessage()).build();
@@ -171,16 +163,16 @@ public class InvoiceResource extends JaxRsResourceBase {
@GET
@Path("/{invoiceId:\\w+-\\w+-\\w+-\\w+-\\w+}/" + PAYMENTS)
@Produces(APPLICATION_JSON)
- public Response getPayments(@PathParam("invoiceId") String invoiceId) {
+ public Response getPayments(@PathParam("invoiceId") final String invoiceId) {
try {
- List<Payment> payments = paymentApi.getInvoicePayments(UUID.fromString(invoiceId));
- List<PaymentJsonSimple> result = new ArrayList<PaymentJsonSimple>(payments.size());
- for (Payment cur : payments) {
+ final List<Payment> payments = paymentApi.getInvoicePayments(UUID.fromString(invoiceId));
+ final List<PaymentJsonSimple> result = new ArrayList<PaymentJsonSimple>(payments.size());
+ for (final Payment cur : payments) {
result.add(new PaymentJsonSimple(cur));
}
return Response.status(Status.OK).entity(result).build();
} catch (PaymentApiException e) {
- return Response.status(Status.NOT_FOUND).build();
+ return Response.status(Status.NOT_FOUND).build();
}
}
@@ -188,16 +180,15 @@ public class InvoiceResource extends JaxRsResourceBase {
@Produces(APPLICATION_JSON)
@Consumes(APPLICATION_JSON)
@Path("/{invoiceId:\\w+-\\w+-\\w+-\\w+-\\w+}/" + PAYMENTS)
- public Response createInstantPayment(PaymentJsonSimple payment,
- @QueryParam(QUERY_PAYMENT_EXTERNAL) @DefaultValue("false") final Boolean externalPayment,
- @HeaderParam(HDR_CREATED_BY) final String createdBy,
- @HeaderParam(HDR_REASON) final String reason,
- @HeaderParam(HDR_COMMENT) final String comment) {
+ public Response createInstantPayment(final PaymentJsonSimple payment,
+ @QueryParam(QUERY_PAYMENT_EXTERNAL) @DefaultValue("false") final Boolean externalPayment,
+ @HeaderParam(HDR_CREATED_BY) final String createdBy,
+ @HeaderParam(HDR_REASON) final String reason,
+ @HeaderParam(HDR_COMMENT) final String comment) {
try {
- Account account = accountApi.getAccountById(UUID.fromString(payment.getAccountId()));
+ final Account account = accountApi.getAccountById(UUID.fromString(payment.getAccountId()));
paymentApi.createPayment(account, UUID.fromString(payment.getInvoiceId()), null, context.createContext(createdBy, reason, comment));
- Response response = uriBuilder.buildResponse(InvoiceResource.class, "getPayments", payment.getInvoiceId());
- return response;
+ return uriBuilder.buildResponse(InvoiceResource.class, "getPayments", payment.getInvoiceId());
} catch (PaymentApiException e) {
final String error = String.format("Failed to create payment %s", e.getMessage());
return Response.status(Status.BAD_REQUEST).entity(error).build();
@@ -221,12 +212,12 @@ public class InvoiceResource extends JaxRsResourceBase {
@Consumes(APPLICATION_JSON)
@Produces(APPLICATION_JSON)
public Response createCustomFields(@PathParam(ID_PARAM_NAME) final String id,
- final List<CustomFieldJson> customFields,
- @HeaderParam(HDR_CREATED_BY) final String createdBy,
- @HeaderParam(HDR_REASON) final String reason,
- @HeaderParam(HDR_COMMENT) final String comment) {
+ final List<CustomFieldJson> customFields,
+ @HeaderParam(HDR_CREATED_BY) final String createdBy,
+ @HeaderParam(HDR_REASON) final String reason,
+ @HeaderParam(HDR_COMMENT) final String comment) {
return super.createCustomFields(UUID.fromString(id), customFields,
- context.createContext(createdBy, reason, comment));
+ context.createContext(createdBy, reason, comment));
}
@DELETE
@@ -234,18 +225,18 @@ public class InvoiceResource extends JaxRsResourceBase {
@Consumes(APPLICATION_JSON)
@Produces(APPLICATION_JSON)
public Response deleteCustomFields(@PathParam(ID_PARAM_NAME) final String id,
- @QueryParam(QUERY_CUSTOM_FIELDS) final String customFieldList,
- @HeaderParam(HDR_CREATED_BY) final String createdBy,
- @HeaderParam(HDR_REASON) final String reason,
- @HeaderParam(HDR_COMMENT) final String comment) {
+ @QueryParam(QUERY_CUSTOM_FIELDS) final String customFieldList,
+ @HeaderParam(HDR_CREATED_BY) final String createdBy,
+ @HeaderParam(HDR_REASON) final String reason,
+ @HeaderParam(HDR_COMMENT) final String comment) {
return super.deleteCustomFields(UUID.fromString(id), customFieldList,
- context.createContext(createdBy, reason, comment));
+ context.createContext(createdBy, reason, comment));
}
@GET
@Path(TAG_URI)
@Produces(APPLICATION_JSON)
- public Response getTags(@PathParam(ID_PARAM_NAME) String id) {
+ public Response getTags(@PathParam(ID_PARAM_NAME) final String id) {
return super.getTags(UUID.fromString(id));
}
@@ -254,10 +245,10 @@ public class InvoiceResource extends JaxRsResourceBase {
@Consumes(APPLICATION_JSON)
@Produces(APPLICATION_JSON)
public Response createTags(@PathParam(ID_PARAM_NAME) final String id,
- @QueryParam(QUERY_TAGS) final String tagList,
- @HeaderParam(HDR_CREATED_BY) final String createdBy,
- @HeaderParam(HDR_REASON) final String reason,
- @HeaderParam(HDR_COMMENT) final String comment) {
+ @QueryParam(QUERY_TAGS) final String tagList,
+ @HeaderParam(HDR_CREATED_BY) final String createdBy,
+ @HeaderParam(HDR_REASON) final String reason,
+ @HeaderParam(HDR_COMMENT) final String comment) {
return super.createTags(UUID.fromString(id), tagList,
context.createContext(createdBy, reason, comment));
}
@@ -267,10 +258,10 @@ public class InvoiceResource extends JaxRsResourceBase {
@Consumes(APPLICATION_JSON)
@Produces(APPLICATION_JSON)
public Response deleteTags(@PathParam(ID_PARAM_NAME) final String id,
- @QueryParam(QUERY_TAGS) final String tagList,
- @HeaderParam(HDR_CREATED_BY) final String createdBy,
- @HeaderParam(HDR_REASON) final String reason,
- @HeaderParam(HDR_COMMENT) final String comment) {
+ @QueryParam(QUERY_TAGS) final String tagList,
+ @HeaderParam(HDR_CREATED_BY) final String createdBy,
+ @HeaderParam(HDR_REASON) final String reason,
+ @HeaderParam(HDR_COMMENT) final String comment) {
return super.deleteTags(UUID.fromString(id), tagList,
context.createContext(createdBy, reason, comment));
