Code Review
/
aai
/
aai-common.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Reduce the number of raw-type related warnings in aai-common"
[aai/aai-common.git]
/
aai-schema-ingest
/
src
/
test
/
java
/
org
/
onap
/
aai
/
restclient
/
MockRestClient.java
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
57988f0
..
16889c7
100644
(file)
--- 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
@@
-188,7
+188,7
@@
public class MockRestClient extends RestClient {
}
@Override
}
@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;
String url = "https://localhost:8447/aai/v14/" + uri;
@@
-224,16
+224,17
@@
public class MockRestClient extends RestClient {
headersMap.add("X-FromAppId", "JUNIT");
headersMap.add("X-TransactionId", "JUNIT");
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
// 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;
String url = "https://localhost:8447/aai/v14/" + uri;
@@
-269,9
+270,10
@@
public class MockRestClient extends RestClient {
headersMap.add("X-FromAppId", "JUNIT");
headersMap.add("X-TransactionId", "JUNIT");
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;
// mockRestServiceServer.verify();
return responseEntity;