aboutsummaryrefslogtreecommitdiffstats
path: root/aai-schema-ingest/src
diff options
context:
space:
mode:
Diffstat (limited to 'aai-schema-ingest/src')
-rw-r--r--aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockRestClient.java14
-rw-r--r--aai-schema-ingest/src/test/java/org/onap/aai/restclient/SchemaRestClientTest.java2
2 files changed, 9 insertions, 7 deletions
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockRestClient.java b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockRestClient.java
index 74d254b1..9715f0ea 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockRestClient.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockRestClient.java
@@ -191,7 +191,7 @@ public class MockRestClient extends RestClient {
}
@Override
- 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) {
String url = "https://localhost:8447/aai/v14/" + uri;
@@ -227,16 +227,17 @@ public class MockRestClient extends RestClient {
headersMap.add("X-FromAppId", "JUNIT");
headersMap.add("X-TransactionId", "JUNIT");
- HttpEntity httpEntity = new HttpEntity(headers);
+ HttpEntity<String> httpEntity = new HttpEntity(headers);
- ResponseEntity responseEntity = restTemplate.exchange(url, HttpMethod.GET, httpEntity, String.class);
+ ResponseEntity<String> responseEntity = restTemplate.exchange(url, HttpMethod.GET, httpEntity, String.class);
// mockRestServiceServer.verify();
return responseEntity;
}
@Override
- public ResponseEntity executeResource(String uri, HttpMethod method, Map<String, String> headers, String body) {
+ public ResponseEntity<Resource> executeResource(String uri, HttpMethod method, Map<String, String> headers,
+ String body) {
String url = "https://localhost:8447/aai/v14/" + uri;
@@ -272,9 +273,10 @@ public class MockRestClient extends RestClient {
headersMap.add("X-FromAppId", "JUNIT");
headersMap.add("X-TransactionId", "JUNIT");
- HttpEntity httpEntity = new HttpEntity(headers);
+ HttpEntity<String> httpEntity = new HttpEntity(headers);
- ResponseEntity responseEntity = restTemplate.exchange(url, HttpMethod.GET, httpEntity, Resource.class);
+ ResponseEntity<Resource> responseEntity =
+ restTemplate.exchange(url, HttpMethod.GET, httpEntity, Resource.class);
// mockRestServiceServer.verify();
return responseEntity;
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/restclient/SchemaRestClientTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/SchemaRestClientTest.java
index cbbc63d3..4b12936e 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/restclient/SchemaRestClientTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/SchemaRestClientTest.java
@@ -50,7 +50,7 @@ public class SchemaRestClientTest {
@Test
public void testGetRequestToSchemaService() {
- ResponseEntity aaiResponse;
+ ResponseEntity<String> aaiResponse;
RestClient restClient = null;
restClient = restClientFactory.getRestClient(SCHEMA_SERVICE);