aboutsummaryrefslogtreecommitdiffstats
path: root/policy-endpoints/src
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2019-11-01 11:21:54 +0000
committerliamfallon <liam.fallon@est.tech>2019-11-01 11:43:12 +0000
commit89b8fe5274faa8cba3030ee31fba9bf32de02dd0 (patch)
tree07e64a9d8ca8d1b81eee5c892f706675986bbe5d /policy-endpoints/src
parentafc7fa55500109a25772681882ad12c22c794a2b (diff)
Add common Jersey version
Add a common version of Jersey for all Policy Framework components. Issue-ID: POLICY-2209 Change-Id: I8554a97e9f13887418118966bfe1043b65d9a179 Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'policy-endpoints/src')
-rw-r--r--policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/client/internal/JerseyClient.java3
-rw-r--r--policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyJerseyServer.java24
-rw-r--r--policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/MyJacksonProvider.java5
3 files changed, 18 insertions, 14 deletions
diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/client/internal/JerseyClient.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/client/internal/JerseyClient.java
index 4b73c5c4..8a717712 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/client/internal/JerseyClient.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/client/internal/JerseyClient.java
@@ -4,6 +4,7 @@
* ================================================================================
* Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2018 Samsung Electronics Co., Ltd.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -54,7 +55,7 @@ public class JerseyClient implements HttpClient {
private static Logger logger = LoggerFactory.getLogger(JerseyClient.class);
protected static final String JERSEY_DEFAULT_SERIALIZATION_PROVIDER =
- "com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider";
+ "org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJsonProvider";
protected final String name;
protected final boolean https;
diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyJerseyServer.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyJerseyServer.java
index 78661a45..d809479a 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyJerseyServer.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyJerseyServer.java
@@ -3,6 +3,7 @@
* policy-endpoints
* ================================================================================
* Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,11 +33,10 @@ import org.slf4j.LoggerFactory;
/**
* REST Jetty Server that uses Jersey Servlets to support JAX-RS Web Services.
*
- * <p>Note: the serialization provider will always be added to the server's class providers,
- * as will the swagger providers (assuming swagger has been enabled). This happens whether
- * {@link #addServletClass(String, String)} is used or
- * {@link #addServletPackage(String, String)} is used. Thus it's possible to have both the
- * server's class provider property and the server's package provider property populated.
+ * <p>Note: the serialization provider will always be added to the server's class providers, as will the swagger
+ * providers (assuming swagger has been enabled). This happens whether {@link #addServletClass(String, String)} is used
+ * or {@link #addServletPackage(String, String)} is used. Thus it's possible to have both the server's class provider
+ * property and the server's package provider property populated.
*/
public class JettyJerseyServer extends JettyServletServer {
@@ -64,7 +64,7 @@ public class JettyJerseyServer extends JettyServletServer {
* Jersey Jackson Classes Init Param Value.
*/
protected static final String JERSEY_JACKSON_INIT_CLASSNAMES_PARAM_VALUE =
- "com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider";
+ "org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJsonProvider";
/**
* Jersey Swagger Classes Init Param Value.
@@ -149,7 +149,7 @@ public class JettyJerseyServer extends JettyServletServer {
return servlets.computeIfAbsent(servletPath, key -> {
ServletHolder jerseyServlet =
- context.addServlet(org.glassfish.jersey.servlet.ServletContainer.class, servletPath);
+ context.addServlet(org.glassfish.jersey.servlet.ServletContainer.class, servletPath);
jerseyServlet.setInitOrder(0);
return jerseyServlet;
@@ -217,9 +217,9 @@ public class JettyJerseyServer extends JettyServletServer {
}
/**
- * Adds "standard" parameters to the initParameter set. Sets swagger parameters, if
- * specified, and sets the class provider property. This can be invoked multiple
- * times, but only the first actually causes any changes to the parameter set.
+ * Adds "standard" parameters to the initParameter set. Sets swagger parameters, if specified, and sets the class
+ * provider property. This can be invoked multiple times, but only the first actually causes any changes to the
+ * parameter set.
*
* @param jerseyServlet servlet into which parameters should be added
*/
@@ -244,8 +244,8 @@ public class JettyJerseyServer extends JettyServletServer {
}
/**
- * Note: this must be invoked <i>before</i> {@link #addServletClass(String, String)}
- * or {@link #addServletPackage(String, String)}.
+ * Note: this must be invoked <i>before</i> {@link #addServletClass(String, String)} or
+ * {@link #addServletPackage(String, String)}.
*/
@Override
public void setSerializationProvider(String provider) {
diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/MyJacksonProvider.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/MyJacksonProvider.java
index 55efd8bb..8c4eea5a 100644
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/MyJacksonProvider.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/MyJacksonProvider.java
@@ -3,6 +3,7 @@
* ONAP
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,7 +21,6 @@
package org.onap.policy.common.endpoints.http.server.test;
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -28,9 +28,12 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
+
import lombok.AccessLevel;
import lombok.Setter;
+import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJsonProvider;
+
/**
* JacksonJsonProvider that tracks activities.
*/