Improve coverage for Intents REST API test
Also, added @Provider annotation to all exception mappers so
the Jersey unit test framework will apply them during
testing.
Change-Id: Ifd9237de2e159cd97b64dcb9bde4a66f14bd0dfc
diff --git a/web/api/src/main/java/org/onosproject/rest/exceptions/BadRequestMapper.java b/web/api/src/main/java/org/onosproject/rest/exceptions/BadRequestMapper.java
index fcef3b1..89b1368 100644
--- a/web/api/src/main/java/org/onosproject/rest/exceptions/BadRequestMapper.java
+++ b/web/api/src/main/java/org/onosproject/rest/exceptions/BadRequestMapper.java
@@ -16,11 +16,14 @@
package org.onosproject.rest.exceptions;
import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
+
import java.io.IOException;
/**
* Mapper for IO exceptions to the BAD_REQUEST response code.
*/
+@Provider
public class BadRequestMapper extends AbstractMapper<IOException> {
@Override
protected Response.Status responseStatus() {
diff --git a/web/api/src/main/java/org/onosproject/rest/exceptions/EntityNotFoundMapper.java b/web/api/src/main/java/org/onosproject/rest/exceptions/EntityNotFoundMapper.java
index 63e24b9..9e42a56 100644
--- a/web/api/src/main/java/org/onosproject/rest/exceptions/EntityNotFoundMapper.java
+++ b/web/api/src/main/java/org/onosproject/rest/exceptions/EntityNotFoundMapper.java
@@ -18,10 +18,12 @@
import org.onlab.util.ItemNotFoundException;
import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
/**
* Mapper for service not found exceptions to the NOT_FOUND response code.
*/
+@Provider
public class EntityNotFoundMapper extends AbstractMapper<ItemNotFoundException> {
@Override
protected Response.Status responseStatus() {
diff --git a/web/api/src/main/java/org/onosproject/rest/exceptions/IllegalArgumentExceptionMapper.java b/web/api/src/main/java/org/onosproject/rest/exceptions/IllegalArgumentExceptionMapper.java
index 6a381f7..2d7a1ea 100644
--- a/web/api/src/main/java/org/onosproject/rest/exceptions/IllegalArgumentExceptionMapper.java
+++ b/web/api/src/main/java/org/onosproject/rest/exceptions/IllegalArgumentExceptionMapper.java
@@ -16,10 +16,12 @@
package org.onosproject.rest.exceptions;
import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
/**
* Mapper for illegal argument exceptions to the BAD_REQUEST response code.
*/
+@Provider
public class IllegalArgumentExceptionMapper extends AbstractMapper<IllegalArgumentException> {
@Override
protected Response.Status responseStatus() {
diff --git a/web/api/src/main/java/org/onosproject/rest/exceptions/IllegalStateExceptionMapper.java b/web/api/src/main/java/org/onosproject/rest/exceptions/IllegalStateExceptionMapper.java
index f20daf5..a9f977c 100644
--- a/web/api/src/main/java/org/onosproject/rest/exceptions/IllegalStateExceptionMapper.java
+++ b/web/api/src/main/java/org/onosproject/rest/exceptions/IllegalStateExceptionMapper.java
@@ -16,10 +16,12 @@
package org.onosproject.rest.exceptions;
import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
/**
* Mapper for illegal state exceptions to the BAD_REQUEST response code.
*/
+@Provider
public class IllegalStateExceptionMapper extends AbstractMapper<IllegalStateException> {
@Override
protected Response.Status responseStatus() {
diff --git a/web/api/src/main/java/org/onosproject/rest/exceptions/NotFoundMapper.java b/web/api/src/main/java/org/onosproject/rest/exceptions/NotFoundMapper.java
index 1c4135e..2bf3614 100644
--- a/web/api/src/main/java/org/onosproject/rest/exceptions/NotFoundMapper.java
+++ b/web/api/src/main/java/org/onosproject/rest/exceptions/NotFoundMapper.java
@@ -16,12 +16,14 @@
package org.onosproject.rest.exceptions;
import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
import com.sun.jersey.api.NotFoundException;
/**
* Mapper for api not found exceptions to the NOT_FOUND response code.
*/
+@Provider
public class NotFoundMapper extends AbstractMapper<NotFoundException> {
@Override
diff --git a/web/api/src/main/java/org/onosproject/rest/exceptions/ServerErrorMapper.java b/web/api/src/main/java/org/onosproject/rest/exceptions/ServerErrorMapper.java
index 4904c85..5a9050d 100644
--- a/web/api/src/main/java/org/onosproject/rest/exceptions/ServerErrorMapper.java
+++ b/web/api/src/main/java/org/onosproject/rest/exceptions/ServerErrorMapper.java
@@ -16,10 +16,12 @@
package org.onosproject.rest.exceptions;
import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
/**
* Mapper for service not found exceptions to the INTERNAL_SERVER_ERROR response code.
*/
+@Provider
public class ServerErrorMapper extends AbstractMapper<RuntimeException> {
@Override
protected Response.Status responseStatus() {
diff --git a/web/api/src/main/java/org/onosproject/rest/exceptions/ServiceNotFoundMapper.java b/web/api/src/main/java/org/onosproject/rest/exceptions/ServiceNotFoundMapper.java
index 0932bc4..69e5508 100644
--- a/web/api/src/main/java/org/onosproject/rest/exceptions/ServiceNotFoundMapper.java
+++ b/web/api/src/main/java/org/onosproject/rest/exceptions/ServiceNotFoundMapper.java
@@ -18,10 +18,12 @@
import org.onlab.osgi.ServiceNotFoundException;
import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
/**
* Mapper for service not found exceptions to the SERVICE_UNAVAILABLE response code.
*/
+@Provider
public class ServiceNotFoundMapper extends AbstractMapper<ServiceNotFoundException> {
@Override
protected Response.Status responseStatus() {
diff --git a/web/api/src/main/java/org/onosproject/rest/exceptions/WebApplicationExceptionMapper.java b/web/api/src/main/java/org/onosproject/rest/exceptions/WebApplicationExceptionMapper.java
index f47e604..86d8434 100644
--- a/web/api/src/main/java/org/onosproject/rest/exceptions/WebApplicationExceptionMapper.java
+++ b/web/api/src/main/java/org/onosproject/rest/exceptions/WebApplicationExceptionMapper.java
@@ -17,10 +17,12 @@
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
/**
* Exception mapper for WebApplicationExceptions.
*/
+@Provider
public class WebApplicationExceptionMapper extends AbstractMapper<WebApplicationException> {
/**