summaryrefslogtreecommitdiffstats
path: root/aai-rest
diff options
context:
space:
mode:
authorWilliam Reehil <william.reehil@att.com>2022-11-11 13:37:39 +0000
committerGerrit Code Review <gerrit@onap.org>2022-11-11 13:37:39 +0000
commit72b44a38290334c46a9dedc0be1dadcd08520515 (patch)
tree4ea0ae01f4dabf1b9781779b5fea790f9c2c03ba /aai-rest
parent131345b4ef18b8dc2c346c6af59f90f0d3fde431 (diff)
parent2c9ee21f2cf8fc230decfc48e3f652fe11862216 (diff)
Merge "Reduce the number of raw-type related warnings in aai-common"
Diffstat (limited to 'aai-rest')
-rw-r--r--aai-rest/src/main/java/org/onap/aai/restclient/RestClient.java21
-rw-r--r--aai-rest/src/main/java/org/onap/aai/restclient/RestClientFactoryConfiguration.java4
2 files changed, 13 insertions, 12 deletions
diff --git a/aai-rest/src/main/java/org/onap/aai/restclient/RestClient.java b/aai-rest/src/main/java/org/onap/aai/restclient/RestClient.java
index 6fd2ab60..44b1fe44 100644
--- a/aai-rest/src/main/java/org/onap/aai/restclient/RestClient.java
+++ b/aai-rest/src/main/java/org/onap/aai/restclient/RestClient.java
@@ -53,7 +53,7 @@ public abstract class RestClient {
* @return response of request
* @throws RestClientException on internal rest template exception or invalid url
*/
- public ResponseEntity execute(String uri, HttpMethod method, Map<String, String> headers, String body)
+ public ResponseEntity<String> execute(String uri, HttpMethod method, Map<String, String> headers, String body)
throws RestClientException {
HttpEntity<String> httpEntity;
@@ -79,7 +79,7 @@ public abstract class RestClient {
throw new RestClientException(e.getMessage());
}
log.debug("METHOD={}, URL={}, BODY={}", method, url, httpEntity.getBody());
- ResponseEntity responseEntity = getRestTemplate().exchange(url, method, httpEntity, String.class);
+ ResponseEntity<String> responseEntity = getRestTemplate().exchange(url, method, httpEntity, String.class);
log.trace("RESPONSE={}", responseEntity);
return responseEntity;
}
@@ -94,7 +94,7 @@ public abstract class RestClient {
* @return response of request
* @throws RestClientException on internal rest template exception or invalid url
*/
- public ResponseEntity execute(String uri, String method, Map<String, String> headers, String body)
+ public ResponseEntity<String> execute(String uri, String method, Map<String, String> headers, String body)
throws RestClientException {
return execute(uri, HttpMethod.valueOf(method), headers, body);
}
@@ -108,7 +108,7 @@ public abstract class RestClient {
* @return response of request
* @throws RestClientException on internal rest template exception or invalid url
*/
- public ResponseEntity execute(String uri, HttpMethod method, Map<String, String> headers)
+ public ResponseEntity<String> execute(String uri, HttpMethod method, Map<String, String> headers)
throws RestClientException {
return execute(uri, method, headers, null);
}
@@ -122,14 +122,15 @@ public abstract class RestClient {
* @return response of request
* @throws RestClientException on internal rest template exception or invalid url
*/
- public ResponseEntity execute(String uri, String method, Map<String, String> headers) throws RestClientException {
+ public ResponseEntity<String> execute(String uri, String method, Map<String, String> headers)
+ throws RestClientException {
return execute(uri, HttpMethod.valueOf(method), headers, null);
}
- public ResponseEntity executeResource(String uri, HttpMethod method, Map<String, String> headers, String body)
- throws RestClientException {
+ public ResponseEntity<Resource> executeResource(String uri, HttpMethod method, Map<String, String> headers,
+ String body) throws RestClientException {
- HttpEntity httpEntity;
+ HttpEntity<String> httpEntity;
log.debug("Headers: " + headers.toString());
if (body == null) {
httpEntity = new HttpEntity(getHeaders(headers));
@@ -140,12 +141,12 @@ public abstract class RestClient {
return getRestTemplate().exchange(url, method, httpEntity, Resource.class);
}
- public ResponseEntity getGetRequest(String content, String uri, Map<String, String> headersMap) {
+ public ResponseEntity<String> getGetRequest(String content, String uri, Map<String, String> headersMap) {
return this.execute(uri, HttpMethod.GET, headersMap, content);
}
- public ResponseEntity getGetResource(String content, String uri, Map<String, String> headersMap) {
+ public ResponseEntity<Resource> getGetResource(String content, String uri, Map<String, String> headersMap) {
return this.executeResource(uri, HttpMethod.GET, headersMap, content);
}
diff --git a/aai-rest/src/main/java/org/onap/aai/restclient/RestClientFactoryConfiguration.java b/aai-rest/src/main/java/org/onap/aai/restclient/RestClientFactoryConfiguration.java
index 08060238..9a28c1cb 100644
--- a/aai-rest/src/main/java/org/onap/aai/restclient/RestClientFactoryConfiguration.java
+++ b/aai-rest/src/main/java/org/onap/aai/restclient/RestClientFactoryConfiguration.java
@@ -20,7 +20,6 @@
package org.onap.aai.restclient;
-import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.config.ServiceLocatorFactoryBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -28,8 +27,9 @@ import org.springframework.context.annotation.Configuration;
@Configuration
public class RestClientFactoryConfiguration {
+ // ServiceLocatorFactoryBean
@Bean
- public FactoryBean restClientFactoryBean() {
+ public ServiceLocatorFactoryBean restClientFactoryBean() {
ServiceLocatorFactoryBean factoryBean = new ServiceLocatorFactoryBean();
factoryBean.setServiceLocatorInterface(RestClientFactory.class);
return factoryBean;