* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
+
package org.onap.nbi.apis.servicecatalog;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.Map.Entry;
import javax.annotation.PostConstruct;
import org.apache.commons.io.IOUtils;
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.stereotype.Service;
import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.ResourceAccessException;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;
private static final String HEADER_ECOMP_INSTANCE_ID = "x-ecomp-instanceid";
private static final String HEADER_AUTHORIZATION = "Authorization";
+ // changes for Post Implementation
+ private static final String USER_ID = "USER_ID";
private static final Logger LOGGER = LoggerFactory.getLogger(SdcClient.class);
-
-
private String sdcGetUrl;
private String sdcFindUrl;
private String sdcHealthCheck;
@PostConstruct
private void setUpAndLogSDCUrl() {
- sdcGetUrl= new StringBuilder().append(sdcHost).append(OnapComponentsUrlPaths.SDC_ROOT_URL+"/{id}"+OnapComponentsUrlPaths.SDC_GET_PATH).toString();
+ sdcGetUrl = new StringBuilder().append(sdcHost)
+ .append(OnapComponentsUrlPaths.SDC_ROOT_URL + "/{id}" + OnapComponentsUrlPaths.SDC_GET_PATH).toString();
sdcFindUrl = new StringBuilder().append(sdcHost).append(OnapComponentsUrlPaths.SDC_ROOT_URL).toString();
sdcHealthCheck = new StringBuilder().append(sdcHost).append(OnapComponentsUrlPaths.SDC_HEALTH_CHECK).toString();
-
-
- LOGGER.info("SDC GET url : "+sdcGetUrl);
- LOGGER.info("SDC FIND url : "+ sdcFindUrl);
- LOGGER.info("SDC HealthCheck : "+ sdcHealthCheck);
+ LOGGER.info("SDC GET url : " + sdcGetUrl);
+ LOGGER.info("SDC FIND url : " + sdcFindUrl);
+ LOGGER.info("SDC HealthCheck : " + sdcHealthCheck);
}
-
public Map callGet(String id) {
String callUrl = sdcGetUrl.replace("{id}", id);
}
-
-
public File callGetWithAttachment(String toscaModelUrl) {
StringBuilder urlBuilder = new StringBuilder().append(sdcHost).append(toscaModelUrl);
UriComponentsBuilder callURI = UriComponentsBuilder.fromHttpUrl(urlBuilder.toString());
File directory = new File("temptoscafile");
- if (! directory.exists()){
+ if (!directory.exists()) {
directory.mkdir();
}
- String fileName = "temptoscafile/"+System.currentTimeMillis() + "tosca.csar";
+ String fileName = "temptoscafile/" + System.currentTimeMillis() + "tosca.csar";
ResponseEntity<byte[]> response = callSdcWithAttachment(callURI.build().encode().toUri());
File toscaFile = new File(fileName);
try {
return toscaFile;
}
-
+
public Path getServiceToscaModel(String uuid) throws IOException {
StringBuilder urlBuilder = new StringBuilder().append(sdcHost).append(OnapComponentsUrlPaths.SDC_ROOT_URL)
.append("/").append(uuid).append(OnapComponentsUrlPaths.SDC_TOSCA_PATH);
return createTmpFile(inputStream);
}
-
+ /**
+ *
+ * @param serviceCatalogObject
+ * @param userId
+ */
+ public Map callPost(HashMap<Object, Object> serviceCatalogObject, String userId) {
+ // post url is the same as find url
+ UriComponentsBuilder callURI = UriComponentsBuilder.fromHttpUrl(sdcFindUrl);
+ ResponseEntity<Object> response = callSdcForPost(callURI.build().encode().toUri(), serviceCatalogObject,
+ userId);
+ // return (List<LinkedHashMap>) response.getBody();
+ return (LinkedHashMap) response.getBody();
+ }
+
private Path createTmpFile(InputStream csarInputStream) throws IOException {
Path csarFile = Files.createTempFile("csar", ".zip");
Files.copy(csarInputStream, csarFile, StandardCopyOption.REPLACE_EXISTING);
private HttpEntity<String> buildRequestHeader() {
HttpHeaders httpHeaders = new HttpHeaders();
+ httpHeaders.setContentType(MediaType.APPLICATION_JSON);
httpHeaders.add(HEADER_ECOMP_INSTANCE_ID, ecompInstanceId);
httpHeaders.add(HEADER_AUTHORIZATION, sdcHeaderAuthorization);
return new HttpEntity<>("parameters", httpHeaders);
}
-
private ResponseEntity<Object> callSdc(URI callURI) {
ResponseEntity<Object> response =
restTemplate.exchange(callURI, HttpMethod.GET, buildRequestHeader(), Object.class);
- if(LOGGER.isDebugEnabled()) {
- LOGGER.debug("response body : {} ",response.getBody().toString());
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("response body : {} ", response.getBody().toString());
}
LOGGER.info("response status : {}", response.getStatusCodeValue());
loggDebugIfResponseKo(callURI.toString(), response);
return response;
}
-
private ResponseEntity<byte[]> callSdcWithAttachment(URI callURI) {
try {
ResponseEntity<byte[]> response =
restTemplate.exchange(callURI, HttpMethod.GET, buildRequestHeader(), byte[].class);
LOGGER.info("response status : " + response.getStatusCodeValue());
if (LOGGER.isWarnEnabled() && !response.getStatusCode().equals(HttpStatus.OK)) {
- LOGGER.warn("HTTP call SDC on {} returns {} ", callURI.toString() , response.getStatusCodeValue());
+ LOGGER.warn("HTTP call SDC on {} returns {} ", callURI.toString(), response.getStatusCodeValue());
}
return response;
} catch (BackendFunctionalException e) {
- LOGGER.error("HTTP call SDC on {} error : {}", callURI.toString() , e);
+ LOGGER.error("HTTP call SDC on {} error : {}", callURI.toString(), e);
return null;
}
}
-
private void loggDebugIfResponseKo(String callURI, ResponseEntity<Object> response) {
if (LOGGER.isWarnEnabled() && !response.getStatusCode().equals(HttpStatus.OK)) {
- LOGGER.warn("HTTP call SDC on {} returns {} , {}", callURI , response.getStatusCodeValue() , response.getBody().toString());
+ LOGGER.warn("HTTP call SDC on {} returns {} , {}", callURI, response.getStatusCodeValue(),
+ response.getBody().toString());
}
}
-}
+ //changes for Post implementation start
+ /**
+ *
+ * @param callURI
+ * @param obj
+ * @param userId
+ * @return
+ */
+ private ResponseEntity<Object> callSdcForPost(URI callURI, Object obj, String userId) {
+ ResponseEntity<Object> response = restTemplate.exchange(callURI, HttpMethod.POST,
+ new HttpEntity<>(obj, buildRequestHeaderForPost(userId)), Object.class);
+
+ if (null == response) {
+ return null;
+ } else {
+
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("response body : {} ", response.getBody().toString());
+ }
+ LOGGER.info("response status : {}", response.getStatusCodeValue());
+ return response;
+ }
+ }
+ /**
+ *
+ * @param userId
+ * @return
+ */
+ private HttpHeaders buildRequestHeaderForPost(String userId) {
+ HttpHeaders httpHeaders = new HttpHeaders();
+
+ httpHeaders.setContentType(MediaType.APPLICATION_JSON);
+ httpHeaders.add(HEADER_ECOMP_INSTANCE_ID, ecompInstanceId);
+ httpHeaders.add(HEADER_AUTHORIZATION, sdcHeaderAuthorization);
+ httpHeaders.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
+ httpHeaders.add(USER_ID, userId);
+
+ return httpHeaders;
+ }
+
+}
Code Review / externalapi / nbi.git / blobdiff