diff options
author | Leigh, Phillip (pl876u) <phillip.leigh@amdocs.com> | 2019-03-12 15:49:49 -0400 |
---|---|---|
committer | Leigh, Phillip (pl876u) <phillip.leigh@amdocs.com> | 2019-03-13 16:01:07 -0400 |
commit | a6e5540e815fcb1897e9e2dd4dcbd7ff0cf3b067 (patch) | |
tree | 09bf7e6a3f49c9dd2555502ed5e4c3aa39e9c5e4 /src/main/java/org/onap/pomba/contextbuilder/sdc/service | |
parent | d7b7398f1527be74dd279c66395c8518ac8d4e22 (diff) |
SdcCtxBulder:set UUID svcInstanceId & versioning
Also fixed the versioning support
Issue-ID: LOG-712
Issue-ID: LOG-658
Change-Id: Iaf3327d2c891671bae45f3f2c5a7fc5b6e9cf180
Signed-off-by: Leigh, Phillip (pl876u) <phillip.leigh@amdocs.com>
Diffstat (limited to 'src/main/java/org/onap/pomba/contextbuilder/sdc/service')
-rw-r--r-- | src/main/java/org/onap/pomba/contextbuilder/sdc/service/SpringServiceImpl.java | 120 | ||||
-rw-r--r-- | src/main/java/org/onap/pomba/contextbuilder/sdc/service/rs/RestService.java | 118 |
2 files changed, 119 insertions, 119 deletions
diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdc/service/SpringServiceImpl.java b/src/main/java/org/onap/pomba/contextbuilder/sdc/service/SpringServiceImpl.java index 1ef7fd0..1315fc2 100644 --- a/src/main/java/org/onap/pomba/contextbuilder/sdc/service/SpringServiceImpl.java +++ b/src/main/java/org/onap/pomba/contextbuilder/sdc/service/SpringServiceImpl.java @@ -1,61 +1,61 @@ -/*
- * ============LICENSE_START===================================================
- * Copyright (c) 2018 Amdocs
- * ============================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=====================================================
- */
-package org.onap.pomba.contextbuilder.sdc.service;
-
-import org.onap.pomba.contextbuilder.sdc.exception.ToscaCsarException;
-import org.onap.pomba.contextbuilder.sdc.logging.LoggingUtil;
-import org.onap.pomba.contextbuilder.sdc.model.SDCContextRequest;
-import org.onap.pomba.contextbuilder.sdc.model.SDCContextResponse;
-import org.onap.pomba.contextbuilder.sdc.model.handlers.ToscaCsarArtifactHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class SpringServiceImpl implements SpringService {
-
- private static Logger log = LoggerFactory.getLogger(SpringService.class);
-
-
- @Autowired
- protected ToscaCsarArtifactHandler toscaCsarArtifactHandler;
-
- @Autowired
- private String httpBasicAuthorization;
-
- @Override
- public SDCContextResponse getModelData(SDCContextRequest ctxRequest) throws ToscaCsarException {
-
- LoggingUtil.initMdc(ctxRequest.getTransactionId(), ctxRequest.getFromAppId(), ctxRequest.getRemoteAddr());
- SDCContextResponse sdcContextResponse = null;
- try {
- ctxRequest.validate(httpBasicAuthorization);
- sdcContextResponse = toscaCsarArtifactHandler.getToscaModel(ctxRequest.getModelVersionId());
- } catch (ToscaCsarException e) {
- log.error(e.getStatus().getStatusCode() + " " + e.getStatus()+ ", Reason: " + e.getMessage());
- sdcContextResponse = new SDCContextResponse(e.getStatus(), e.getMessage());
- } finally {
- LoggingUtil.closeMdc();
- }
- return sdcContextResponse;
-
- }
-
-
+/* + * ============LICENSE_START=================================================== + * Copyright (c) 2018 Amdocs + * ============================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END===================================================== + */ +package org.onap.pomba.contextbuilder.sdc.service; + +import org.onap.pomba.contextbuilder.sdc.exception.ToscaCsarException; +import org.onap.pomba.contextbuilder.sdc.logging.LoggingUtil; +import org.onap.pomba.contextbuilder.sdc.model.SDCContextRequest; +import org.onap.pomba.contextbuilder.sdc.model.SDCContextResponse; +import org.onap.pomba.contextbuilder.sdc.model.handlers.ToscaCsarArtifactHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class SpringServiceImpl implements SpringService { + + private static Logger log = LoggerFactory.getLogger(SpringService.class); + + + @Autowired + protected ToscaCsarArtifactHandler toscaCsarArtifactHandler; + + @Autowired + private String httpBasicAuthorization; + + @Override + public SDCContextResponse getModelData(SDCContextRequest ctxRequest) throws ToscaCsarException { + + LoggingUtil.initMdc(ctxRequest.getTransactionId(), ctxRequest.getFromAppId(), ctxRequest.getRemoteAddr()); + SDCContextResponse sdcContextResponse = null; + try { + ctxRequest.validate(httpBasicAuthorization); + sdcContextResponse = toscaCsarArtifactHandler.getToscaModel(ctxRequest.getModelVersionId(), ctxRequest.getServiceInstanceId()); + } catch (ToscaCsarException e) { + log.error(e.getStatus().getStatusCode() + " " + e.getStatus()+ ", Reason: " + e.getMessage()); + sdcContextResponse = new SDCContextResponse(e.getStatus(), e.getMessage()); + } finally { + LoggingUtil.closeMdc(); + } + return sdcContextResponse; + + } + + }
\ No newline at end of file diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdc/service/rs/RestService.java b/src/main/java/org/onap/pomba/contextbuilder/sdc/service/rs/RestService.java index ea0ae0d..91a3569 100644 --- a/src/main/java/org/onap/pomba/contextbuilder/sdc/service/rs/RestService.java +++ b/src/main/java/org/onap/pomba/contextbuilder/sdc/service/rs/RestService.java @@ -1,60 +1,60 @@ -/*
- * ============LICENSE_START===================================================
- * Copyright (c) 2018 Amdocs
- * ============================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=====================================================
- */
-package org.onap.pomba.contextbuilder.sdc.service.rs;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import org.onap.pomba.contextbuilder.sdc.exception.ToscaCsarException;
-
-
-@Api
-@Path("/service")
-@Produces({MediaType.APPLICATION_JSON})
-public interface RestService {
-
-
- @GET
- @Path("/context")
- @Produces({ MediaType.APPLICATION_JSON })
- @ApiOperation(
- value = "Retrieve SDC CSAR file for a give UUID",
- notes = "This method returns SDC CSAR encoded value. ",
- response = Response.class)
- @ApiResponses(value = {
- @ApiResponse(code = 404, message = "Service not available"),
- @ApiResponse(code = 400, message = "Bad request"),
- @ApiResponse(code = 401, message = "Unauthorized"),
- @ApiResponse(code = 500, message = "Unexpected Runtime error") })
- public Response getContext(
- @HeaderParam("Authorization") String authorization,
- @HeaderParam("X-FromAppId") String xFromAppId,
- @HeaderParam("X-TransactionId") String xTransactionId,
- @QueryParam("serviceInstanceId") String serviceInstanceId,
- @QueryParam("modelVersionId") String modelVersionId,
- @QueryParam("modelInvariantId") String modelInvariantId
- ) throws ToscaCsarException;
+/* + * ============LICENSE_START=================================================== + * Copyright (c) 2018 Amdocs + * ============================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END===================================================== + */ +package org.onap.pomba.contextbuilder.sdc.service.rs; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import javax.ws.rs.GET; +import javax.ws.rs.HeaderParam; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import org.onap.pomba.contextbuilder.sdc.exception.ToscaCsarException; + + +@Api +@Path("{version: v2}/service") +@Produces({MediaType.APPLICATION_JSON}) +public interface RestService { + + + @GET + @Path("/context") + @Produces({ MediaType.APPLICATION_JSON }) + @ApiOperation( + value = "Retrieve SDC CSAR file for a give UUID", + notes = "This method returns SDC CSAR encoded value. ", + response = Response.class) + @ApiResponses(value = { + @ApiResponse(code = 404, message = "Service not available"), + @ApiResponse(code = 400, message = "Bad request"), + @ApiResponse(code = 401, message = "Unauthorized"), + @ApiResponse(code = 500, message = "Unexpected Runtime error") }) + public Response getContext( + @HeaderParam("Authorization") String authorization, + @HeaderParam("X-FromAppId") String xFromAppId, + @HeaderParam("X-TransactionId") String xTransactionId, + @QueryParam("serviceInstanceId") String serviceInstanceId, + @QueryParam("modelVersionId") String modelVersionId, + @QueryParam("modelInvariantId") String modelInvariantId + ) throws ToscaCsarException; }
\ No newline at end of file |