Details
diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/mappers/TagApiExceptionMapper.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/mappers/TagApiExceptionMapper.java
index 22ae8b0..61c963c 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/mappers/TagApiExceptionMapper.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/mappers/TagApiExceptionMapper.java
@@ -16,17 +16,30 @@
package com.ning.billing.jaxrs.mappers;
+import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;
+import com.ning.billing.ErrorCode;
import com.ning.billing.util.api.TagApiException;
@Provider
public class TagApiExceptionMapper extends ExceptionMapperBase implements ExceptionMapper<TagApiException> {
+ private final UriInfo uriInfo;
+
+ public TagApiExceptionMapper(@Context final UriInfo uriInfo) {
+ this.uriInfo = uriInfo;
+ }
+
@Override
public Response toResponse(final TagApiException exception) {
- return null;
+ if (exception.getCode() == ErrorCode.TAG_DOES_NOT_EXIST.getCode()) {
+ return buildNotFoundResponse(exception, uriInfo);
+ } else {
+ return buildBadRequestResponse(exception, uriInfo);
+ }
}
}
diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AccountResource.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AccountResource.java
index 1c260ec..25eaf57 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AccountResource.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AccountResource.java
@@ -69,6 +69,8 @@ import com.ning.billing.payment.api.PaymentApiException;
import com.ning.billing.payment.api.PaymentMethod;
import com.ning.billing.payment.api.Refund;
import com.ning.billing.util.api.CustomFieldUserApi;
+import com.ning.billing.util.api.TagApiException;
+import com.ning.billing.util.api.TagDefinitionApiException;
import com.ning.billing.util.api.TagUserApi;
import com.ning.billing.util.dao.ObjectType;
@@ -375,9 +377,8 @@ public class AccountResource extends JaxRsResourceBase {
final List<CustomFieldJson> customFields,
@HeaderParam(HDR_CREATED_BY) final String createdBy,
@HeaderParam(HDR_REASON) final String reason,
- @HeaderParam(HDR_COMMENT) final String comment,
- @javax.ws.rs.core.Context final UriInfo uriInfo) {
- return super.createCustomFields(UUID.fromString(id), customFields, uriInfo,
+ @HeaderParam(HDR_COMMENT) final String comment) {
+ return super.createCustomFields(UUID.fromString(id), customFields,
context.createContext(createdBy, reason, comment));
}
@@ -389,9 +390,8 @@ public class AccountResource extends JaxRsResourceBase {
@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,
- @javax.ws.rs.core.Context final UriInfo uriInfo) {
- return super.deleteCustomFields(UUID.fromString(id), customFieldList, uriInfo,
+ @HeaderParam(HDR_COMMENT) final String comment) {
+ return super.deleteCustomFields(UUID.fromString(id), customFieldList,
context.createContext(createdBy, reason, comment));
}
@@ -402,7 +402,7 @@ public class AccountResource extends JaxRsResourceBase {
@GET
@Path("/{accountId:" + UUID_PATTERN + "}/" + TAGS)
@Produces(APPLICATION_JSON)
- public Response getTags(@PathParam(ID_PARAM_NAME) final String id) {
+ public Response getTags(@PathParam(ID_PARAM_NAME) final String id) throws TagDefinitionApiException {
return super.getTags(UUID.fromString(id));
}
@@ -414,7 +414,7 @@ public class AccountResource extends JaxRsResourceBase {
@HeaderParam(HDR_CREATED_BY) final String createdBy,
@HeaderParam(HDR_REASON) final String reason,
@HeaderParam(HDR_COMMENT) final String comment,
- @javax.ws.rs.core.Context final UriInfo uriInfo) {
+ @javax.ws.rs.core.Context final UriInfo uriInfo) throws TagApiException {
return super.createTags(UUID.fromString(id), tagList, uriInfo,
context.createContext(createdBy, reason, comment));
}
@@ -427,9 +427,8 @@ public class AccountResource extends JaxRsResourceBase {
@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,
- @javax.ws.rs.core.Context final UriInfo uriInfo) {
- return super.deleteTags(UUID.fromString(id), tagList, uriInfo,
+ @HeaderParam(HDR_COMMENT) final String comment) throws TagApiException {
+ return super.deleteTags(UUID.fromString(id), tagList,
context.createContext(createdBy, reason, comment));
}
@@ -459,8 +458,7 @@ public class AccountResource extends JaxRsResourceBase {
@PathParam(ID_PARAM_NAME) final String id,
@HeaderParam(HDR_CREATED_BY) final String createdBy,
@HeaderParam(HDR_REASON) final String reason,
- @HeaderParam(HDR_COMMENT) final String comment,
- @javax.ws.rs.core.Context final UriInfo uriInfo) throws AccountApiException {
+ @HeaderParam(HDR_COMMENT) final String comment) throws AccountApiException {
final UUID accountId = UUID.fromString(id);
// Make sure the account exist or we will confuse the history and auditing code
diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/BundleResource.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/BundleResource.java
index c12e09f..44e5e77 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/BundleResource.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/BundleResource.java
@@ -43,6 +43,8 @@ import com.ning.billing.jaxrs.json.SubscriptionJsonNoEvents;
import com.ning.billing.jaxrs.util.Context;
import com.ning.billing.jaxrs.util.JaxrsUriBuilder;
import com.ning.billing.util.api.CustomFieldUserApi;
+import com.ning.billing.util.api.TagApiException;
+import com.ning.billing.util.api.TagDefinitionApiException;
import com.ning.billing.util.api.TagUserApi;
import com.ning.billing.util.dao.ObjectType;
@@ -139,9 +141,8 @@ public class BundleResource extends JaxRsResourceBase {
final List<CustomFieldJson> customFields,
@HeaderParam(HDR_CREATED_BY) final String createdBy,
@HeaderParam(HDR_REASON) final String reason,
- @HeaderParam(HDR_COMMENT) final String comment,
- @javax.ws.rs.core.Context final UriInfo uriInfo) {
- return super.createCustomFields(UUID.fromString(id), customFields, uriInfo,
+ @HeaderParam(HDR_COMMENT) final String comment) {
+ return super.createCustomFields(UUID.fromString(id), customFields,
context.createContext(createdBy, reason, comment));
}
@@ -153,16 +154,15 @@ public class BundleResource extends JaxRsResourceBase {
@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,
- @javax.ws.rs.core.Context final UriInfo uriInfo) {
- return super.deleteCustomFields(UUID.fromString(id), customFieldList, uriInfo,
+ @HeaderParam(HDR_COMMENT) final String comment) {
+ return super.deleteCustomFields(UUID.fromString(id), customFieldList,
context.createContext(createdBy, reason, comment));
}
@GET
@Path("/{bundleId:" + UUID_PATTERN + "}/" + TAG_URI)
@Produces(APPLICATION_JSON)
- public Response getTags(@PathParam(ID_PARAM_NAME) final String id) {
+ public Response getTags(@PathParam(ID_PARAM_NAME) final String id) throws TagDefinitionApiException {
return super.getTags(UUID.fromString(id));
}
@@ -175,7 +175,7 @@ public class BundleResource extends JaxRsResourceBase {
@HeaderParam(HDR_CREATED_BY) final String createdBy,
@HeaderParam(HDR_REASON) final String reason,
@HeaderParam(HDR_COMMENT) final String comment,
- @javax.ws.rs.core.Context final UriInfo uriInfo) {
+ @javax.ws.rs.core.Context final UriInfo uriInfo) throws TagApiException {
return super.createTags(UUID.fromString(id), tagList, uriInfo,
context.createContext(createdBy, reason, comment));
}
@@ -188,9 +188,8 @@ public class BundleResource extends JaxRsResourceBase {
@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,
- @javax.ws.rs.core.Context final UriInfo uriInfo) {
- return super.deleteTags(UUID.fromString(id), tagList, uriInfo,
+ @HeaderParam(HDR_COMMENT) final String comment) throws TagApiException {
+ return super.deleteTags(UUID.fromString(id), tagList,
context.createContext(createdBy, reason, comment));
}
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 371951a..7a9c201 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
@@ -61,6 +61,8 @@ import com.ning.billing.payment.api.Payment;
import com.ning.billing.payment.api.PaymentApi;
import com.ning.billing.payment.api.PaymentApiException;
import com.ning.billing.util.api.CustomFieldUserApi;
+import com.ning.billing.util.api.TagApiException;
+import com.ning.billing.util.api.TagDefinitionApiException;
import com.ning.billing.util.api.TagUserApi;
import com.ning.billing.util.dao.ObjectType;
@@ -231,9 +233,8 @@ public class InvoiceResource extends JaxRsResourceBase {
final List<CustomFieldJson> customFields,
@HeaderParam(HDR_CREATED_BY) final String createdBy,
@HeaderParam(HDR_REASON) final String reason,
- @HeaderParam(HDR_COMMENT) final String comment,
- @javax.ws.rs.core.Context final UriInfo uriInfo) {
- return super.createCustomFields(UUID.fromString(id), customFields, uriInfo,
+ @HeaderParam(HDR_COMMENT) final String comment) {
+ return super.createCustomFields(UUID.fromString(id), customFields,
context.createContext(createdBy, reason, comment));
}
@@ -245,16 +246,15 @@ public class InvoiceResource extends JaxRsResourceBase {
@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,
- @javax.ws.rs.core.Context final UriInfo uriInfo) {
- return super.deleteCustomFields(UUID.fromString(id), customFieldList, uriInfo,
+ @HeaderParam(HDR_COMMENT) final String comment) {
+ return super.deleteCustomFields(UUID.fromString(id), customFieldList,
context.createContext(createdBy, reason, comment));
}
@GET
@Path(TAG_URI)
@Produces(APPLICATION_JSON)
- public Response getTags(@PathParam(ID_PARAM_NAME) final String id) {
+ public Response getTags(@PathParam(ID_PARAM_NAME) final String id) throws TagDefinitionApiException {
return super.getTags(UUID.fromString(id));
}
@@ -267,7 +267,7 @@ public class InvoiceResource extends JaxRsResourceBase {
@HeaderParam(HDR_CREATED_BY) final String createdBy,
@HeaderParam(HDR_REASON) final String reason,
@HeaderParam(HDR_COMMENT) final String comment,
- @javax.ws.rs.core.Context final UriInfo uriInfo) {
+ @javax.ws.rs.core.Context final UriInfo uriInfo) throws TagApiException {
return super.createTags(UUID.fromString(id), tagList, uriInfo,
context.createContext(createdBy, reason, comment));
}
@@ -280,9 +280,8 @@ public class InvoiceResource extends JaxRsResourceBase {
@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,
- @javax.ws.rs.core.Context final UriInfo uriInfo) {
- return super.deleteTags(UUID.fromString(id), tagList, uriInfo,
+ @HeaderParam(HDR_COMMENT) final String comment) throws TagApiException {
+ return super.deleteTags(UUID.fromString(id), tagList,
context.createContext(createdBy, reason, comment));
}
diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/JaxRsResourceBase.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/JaxRsResourceBase.java
index 01463ea..e092c39 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/JaxRsResourceBase.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/JaxRsResourceBase.java
@@ -16,10 +16,6 @@
package com.ning.billing.jaxrs.resources;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
@@ -27,10 +23,12 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-import com.google.common.base.Function;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.ImmutableList;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.ning.billing.jaxrs.json.CustomFieldJson;
import com.ning.billing.jaxrs.util.JaxrsUriBuilder;
import com.ning.billing.util.api.CustomFieldUserApi;
@@ -44,8 +42,14 @@ import com.ning.billing.util.dao.ObjectType;
import com.ning.billing.util.tag.Tag;
import com.ning.billing.util.tag.TagDefinition;
+import com.google.common.base.Function;
+import com.google.common.collect.Collections2;
+import com.google.common.collect.ImmutableList;
+
public abstract class JaxRsResourceBase implements JaxrsResource {
+ private static final Logger log = LoggerFactory.getLogger(JaxRsResourceBase.class);
+
protected final JaxrsUriBuilder uriBuilder;
protected final TagUserApi tagUserApi;
protected final CustomFieldUserApi customFieldUserApi;
@@ -60,73 +64,47 @@ public abstract class JaxRsResourceBase implements JaxrsResource {
this.customFieldUserApi = customFieldUserApi;
}
- protected Response getTags(final UUID id) {
-
- try {
- final Map<String, Tag> tags = tagUserApi.getTags(id, getObjectType());
- final Collection<UUID> tagIdList = (tags.size() == 0) ?
- Collections.<UUID>emptyList() :
- Collections2.transform(tags.values(), new Function<Tag, UUID>() {
- @Override
- public UUID apply(final Tag input) {
- return input.getTagDefinitionId();
- }
- });
-
- final List<TagDefinition> tagDefinitionList = tagUserApi.getTagDefinitions(tagIdList);
- return Response.status(Response.Status.OK).entity(tagDefinitionList).build();
- } catch (TagDefinitionApiException e) {
- return Response.status(Response.Status.NO_CONTENT).entity(e.getMessage()).build();
- }
+ protected Response getTags(final UUID id) throws TagDefinitionApiException {
+ final Map<String, Tag> tags = tagUserApi.getTags(id, getObjectType());
+ final Collection<UUID> tagIdList = (tags.size() == 0) ?
+ Collections.<UUID>emptyList() :
+ Collections2.transform(tags.values(), new Function<Tag, UUID>() {
+ @Override
+ public UUID apply(final Tag input) {
+ return input.getTagDefinitionId();
+ }
+ });
+
+ final List<TagDefinition> tagDefinitionList = tagUserApi.getTagDefinitions(tagIdList);
+ return Response.status(Response.Status.OK).entity(tagDefinitionList).build();
}
protected Response createTags(final UUID id,
final String tagList,
final UriInfo uriInfo,
- final CallContext context) {
- try {
- Preconditions.checkNotNull(tagList, "Query % list cannot be null", JaxrsResource.QUERY_TAGS);
-
- final Collection<UUID> input = getTagDefinitionUUIDs(tagList);
- tagUserApi.addTags(id, getObjectType(), input, context);
- return uriBuilder.buildResponse(this.getClass(), "getTags", id, uriInfo.getBaseUri().toString());
- } catch (IllegalArgumentException e) {
- return Response.status(Response.Status.BAD_REQUEST).entity(e.getMessage()).build();
- } catch (NullPointerException e) {
- return Response.status(Response.Status.BAD_REQUEST).entity(e.getMessage()).build();
- } catch (TagApiException e) {
- return Response.status(Response.Status.BAD_REQUEST).entity(e.getMessage()).build();
- }
+ final CallContext context) throws TagApiException {
+ final Collection<UUID> input = getTagDefinitionUUIDs(tagList);
+ tagUserApi.addTags(id, getObjectType(), input, context);
+ return uriBuilder.buildResponse(this.getClass(), "getTags", id, uriInfo.getBaseUri().toString());
}
-
private Collection<UUID> getTagDefinitionUUIDs(final String tagList) {
final String[] tagParts = tagList.split(",\\s*");
- final Collection<UUID> result = Collections2.transform(ImmutableList.copyOf(tagParts), new Function<String, UUID>() {
+ return Collections2.transform(ImmutableList.copyOf(tagParts), new Function<String, UUID>() {
@Override
- public UUID apply(String input) {
+ public UUID apply(final String input) {
return UUID.fromString(input);
}
});
- return result;
}
protected Response deleteTags(final UUID id,
final String tagList,
- final CallContext context) {
-
- try {
- final Collection<UUID> input = getTagDefinitionUUIDs(tagList);
- tagUserApi.removeTags(id, getObjectType(), input, context);
-
- return Response.status(Response.Status.OK).build();
- } catch (IllegalArgumentException e) {
- return Response.status(Response.Status.BAD_REQUEST).entity(e.getMessage()).build();
- } catch (NullPointerException e) {
- return Response.status(Response.Status.BAD_REQUEST).entity(e.getMessage()).build();
- } catch (TagApiException e) {
- return Response.status(Response.Status.BAD_REQUEST).entity(e.getMessage()).build();
- }
+ final CallContext context) throws TagApiException {
+ final Collection<UUID> input = getTagDefinitionUUIDs(tagList);
+ tagUserApi.removeTags(id, getObjectType(), input, context);
+
+ return Response.status(Response.Status.OK).build();
}
protected Response getCustomFields(final UUID id) {
@@ -136,37 +114,26 @@ public abstract class JaxRsResourceBase implements JaxrsResource {
for (final CustomField cur : fields.values()) {
result.add(new CustomFieldJson(cur));
}
+
return Response.status(Response.Status.OK).entity(result).build();
}
protected Response createCustomFields(final UUID id,
final List<CustomFieldJson> customFields,
final CallContext context) {
- try {
- final LinkedList<CustomField> input = new LinkedList<CustomField>();
- for (final CustomFieldJson cur : customFields) {
- input.add(new StringCustomField(cur.getName(), cur.getValue()));
- }
-
- customFieldUserApi.saveCustomFields(id, getObjectType(), input, context);
- return uriBuilder.buildResponse(this.getClass(), "createCustomFields", id);
- } catch (IllegalArgumentException e) {
- return Response.status(Response.Status.BAD_REQUEST).entity(e.getMessage()).build();
- } catch (NullPointerException e) {
- return Response.status(Response.Status.BAD_REQUEST).entity(e.getMessage()).build();
+ final LinkedList<CustomField> input = new LinkedList<CustomField>();
+ for (final CustomFieldJson cur : customFields) {
+ input.add(new StringCustomField(cur.getName(), cur.getValue()));
}
+
+ customFieldUserApi.saveCustomFields(id, getObjectType(), input, context);
+ return uriBuilder.buildResponse(this.getClass(), "createCustomFields", id);
}
protected Response deleteCustomFields(final UUID id,
final String customFieldList,
final CallContext context) {
- try {
- // STEPH missing API to delete custom fields
- return Response.status(Response.Status.OK).build();
- } catch (IllegalArgumentException e) {
- return Response.status(Response.Status.BAD_REQUEST).entity(e.getMessage()).build();
- } catch (NullPointerException e) {
- return Response.status(Response.Status.BAD_REQUEST).entity(e.getMessage()).build();
- }
+ // STEPH missing API to delete custom fields
+ return Response.status(Response.Status.OK).build();
}
}
diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/PaymentResource.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/PaymentResource.java
index 9a344d2..8ee10fa 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/PaymentResource.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/PaymentResource.java
@@ -45,6 +45,8 @@ import com.ning.billing.payment.api.PaymentApi;
import com.ning.billing.payment.api.PaymentApiException;
import com.ning.billing.payment.api.Refund;
import com.ning.billing.util.api.CustomFieldUserApi;
+import com.ning.billing.util.api.TagApiException;
+import com.ning.billing.util.api.TagDefinitionApiException;
import com.ning.billing.util.api.TagUserApi;
import com.ning.billing.util.dao.ObjectType;
@@ -127,9 +129,8 @@ public class PaymentResource extends JaxRsResourceBase {
final List<CustomFieldJson> customFields,
@HeaderParam(HDR_CREATED_BY) final String createdBy,
@HeaderParam(HDR_REASON) final String reason,
- @HeaderParam(HDR_COMMENT) final String comment,
- @javax.ws.rs.core.Context final UriInfo uriInfo) {
- return super.createCustomFields(UUID.fromString(id), customFields, uriInfo,
+ @HeaderParam(HDR_COMMENT) final String comment) {
+ return super.createCustomFields(UUID.fromString(id), customFields,
context.createContext(createdBy, reason, comment));
}
@@ -141,16 +142,15 @@ public class PaymentResource extends JaxRsResourceBase {
@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,
- @javax.ws.rs.core.Context final UriInfo uriInfo) {
- return super.deleteCustomFields(UUID.fromString(id), customFieldList, uriInfo,
+ @HeaderParam(HDR_COMMENT) final String comment) {
+ return super.deleteCustomFields(UUID.fromString(id), customFieldList,
context.createContext(createdBy, reason, comment));
}
@GET
@Path(TAG_URI)
@Produces(APPLICATION_JSON)
- public Response getTags(@PathParam(ID_PARAM_NAME) final String id) {
+ public Response getTags(@PathParam(ID_PARAM_NAME) final String id) throws TagDefinitionApiException {
return super.getTags(UUID.fromString(id));
}
@@ -163,7 +163,7 @@ public class PaymentResource extends JaxRsResourceBase {
@HeaderParam(HDR_CREATED_BY) final String createdBy,
@HeaderParam(HDR_REASON) final String reason,
@HeaderParam(HDR_COMMENT) final String comment,
- @javax.ws.rs.core.Context final UriInfo uriInfo) {
+ @javax.ws.rs.core.Context final UriInfo uriInfo) throws TagApiException {
return super.createTags(UUID.fromString(id), tagList, uriInfo,
context.createContext(createdBy, reason, comment));
}
@@ -176,9 +176,8 @@ public class PaymentResource extends JaxRsResourceBase {
@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,
- @javax.ws.rs.core.Context final UriInfo uriInfo) {
- return super.deleteTags(UUID.fromString(id), tagList, uriInfo,
+ @HeaderParam(HDR_COMMENT) final String comment) throws TagApiException {
+ return super.deleteTags(UUID.fromString(id), tagList,
context.createContext(createdBy, reason, comment));
}
diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/SubscriptionResource.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/SubscriptionResource.java
index 22810bf..471ce40 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/SubscriptionResource.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/SubscriptionResource.java
@@ -59,6 +59,8 @@ import com.ning.billing.jaxrs.util.KillbillEventHandler;
import com.ning.billing.payment.api.PaymentErrorEvent;
import com.ning.billing.payment.api.PaymentInfoEvent;
import com.ning.billing.util.api.CustomFieldUserApi;
+import com.ning.billing.util.api.TagApiException;
+import com.ning.billing.util.api.TagDefinitionApiException;
import com.ning.billing.util.api.TagUserApi;
import com.ning.billing.util.callcontext.CallContext;
import com.ning.billing.util.dao.ObjectType;
@@ -347,7 +349,7 @@ public class SubscriptionResource extends JaxRsResourceBase {
@HeaderParam(HDR_REASON) final String reason,
@HeaderParam(HDR_COMMENT) final String comment,
@javax.ws.rs.core.Context final UriInfo uriInfo) {
- return super.createCustomFields(UUID.fromString(id), customFields, uriInfo,
+ return super.createCustomFields(UUID.fromString(id), customFields,
context.createContext(createdBy, reason, comment));
}
@@ -361,14 +363,14 @@ public class SubscriptionResource extends JaxRsResourceBase {
@HeaderParam(HDR_REASON) final String reason,
@HeaderParam(HDR_COMMENT) final String comment,
@javax.ws.rs.core.Context final UriInfo uriInfo) {
- return super.deleteCustomFields(UUID.fromString(id), customFieldList, uriInfo,
+ return super.deleteCustomFields(UUID.fromString(id), customFieldList,
context.createContext(createdBy, reason, comment));
}
@GET
@Path(TAG_URI)
@Produces(APPLICATION_JSON)
- public Response getTags(@PathParam(ID_PARAM_NAME) final String id) {
+ public Response getTags(@PathParam(ID_PARAM_NAME) final String id) throws TagDefinitionApiException {
return super.getTags(UUID.fromString(id));
}
@@ -381,7 +383,7 @@ public class SubscriptionResource extends JaxRsResourceBase {
@HeaderParam(HDR_CREATED_BY) final String createdBy,
@HeaderParam(HDR_REASON) final String reason,
@HeaderParam(HDR_COMMENT) final String comment,
- @javax.ws.rs.core.Context final UriInfo uriInfo) {
+ @javax.ws.rs.core.Context final UriInfo uriInfo) throws TagApiException {
return super.createTags(UUID.fromString(id), tagList, uriInfo,
context.createContext(createdBy, reason, comment));
}
@@ -394,9 +396,8 @@ public class SubscriptionResource extends JaxRsResourceBase {
@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,
- @javax.ws.rs.core.Context final UriInfo uriInfo) {
- return super.deleteTags(UUID.fromString(id), tagList, uriInfo,
+ @HeaderParam(HDR_COMMENT) final String comment) throws TagApiException {
+ return super.deleteTags(UUID.fromString(id), tagList,
context.createContext(createdBy, reason, comment));
}
