From: Fiete Ostkamp Date: Tue, 17 Jun 2025 07:37:40 +0000 (+0200) Subject: Upgrade to spring boot 2.3 X-Git-Tag: 1.14.0~1 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=12ca116cc26a481cf643d5cd73f9211314c23179;p=sdc%2Fsdc-workflow-designer.git Upgrade to spring boot 2.3 - update spring boot (2.2.13 -> 2.3.12) - update sdc-be-common (1.10.0 -> 1.11.0) Issue-ID: SDC-4744 Change-Id: Icaf66f42cdef44b457ac5c62f83796618398608a Signed-off-by: Fiete Ostkamp --- diff --git a/sdc-workflow-designer-be/pom.xml b/sdc-workflow-designer-be/pom.xml index af5dbdee..408a59c9 100644 --- a/sdc-workflow-designer-be/pom.xml +++ b/sdc-workflow-designer-be/pom.xml @@ -14,18 +14,17 @@ - 2.2.13.RELEASE + 2.3.12.RELEASE Hoxton.SR12 - 5.2.23.RELEASE 1.5.3.Final - 1.18.26 + 1.18.38 3.0.0 2.3.0 4.0.2 - 3.7.7 + 3.12.4 2.0.0.RELEASE 1.0.2 - 1.10.0 + 1.11.0 5.9.1 1.9.0 3.1.10 @@ -104,6 +103,7 @@ org.springframework.boot spring-boot-starter-validation + 2.5.15 org.springframework.boot @@ -188,7 +188,6 @@ org.apache.httpcomponents httpclient - 4.5.13 commons-codec @@ -235,7 +234,6 @@ commons-codec commons-codec - 1.15 org.onap.sdc.sdc-be-common @@ -359,7 +357,6 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.2 maven-antrun-plugin diff --git a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/ActivitySpecController.java b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/ActivitySpecController.java index ac72d46e..3f06f3b6 100644 --- a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/ActivitySpecController.java +++ b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/ActivitySpecController.java @@ -34,7 +34,6 @@ import org.onap.sdc.workflow.api.types.activityspec.ActivitySpecRequest; import org.onap.sdc.workflow.api.types.activityspec.ActivitySpecResponse; import org.onap.sdc.workflow.persistence.types.ActivitySpecEntity; import org.onap.sdc.workflow.services.ActivitySpecManager; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -57,7 +56,6 @@ public class ActivitySpecController { private final ActivitySpecManager activitySpecManager; private final ActivitySpecDtoMapper activitySpecDtoMapper; - @Autowired public ActivitySpecController(@Qualifier("activitySpecManager") ActivitySpecManager activitySpecManager, ActivitySpecDtoMapper activitySpecDtoMapper) { this.activitySpecManager = activitySpecManager; @@ -89,7 +87,7 @@ public class ActivitySpecController { @ApiOperation(value = "Get Activity Spec") @ApiImplicitParam(name = USER_ID_HEADER, required = true, dataType = "string", paramType = "header") public ActivitySpecDataResponse get(@ApiParam(value = "Activity Spec Id") @PathVariable("id") String activitySpecId, - @ApiParam(value = "Version Id", defaultValue = VERSION_ID_DEFAULT_VALUE) @PathVariable("versionId") + @ApiParam(value = "Version Id", defaultValue = VERSION_ID_DEFAULT_VALUE) @PathVariable String versionId) { return activitySpecDtoMapper.toActivitySpecDataResponse( activitySpecManager.get(new ActivitySpecEntity(activitySpecId, versionId))); @@ -100,7 +98,7 @@ public class ActivitySpecController { @ApiImplicitParam(name = USER_ID_HEADER, required = true, dataType = "string", paramType = "header") public void update(@Valid @RequestBody ActivitySpecRequest request, @ApiParam(value = "Activity Spec Id") @PathVariable("id") String activitySpecId, - @ApiParam(value = "Version Id", defaultValue = VERSION_ID_DEFAULT_VALUE) @PathVariable("versionId") + @ApiParam(value = "Version Id", defaultValue = VERSION_ID_DEFAULT_VALUE) @PathVariable String versionId) { ActivitySpecEntity activitySpec = activitySpecDtoMapper.fromActivitySpecRequest(request); activitySpec.setId(activitySpecId); @@ -116,7 +114,7 @@ public class ActivitySpecController { @ApiImplicitParam(name = USER_ID_HEADER, required = true, dataType = "string", paramType = "header") public void actOn(@Valid @RequestBody ActivitySpecActionRequest request, @ApiParam(value = "Activity Spec Id") @PathVariable("id") String activitySpecId, - @ApiParam(value = "Version Id", defaultValue = VERSION_ID_DEFAULT_VALUE) @PathVariable("versionId") + @ApiParam(value = "Version Id", defaultValue = VERSION_ID_DEFAULT_VALUE) @PathVariable String versionId) { activitySpecManager .actOnAction(new ActivitySpecEntity(activitySpecId, versionId), request.getAction()); diff --git a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/ArtifactAssociationService.java b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/ArtifactAssociationService.java index 2b24577a..988165b5 100644 --- a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/ArtifactAssociationService.java +++ b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/ArtifactAssociationService.java @@ -50,7 +50,6 @@ import org.apache.http.ssl.SSLContexts; import org.onap.sdc.workflow.api.types.dto.ArtifactDeliveriesRequestDto; import org.onap.sdc.workflow.persistence.types.ArtifactEntity; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.http.*; @@ -96,7 +95,6 @@ public class ArtifactAssociationService { } - @Autowired public ArtifactAssociationService(RestTemplateBuilder builder, @Value("${server.ssl.trust-store}") String truststorePath, diff --git a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowController.java b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowController.java index ff06f828..e829f4ad 100644 --- a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowController.java +++ b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowController.java @@ -22,12 +22,14 @@ import static org.onap.sdc.workflow.api.RestParams.SORT; import static org.onap.sdc.workflow.services.types.PagingConstants.DEFAULT_LIMIT; import static org.onap.sdc.workflow.services.types.PagingConstants.DEFAULT_OFFSET; +import javax.validation.Valid; + import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import javax.validation.Valid; +// import javax.validation.Valid; import org.onap.sdc.workflow.api.types.Paging; import org.onap.sdc.workflow.api.types.Sorting; import org.onap.sdc.workflow.api.types.VersionStatesFormatter; @@ -41,7 +43,6 @@ import org.onap.sdc.workflow.services.types.PagingRequest; import org.onap.sdc.workflow.services.types.RequestSpec; import org.onap.sdc.workflow.services.types.SortingRequest; import org.onap.sdc.workflow.services.types.Workflow; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -57,6 +58,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; +@Validated @RequestMapping("/wf/workflows") @Api("Workflows") @RestController("workflowController") @@ -65,7 +67,6 @@ public class WorkflowController { private final WorkflowManager workflowManager; private final WorkflowVersionManager workflowVersionManager; - @Autowired public WorkflowController(@Qualifier("workflowManager") WorkflowManager workflowManager, @Qualifier("workflowVersionManager") WorkflowVersionManager workflowVersionManager) { this.workflowManager = workflowManager; @@ -101,9 +102,9 @@ public class WorkflowController { @GetMapping(path = "/{workflowId}") @ApiOperation("Get workflow") - public Workflow get(@PathVariable("workflowId") String workflowId, + public Workflow get(@PathVariable String workflowId, @ApiParam(value = "Expand workflow data", allowableValues = "versions") - @RequestParam(value = "expand", required = false) String expand, @UserId String user) { + @RequestParam(required = false) String expand, @UserId String user) { Workflow workflow = new Workflow(); workflow.setId(workflowId); Workflow retrievedWorkflow = workflowManager.get(workflow); @@ -115,7 +116,7 @@ public class WorkflowController { @PutMapping(path = "/{workflowId}", consumes = MediaType.APPLICATION_JSON_VALUE) @ApiOperation("Update workflow") - public Workflow update(@RequestBody Workflow workflow, @PathVariable("workflowId") String workflowId, + public Workflow update(@RequestBody Workflow workflow, @PathVariable String workflowId, @UserId String user) { workflow.setId(workflowId); workflowManager.update(workflow); @@ -124,7 +125,7 @@ public class WorkflowController { @PostMapping(path = "/{workflowId}/archiving", consumes = MediaType.APPLICATION_JSON_VALUE) @ApiOperation("Update workflow status") - public ResponseEntity updateStatus(@RequestBody @Valid WorkflowStatusDto request, @PathVariable("workflowId") String workflowId, + public ResponseEntity updateStatus(@RequestBody @Valid WorkflowStatusDto request, @PathVariable String workflowId, @UserId String user) { workflowManager.updateStatus(workflowId, ArchivingStatus.valueOf(request.getStatus())); return new ResponseEntity(HttpStatus.OK); diff --git a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowVersionController.java b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowVersionController.java index 213cd713..1f74627c 100644 --- a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowVersionController.java +++ b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/WorkflowVersionController.java @@ -32,7 +32,6 @@ import org.onap.sdc.workflow.persistence.types.ArtifactEntity; import org.onap.sdc.workflow.services.WorkflowVersionManager; import org.onap.sdc.workflow.services.annotations.UserId; import org.onap.sdc.workflow.services.types.WorkflowVersion; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.io.InputStreamResource; import org.springframework.core.io.Resource; @@ -61,7 +60,6 @@ public class WorkflowVersionController { private final WorkflowVersionDtoMapper versionDtoMapper; private final ArtifactAssociationService associationHandler; - @Autowired public WorkflowVersionController(@Qualifier("workflowVersionManager") WorkflowVersionManager versionManager, WorkflowVersionDtoMapper versionDtoMapper, @Qualifier("ArtifactAssociationHandler") ArtifactAssociationService artifactAssociationHandler) { @@ -74,7 +72,7 @@ public class WorkflowVersionController { @ApiOperation("List workflow versions") @ApiImplicitParam(name = "state", dataType = "string", paramType = "query", allowableValues = "DRAFT,CERTIFIED", value = "Filter by state") - public CollectionResponse list(@PathVariable("workflowId") String workflowId, + public CollectionResponse list(@PathVariable String workflowId, @ApiIgnore VersionStatesFormatter stateFilter, @UserId String user) { return new CollectionResponse<>(versionManager.list(workflowId, stateFilter.getVersionStates()).stream() .map(versionDtoMapper::workflowVersionToResponse) @@ -84,8 +82,8 @@ public class WorkflowVersionController { @PostMapping @ApiOperation("Create workflow version") public ResponseEntity create(@RequestBody @Valid WorkflowVersionRequest request, - @PathVariable("workflowId") String workflowId, - @RequestParam(value = "baseVersionId", required = false) String baseVersionId, @UserId String user) { + @PathVariable String workflowId, + @RequestParam(required = false) String baseVersionId, @UserId String user) { WorkflowVersionResponse createdVersion = versionDtoMapper.workflowVersionToResponse( versionManager.create(workflowId, baseVersionId, versionDtoMapper.requestToWorkflowVersion(request))); return new ResponseEntity<>(createdVersion, HttpStatus.CREATED); @@ -93,15 +91,15 @@ public class WorkflowVersionController { @GetMapping("/{versionId}") @ApiOperation("Get workflow version") - public WorkflowVersionResponse get(@PathVariable("workflowId") String workflowId, - @PathVariable("versionId") String versionId, @UserId String user) { + public WorkflowVersionResponse get(@PathVariable String workflowId, + @PathVariable String versionId, @UserId String user) { return versionDtoMapper.workflowVersionToResponse(versionManager.get(workflowId, versionId)); } @PutMapping("/{versionId}") @ApiOperation("Update workflow version") public void update(@RequestBody @Valid WorkflowVersionRequest request, - @PathVariable("workflowId") String workflowId, @PathVariable("versionId") String versionId, + @PathVariable String workflowId, @PathVariable String versionId, @UserId String user) { WorkflowVersion version = versionDtoMapper.requestToWorkflowVersion(request); version.setId(versionId); @@ -110,15 +108,15 @@ public class WorkflowVersionController { @GetMapping("/{versionId}/state") @ApiOperation("Get workflow version state") - public VersionStateDto getState(@PathVariable("workflowId") String workflowId, - @PathVariable("versionId") String versionId, @UserId String user) { + public VersionStateDto getState(@PathVariable String workflowId, + @PathVariable String versionId, @UserId String user) { return new VersionStateDto(versionManager.getState(workflowId, versionId)); } @PostMapping("/{versionId}/state") @ApiOperation("Update workflow version state") public VersionStateDto updateState(@RequestBody VersionStateDto state, - @PathVariable("workflowId") String workflowId, @PathVariable("versionId") String versionId, + @PathVariable String workflowId, @PathVariable String versionId, @UserId String user) { versionManager.updateState(workflowId, versionId, state.getName()); return new VersionStateDto(state.getName()); @@ -127,7 +125,7 @@ public class WorkflowVersionController { @PostMapping("/{versionId}/artifact-deliveries") @ApiOperation("upload of artifact to VF operation workflow") public ResponseEntity artifactDeliveries(@RequestBody ArtifactDeliveriesRequestDto deliveriesRequestDto, - @PathVariable("workflowId") String workflowId, @PathVariable("versionId") String versionId, + @PathVariable String workflowId, @PathVariable String versionId, @UserId String user) { return associationHandler .execute(user, deliveriesRequestDto, versionManager.getArtifact(workflowId, versionId)); @@ -135,15 +133,15 @@ public class WorkflowVersionController { @PutMapping("/{versionId}/artifact") @ApiOperation("Create/update artifact of a version") - public void uploadArtifact(@RequestBody MultipartFile fileToUpload, @PathVariable("workflowId") String workflowId, - @PathVariable("versionId") String versionId, @UserId String user) { + public void uploadArtifact(@RequestBody MultipartFile fileToUpload, @PathVariable String workflowId, + @PathVariable String versionId, @UserId String user) { versionManager.uploadArtifact(workflowId, versionId, fileToUpload); } @GetMapping("/{versionId}/artifact") @ApiOperation("Download workflow version artifact") - public ResponseEntity getArtifact(@PathVariable("workflowId") String workflowId, - @PathVariable("versionId") String versionId, @UserId String user) { + public ResponseEntity getArtifact(@PathVariable String workflowId, + @PathVariable String versionId, @UserId String user) { ArtifactEntity artifact = versionManager.getArtifact(workflowId, versionId); return ResponseEntity.ok() @@ -154,8 +152,8 @@ public class WorkflowVersionController { @DeleteMapping("/{versionId}/artifact") @ApiOperation("Delete workflow version artifact") - public void deleteArtifact(@PathVariable("workflowId") String workflowId, - @PathVariable("versionId") String versionId, @UserId String user) { + public void deleteArtifact(@PathVariable String workflowId, + @PathVariable String versionId, @UserId String user) { versionManager.deleteArtifact(workflowId, versionId); } } diff --git a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/impl/ActivitySpecRepositoryImpl.java b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/impl/ActivitySpecRepositoryImpl.java index b304f900..f35a95d2 100644 --- a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/impl/ActivitySpecRepositoryImpl.java +++ b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/impl/ActivitySpecRepositoryImpl.java @@ -35,7 +35,6 @@ import org.onap.sdc.workflow.persistence.impl.types.ActivitySpecElementType; import org.onap.sdc.workflow.persistence.types.ActivitySpecEntity; import org.onap.sdc.workflow.services.ActivitySpecConstant; import org.onap.sdc.workflow.services.utilities.JsonUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @Repository @@ -44,7 +43,6 @@ public class ActivitySpecRepositoryImpl implements ActivitySpecRepository { private final ZusammenAdaptor zusammenAdaptor; private final ZusammenSessionContextCreator contextCreator; - @Autowired public ActivitySpecRepositoryImpl(ZusammenAdaptor zusammenAdaptor, ZusammenSessionContextCreator contextCreator) { this.zusammenAdaptor = zusammenAdaptor; this.contextCreator = contextCreator; diff --git a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/impl/ArtifactRepositoryImpl.java b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/impl/ArtifactRepositoryImpl.java index 4ad54614..9fd9e76b 100644 --- a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/impl/ArtifactRepositoryImpl.java +++ b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/impl/ArtifactRepositoryImpl.java @@ -34,7 +34,6 @@ import org.onap.sdc.common.zusammen.services.ZusammenAdaptor; import org.onap.sdc.workflow.persistence.ArtifactRepository; import org.onap.sdc.workflow.persistence.impl.types.WorkflowElementType; import org.onap.sdc.workflow.persistence.types.ArtifactEntity; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @Repository @@ -46,7 +45,6 @@ public class ArtifactRepositoryImpl implements ArtifactRepository { private final ZusammenAdaptor zusammenAdaptor; private final ZusammenSessionContextCreator contextCreator; - @Autowired public ArtifactRepositoryImpl(ZusammenAdaptor zusammenAdaptor, ZusammenSessionContextCreator contextCreator) { this.zusammenAdaptor = zusammenAdaptor; this.contextCreator = contextCreator; diff --git a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/impl/ParameterRepositoryImpl.java b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/impl/ParameterRepositoryImpl.java index eeef2477..b9bf4eb5 100644 --- a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/impl/ParameterRepositoryImpl.java +++ b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/persistence/impl/ParameterRepositoryImpl.java @@ -38,7 +38,6 @@ import org.onap.sdc.workflow.persistence.impl.types.WorkflowElementType; import org.onap.sdc.workflow.persistence.types.ParameterEntity; import org.onap.sdc.workflow.persistence.types.ParameterRole; import org.onap.sdc.workflow.persistence.types.ParameterType; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @Repository @@ -47,7 +46,6 @@ public class ParameterRepositoryImpl implements ParameterRepository { private final ZusammenAdaptor zusammenAdaptor; private final ZusammenSessionContextCreator contextCreator; - @Autowired public ParameterRepositoryImpl(ZusammenAdaptor zusammenAdaptor, ZusammenSessionContextCreator contextCreator) { this.zusammenAdaptor = zusammenAdaptor; this.contextCreator = contextCreator; diff --git a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/ApplicationConfigurer.java b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/ApplicationConfigurer.java index a5cce460..4f03b62f 100644 --- a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/ApplicationConfigurer.java +++ b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/ApplicationConfigurer.java @@ -22,7 +22,6 @@ package org.onap.sdc.workflow.server.config; import java.util.List; import org.onap.sdc.workflow.server.resolvers.UserIdResolver; import org.openecomp.sdc.logging.servlet.spring.LoggingInterceptor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; @@ -33,7 +32,6 @@ public class ApplicationConfigurer implements WebMvcConfigurer { private final LoggingInterceptor loggingInterceptor; - @Autowired public ApplicationConfigurer(LoggingInterceptor loggingInterceptor) { this.loggingInterceptor = loggingInterceptor; } diff --git a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/WorkflowZusammenConfigProvider.java b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/WorkflowZusammenConfigProvider.java index dbd2d6de..ccd55b67 100644 --- a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/WorkflowZusammenConfigProvider.java +++ b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/WorkflowZusammenConfigProvider.java @@ -38,11 +38,11 @@ public class WorkflowZusammenConfigProvider implements ZusammenConfigProvider { private String cassandraPassword; @Value("${zusammen.cassandra.isAuthenticate}") private String cassandraAuth; - @Value("${spring.data.cassandra.ssl}") - private String cassandraSSL; + private String cassandraSSL = "false"; @Value("${zusammen.cassandra.trustStorePath}") private String cassandraTrustStorePath; @Value("${zusammen.cassandra.trustStorePassword}") private String cassandraTrustStorePassword; -} \ No newline at end of file + +} diff --git a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/filters/SessionContextFilter.java b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/filters/SessionContextFilter.java index 57cda856..f29d1b20 100644 --- a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/filters/SessionContextFilter.java +++ b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/filters/SessionContextFilter.java @@ -25,7 +25,6 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import org.onap.sdc.common.session.SessionContextProvider; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @@ -36,7 +35,6 @@ public class SessionContextFilter implements Filter { @Value("${spring.data.cassandra.keyspace-name}") private String tenant; - @Autowired public SessionContextFilter(SessionContextProvider sessionContextProvider) { this.sessionContextProvider = sessionContextProvider; } diff --git a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/UniqueValueService.java b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/UniqueValueService.java index 0a789829..4e57acb6 100644 --- a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/UniqueValueService.java +++ b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/UniqueValueService.java @@ -21,7 +21,6 @@ import org.apache.commons.lang3.ArrayUtils; import org.onap.sdc.workflow.persistence.UniqueValueRepository; import org.onap.sdc.workflow.persistence.types.UniqueValueEntity; import org.onap.sdc.workflow.services.exceptions.UniqueValueViolationException; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service("uniqueValueService") @@ -31,7 +30,6 @@ public class UniqueValueService { private final UniqueValueRepository uniqueValueRepository; - @Autowired public UniqueValueService(UniqueValueRepository uniqueValueRepository) { this.uniqueValueRepository = uniqueValueRepository; } diff --git a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/ActivitySpecManagerImpl.java b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/ActivitySpecManagerImpl.java index e1849b9f..bef37826 100644 --- a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/ActivitySpecManagerImpl.java +++ b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/ActivitySpecManagerImpl.java @@ -48,7 +48,6 @@ import org.onap.sdc.workflow.services.exceptions.VersionStatusModificationExcept import org.onap.sdc.workflow.services.impl.mappers.ActivitySpecMapper; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @@ -73,7 +72,6 @@ public class ActivitySpecManagerImpl implements ActivitySpecManager { private final ActivitySpecMapper activitySpecMapper; - @Autowired public ActivitySpecManagerImpl(ItemManager itemManager, VersioningManager versioningManager, ActivitySpecRepository activitySpecDao, @Qualifier("uniqueValueService") UniqueValueService uniqueValueService, diff --git a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImpl.java b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImpl.java index fc135621..ab16cc77 100644 --- a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImpl.java +++ b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowManagerImpl.java @@ -48,7 +48,6 @@ import org.onap.sdc.workflow.services.types.Workflow; import org.onap.sdc.workflow.services.types.WorkflowVersionState; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @@ -71,7 +70,6 @@ public class WorkflowManagerImpl implements WorkflowManager { private final ArchivingStatusMapper archivingStatusMapper; private final VersionStateMapper versionStateMapper; - @Autowired public WorkflowManagerImpl(ItemManager itemManager, @Qualifier("uniqueValueService") UniqueValueService uniqueValueService, WorkflowMapper workflowMapper, ArchivingStatusMapper archivingStatusMapper, VersionStateMapper versionStateMapper) { diff --git a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowVersionManagerImpl.java b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowVersionManagerImpl.java index f95e6a1f..c989131b 100644 --- a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowVersionManagerImpl.java +++ b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/impl/WorkflowVersionManagerImpl.java @@ -55,7 +55,6 @@ import org.onap.sdc.workflow.services.types.WorkflowVersion; import org.onap.sdc.workflow.services.types.WorkflowVersionState; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; @@ -72,7 +71,6 @@ public class WorkflowVersionManagerImpl implements WorkflowVersionManager { private final VersionStateMapper versionStateMapper; private static final Logger LOGGER = LoggerFactory.getLogger(WorkflowVersionManagerImpl.class); - @Autowired public WorkflowVersionManagerImpl(VersioningManager versioningManager, ArtifactRepository artifactRepository, VersionMapper versionMapper, VersionStateMapper versionStateMapper, ItemManager itemManager, ParameterRepository parameterRepository) { diff --git a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/types/Workflow.java b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/types/Workflow.java index fcac779f..91329c03 100644 --- a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/types/Workflow.java +++ b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/services/types/Workflow.java @@ -22,6 +22,8 @@ import static org.onap.sdc.workflow.services.types.WorkflowValidationConstants.M import java.util.Collection; import java.util.Set; + +import javax.validation.Valid; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; @@ -29,6 +31,7 @@ import lombok.Data; @Data +@Valid public class Workflow { private String id; diff --git a/sdc-workflow-designer-be/src/main/resources/application.properties b/sdc-workflow-designer-be/src/main/resources/application.properties index 924cc2a3..1afdc730 100644 --- a/sdc-workflow-designer-be/src/main/resources/application.properties +++ b/sdc-workflow-designer-be/src/main/resources/application.properties @@ -38,11 +38,13 @@ spring.data.cassandra.keyspace-name=workflow spring.data.cassandra.port=${CS_PORT:9042} spring.data.cassandra.username=${CS_USER:} spring.data.cassandra.password=${CS_PASSWORD:} +spring.data.cassandra.local-datacenter=${CS_DATACENTER:datacenter1} zusammen.cassandra.isAuthenticate=${CS_AUTHENTICATE:false} spring.data.cassandra.ssl=${CS_SSL_ENABLED:false} zusammen.cassandra.trustStorePath=${CS_TRUST_STORE_PATH:} zusammen.cassandra.trustStorePassword=${CS_TRUST_STORE_PASSWORD:} -spring.data.cassandra.jmx-enabled=false +# This property is deprecated: Cassandra no longer provides JMX metrics. +# spring.data.cassandra.jmx-enabled=false #Actuators management.endpoint.health.show-details=always