X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fmodelloader%2Frestclient%2FBabelServiceClientImpl.java;h=63bd7e960daab2c6d91277416fdcc48ae1e7e22e;hb=refs%2Fheads%2Fmaster;hp=474fcc6053cbaf3247008e628fb290a591559501;hpb=93a7defb8a10ac29f97d3cfd860ca12a629bdc41;p=aai%2Fmodel-loader.git diff --git a/src/main/java/org/onap/aai/modelloader/restclient/BabelServiceClientImpl.java b/src/main/java/org/onap/aai/modelloader/restclient/BabelServiceClientImpl.java index 474fcc6..2ad46cd 100644 --- a/src/main/java/org/onap/aai/modelloader/restclient/BabelServiceClientImpl.java +++ b/src/main/java/org/onap/aai/modelloader/restclient/BabelServiceClientImpl.java @@ -27,7 +27,7 @@ import org.onap.aai.babel.service.data.BabelArtifact; import org.onap.aai.babel.service.data.BabelRequest; import org.onap.aai.cl.api.Logger; import org.onap.aai.cl.eelf.LoggerFactory; -import org.onap.aai.modelloader.config.ModelLoaderConfig; +import org.onap.aai.modelloader.config.BabelProperties; import org.onap.aai.modelloader.service.ModelLoaderMsgs; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpEntity; @@ -39,30 +39,28 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; import org.springframework.web.client.RestTemplate; +import lombok.RequiredArgsConstructor; + /** * HTTPS Client for interfacing with Babel. * */ @Component +@RequiredArgsConstructor public class BabelServiceClientImpl implements BabelServiceClient { private static final Logger logger = LoggerFactory.getInstance().getLogger(BabelServiceClientImpl.class); - private final ModelLoaderConfig config; + private final BabelProperties babelProperties; private final RestTemplate restTemplate; - public BabelServiceClientImpl(ModelLoaderConfig config, RestTemplate restTemplate) { - this.config = config; - this.restTemplate = restTemplate; - } - @Override public List postArtifact(BabelRequest babelRequest, String transactionId) throws BabelServiceClientException { - if (logger.isInfoEnabled()) { - logger.info(ModelLoaderMsgs.BABEL_REST_REQUEST_PAYLOAD, " Artifact Name: " + babelRequest.getArtifactName() + if (logger.isDebugEnabled()) { + logger.debug(ModelLoaderMsgs.BABEL_REST_REQUEST_PAYLOAD, " Artifact Name: " + babelRequest.getArtifactName() + " Artifact version: " + babelRequest.getArtifactVersion() + " Artifact payload: " + babelRequest.getCsar()); } - String resourceUrl = config.getBabelBaseUrl() + config.getBabelGenerateArtifactsUrl(); + String resourceUrl = babelProperties.getBaseUrl() + babelProperties.getGenerateArtifactsUrl(); HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON);