diff options
Diffstat (limited to 'adapters/mso-sdnc-adapter/src/main/java/org/onap')
4 files changed, 21 insertions, 32 deletions
diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/CXFConfiguration.java b/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/CXFConfiguration.java index 65eb39d019..21e2ad87d8 100644 --- a/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/CXFConfiguration.java +++ b/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/CXFConfiguration.java @@ -23,6 +23,8 @@ package org.onap.so.adapters.sdnc; import java.util.Arrays; import java.util.HashSet; import javax.xml.ws.Endpoint; +import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; +import jakarta.servlet.Servlet; import org.apache.cxf.Bus; import org.apache.cxf.endpoint.Server; import org.apache.cxf.feature.LoggingFeature; @@ -40,7 +42,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; + @Configuration("CXFConfiguration") @@ -77,7 +79,7 @@ public class CXFConfiguration { @Bean public ServletRegistrationBean cxfServlet() { - return new ServletRegistrationBean(new CXFServlet(), "/adapters/*"); + return new ServletRegistrationBean((Servlet) new CXFServlet(), "/adapters/*"); } @Bean diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/sdncrest/BPRestCallback.java b/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/sdncrest/BPRestCallback.java index 62f45f88b1..a4669aa18d 100644 --- a/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/sdncrest/BPRestCallback.java +++ b/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/sdncrest/BPRestCallback.java @@ -142,10 +142,10 @@ public class BPRestCallback { URI uri = builder.build(true).toUri(); response = restTemplate.postForEntity(uri, requestEntity, String.class); } catch (HttpStatusCodeException e) { - logResponseError(e.getStatusCode()); + logResponseError((HttpStatus) e.getStatusCode()); } if (response != null && response.getStatusCode().is3xxRedirection()) { - logResponseError(response.getStatusCode()); + logResponseError((HttpStatus) response.getStatusCode()); } } @@ -159,7 +159,6 @@ public class BPRestCallback { RestTemplate restTemplate = new RestTemplate(); HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory(); factory.setConnectionRequestTimeout(timeout); - factory.setReadTimeout(timeout); factory.setConnectTimeout(timeout); restTemplate.setRequestFactory(new BufferingClientHttpRequestFactory(factory)); restTemplate.getInterceptors().add(new SOSpringClientFilter()); diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/sdncrest/SNIROResponse.java b/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/sdncrest/SNIROResponse.java index 9f7760a0d8..424de4e1b4 100644 --- a/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/sdncrest/SNIROResponse.java +++ b/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/sdncrest/SNIROResponse.java @@ -24,13 +24,9 @@ package org.onap.so.adapters.sdnc.sdncrest; import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.onap.so.logger.LoggingAnchor; import org.onap.so.adapters.sdnc.impl.Constants; import org.onap.logging.filter.base.ErrorCode; diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/tasks/SDNCService.java b/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/tasks/SDNCService.java index e5b7049934..d6b94870fe 100644 --- a/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/tasks/SDNCService.java +++ b/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/tasks/SDNCService.java @@ -1,17 +1,12 @@ package org.onap.so.adapters.sdnc.tasks; -import java.security.GeneralSecurityException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.ws.rs.core.UriBuilder; -import javax.xml.bind.DatatypeConverter; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.ws.rs.core.UriBuilder; import org.camunda.bpm.client.task.ExternalTask; import org.camunda.bpm.client.task.ExternalTaskService; -import org.onap.logging.filter.spring.SpringClientPayloadFilter; import org.onap.so.adapters.sdnc.impl.Constants; -import org.onap.so.logging.jaxrs.filter.SOSpringClientFilter; import org.onap.so.logging.tasks.AuditMDCSetup; import org.onap.so.utils.CryptoUtils; import org.onap.so.utils.ExternalTaskUtils; @@ -20,19 +15,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.http.client.BufferingClientHttpRequestFactory; -import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; +import org.springframework.http.*; import org.springframework.stereotype.Component; import org.springframework.web.client.RestTemplate; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; +import javax.xml.bind.DatatypeConverter; +import java.security.GeneralSecurityException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + @Component public class SDNCService extends ExternalTaskUtils { |