From 5331679f69f3cbe03a2ce829080cabb02bb236cb Mon Sep 17 00:00:00 2001 From: kagw95 Date: Thu, 5 Mar 2026 13:42:01 +0400 Subject: [PATCH 01/29] feat: Spring Boot upgrade from 2.7.18 to 3.3.13, plus upgrade of extra related dependencies - initial commit. Some CheckStyle errors/warns are fixed. --- .github/deploy_templates/values-dev.yaml | 2 +- atp-dataset-benchmarks/pom.xml | 18 ++ atp-dataset-common/pom.xml | 5 + .../qubership/atp/dataset/utils/Utils.java | 6 +- atp-dataset-distribution/pom.xml | 8 + atp-dataset-import/pom.xml | 8 + .../dataset/migration/ChildDsImporter.java | 2 +- .../atp/dataset/migration/DsRow.java | 4 +- .../dataset/migration/ParentDsImporter.java | 8 +- .../dataset/migration/SheetDataIterator.java | 4 +- .../dataset/migration/apply/CreateParam.java | 2 +- .../atp/dataset/migration/apply/Overlap.java | 2 +- .../atp/dataset/migration/apply/SetParam.java | 2 +- .../migration/config/MigrationConfig.java | 2 +- .../formula/ExcelFormulasEvaluator.java | 8 +- .../migration/formula/parsers/DateParser.java | 4 +- .../parsers/InternalReferenceParser.java | 2 +- .../formula/parsers/RandomExcelParser.java | 2 +- .../formula/parsers/RegexpFormulaAdapter.java | 4 +- .../migration/model/ExcelEvaluator.java | 15 +- .../migration/model/FalloutReport.java | 2 +- .../migration/model/ImportResources.java | 6 +- .../migration/model/ParameterData.java | 4 +- .../atp/dataset/migration/model/Settings.java | 4 +- .../atp/dataset/migration/model/ToCreate.java | 2 +- .../dataset/migration/model/ToOverlap.java | 2 +- .../migration/repo/DsServicesFacade.java | 2 +- .../repo/OrderedAttributeRepository.java | 6 +- .../migration/DataSetImporterTest.java | 25 +- .../dataset/migration/ExcelFormulasTest.java | 10 +- .../atp/dataset/migration/ExcelTest.java | 9 +- .../dataset/migration/ImportDTFilesTest.java | 10 +- atp-dataset-migration/pom.xml | 15 +- .../src/main/config/application.properties | 3 + .../db/migration/LiquibaseFactory.java | 3 - .../atp/dataset/db/migration/Main.java | 3 +- .../dataset/db/migration/MigrationRunner.java | 70 +++-- .../atp/dataset/db/migration/Utils.java | 2 +- .../classloader/ChildClassLoader.java | 2 +- .../classloader/ParentLastClassloader.java | 9 +- .../db/migration/config/DbConfiguration.java | 2 + .../task/ListValueCustomChange.java | 7 +- .../src/main/resources/application.properties | 3 + .../src/test/java/TestSample.java | 7 +- .../db/migration/MigrationRunnerTest.java | 10 +- .../ParentLastClassloaderTest.java | 3 +- .../v1/health-check-controller-v1.yaml | 1 - atp-dataset-q-classes-generation/pom.xml | 2 +- atp-dataset/pom.xml | 240 ++++++------------ .../src/main/config/application.properties | 8 +- .../atp/dataset/config/AtpSwaggerConfig.java | 8 +- .../atp/dataset/config/DbConfiguration.java | 2 + .../config/DsSecurityConfiguration.java | 60 ++--- .../atp/dataset/config/HttpsConfig.java | 9 +- .../dataset/config/KafkaConfiguration.java | 20 +- .../dataset/config/ServiceConfiguration.java | 2 +- .../dataset/config/SpringLiquibaseConfig.java | 5 +- .../interceptors/SimpleCorsRequestFilter.java | 16 +- .../dataset/db/AttributePathRepository.java | 8 +- .../atp/dataset/db/AttributeRepository.java | 8 +- .../atp/dataset/db/CacheRepository.java | 4 +- .../atp/dataset/db/DataSetListRepository.java | 8 +- .../dataset/db/DataSetListTreeRepository.java | 8 +- .../atp/dataset/db/DataSetRepository.java | 8 +- .../atp/dataset/db/FilterRepository.java | 2 - .../atp/dataset/db/GridFsRepositoryImpl.java | 4 +- .../atp/dataset/db/IdentifiedCache.java | 4 +- .../atp/dataset/db/LabelRepository.java | 6 +- .../atp/dataset/db/ListValueRepository.java | 8 +- .../atp/dataset/db/ParameterRepository.java | 6 +- .../atp/dataset/db/TestPlanRepository.java | 8 +- .../dataset/db/VisibilityAreaRepository.java | 8 +- .../atp/dataset/db/dto/AttributePathDto.java | 2 +- .../atp/dataset/db/dto/ParameterDataDto.java | 2 +- .../atp/dataset/db/dto/ParameterDto.java | 2 +- .../dataset/db/jdbc/JdbcTemplatesImpl.java | 2 + .../dataset/db/jpa/JaversSnapshotService.java | 2 - .../atp/dataset/db/jpa/JobRunner.java | 2 - .../atp/dataset/db/jpa/ModelsProvider.java | 14 +- .../qubership/atp/dataset/db/jpa/Wrapper.java | 4 +- .../jpa/entities/AbstractAttributeEntity.java | 18 +- .../jpa/entities/AbstractUuidBasedEntity.java | 19 +- .../db/jpa/entities/AttributeEntity.java | 14 +- .../db/jpa/entities/AttributeKeyEntity.java | 18 +- .../db/jpa/entities/AttributeTypeEntity.java | 12 +- .../db/jpa/entities/AttributesSortType.java | 2 +- .../db/jpa/entities/DataSetEntity.java | 20 +- .../db/jpa/entities/DataSetListEntity.java | 24 +- .../dataset/db/jpa/entities/FilterEntity.java | 14 +- .../db/jpa/entities/JvCommitEntity.java | 8 +- .../jpa/entities/JvCommitPropertyEntity.java | 8 +- .../db/jpa/entities/JvCommitPropertyId.java | 4 +- .../db/jpa/entities/JvGlobalIdEntity.java | 8 +- .../db/jpa/entities/JvSnapshotEntity.java | 12 +- .../dataset/db/jpa/entities/LabelEntity.java | 14 +- .../db/jpa/entities/ListValueEntity.java | 14 +- .../db/jpa/entities/ParameterEntity.java | 16 +- .../db/jpa/entities/TestPlanEntity.java | 14 +- .../db/jpa/entities/UserSettingsEntity.java | 8 +- .../db/jpa/entities/VisibilityAreaEntity.java | 12 +- .../repositories/JpaAttributeRepository.java | 17 +- .../repositories/JpaListValueRepository.java | 2 +- .../repositories/JpaParameterRepository.java | 11 +- .../db/utils/IdentifiedCacheDelegate.java | 4 +- .../atp/dataset/db/utils/Proxies.java | 4 +- .../db/utils/StrongIdentifiedCache.java | 4 +- .../dataset/db/utils/WeakIdentifiedCache.java | 6 +- .../atp/dataset/ei/DataSetExportExecutor.java | 30 +-- .../ei/service/DataSetAttributesImporter.java | 13 +- .../ei/service/DataSetListImporter.java | 7 +- .../ei/service/DataSetParametersImporter.java | 6 +- .../dataset/ei/service/DataSetsImporter.java | 4 +- .../ei/service/EntityManagerController.java | 4 +- .../attribute/AttributeExistsException.java | 4 +- .../attribute/AttributeTypeException.java | 4 +- .../dataset/DataSetExistsException.java | 4 +- .../dataset/DataSetLockedException.java | 2 +- .../DataSetListExistsException.java | 4 +- ...elExportNotExistDatasetListlException.java | 4 +- .../excel/ExcelExportUnexpectedException.java | 4 +- ...elImportNotExistingAttributeException.java | 4 +- ...ortNotExistingChildAttributeException.java | 4 +- ...mportNotExistingRefParameterException.java | 4 +- .../excel/ExcelImportUnexpectedException.java | 4 +- ...tExcelNotEqualsAttributeTypeException.java | 4 +- ...celNotSupportedAttributeTypeException.java | 4 +- .../exception/file/FileDsUploadException.java | 4 +- .../FileExcelExportNotFoundException.java | 4 +- .../handlers/project/ProjectEventHandler.java | 4 +- .../atp/dataset/macros/EvalContextImpl.java | 12 +- .../atp/dataset/macros/EvaluationContext.java | 4 +- .../atp/dataset/macros/MacroRegistry.java | 2 +- .../atp/dataset/macros/MacroRegistryImpl.java | 4 +- .../qubership/atp/dataset/macros/Macros.java | 2 +- .../atp/dataset/macros/args/ArgSignature.java | 2 +- .../dataset/macros/args/ArgSignatureImpl.java | 2 +- .../atp/dataset/macros/args/CtxValueSup.java | 2 +- .../macros/args/DotSeparatedArgsParser.java | 2 +- .../macros/args/MacroArgFactoryImpl.java | 2 +- .../dataset/macros/args/MacroArgsFactory.java | 2 +- .../atp/dataset/macros/args/RefArg.java | 4 +- .../atp/dataset/macros/args/SigValueSup.java | 2 +- .../atp/dataset/macros/args/SignatureArg.java | 2 +- .../atp/dataset/macros/args/TextArg.java | 2 +- .../atp/dataset/macros/cache/Cache.java | 2 +- .../dataset/macros/cache/CachedParameter.java | 3 +- .../dataset/macros/cache/MacroCacheKey.java | 4 +- .../atp/dataset/macros/cache/NoCache.java | 4 +- .../atp/dataset/macros/cache/SimpleCache.java | 6 +- .../macros/exception/CtxEvalException.java | 4 +- .../macros/exception/EvalException.java | 2 +- .../atp/dataset/macros/impl/InnMacros.java | 3 +- .../macros/impl/RandomBetweenMacros.java | 3 +- .../dataset/macros/impl/ReferenceMacros.java | 9 +- .../macros/impl/ReferenceThisDsMacros.java | 2 +- .../macros/impl/ReferenceToDslMacros.java | 6 +- .../impl/reference/ReferenceAliasType.java | 2 +- .../atp/dataset/macros/parser/Strategy.java | 2 +- .../atp/dataset/macros/parser/Token.java | 2 +- .../processor/AbstractMacroProcessor.java | 2 +- .../macros/processor/MacroContext.java | 6 +- .../macros/processor/MacroContextBase.java | 2 +- .../macros/processor/MacroProcessorBase.java | 4 +- .../macros/processor/MacroProcessorImpl.java | 2 +- .../macros/processor/RefAliasContext.java | 2 +- .../macros/processor/RefAliasProcessor.java | 2 +- .../atp/dataset/model/Attribute.java | 2 +- .../atp/dataset/model/AttributeType.java | 2 +- .../atp/dataset/model/DataSetList.java | 2 +- .../atp/dataset/model/Identified.java | 2 +- .../qubership/atp/dataset/model/MixInId.java | 4 +- .../atp/dataset/model/Parameter.java | 4 +- .../atp/dataset/model/ParameterOverlap.java | 2 +- .../model/api/CopyDsAttributeRequest.java | 2 +- .../requests/CopyDataSetListsRequest.java | 4 +- .../api/saga/requests/RevertRequest.java | 2 +- .../atp/dataset/model/impl/AttributeImpl.java | 2 +- .../dataset/model/impl/AttributePathImpl.java | 2 +- .../atp/dataset/model/impl/DataSetImpl.java | 2 +- .../dataset/model/impl/DataSetListImpl.java | 2 +- .../atp/dataset/model/impl/FilterImpl.java | 2 +- .../atp/dataset/model/impl/FlatDataImpl.java | 4 +- .../atp/dataset/model/impl/LabelImpl.java | 2 +- .../atp/dataset/model/impl/ListValueImpl.java | 2 +- .../atp/dataset/model/impl/MixInIdImpl.java | 4 +- .../dataset/model/impl/ParameterBaseImpl.java | 2 +- .../atp/dataset/model/impl/ParameterImpl.java | 2 +- .../model/impl/ParameterOverlapImpl.java | 2 +- .../atp/dataset/model/impl/TestPlanImpl.java | 2 +- .../model/impl/VisibilityAreaImpl.java | 2 +- .../atp/dataset/model/impl/file/FileData.java | 2 +- .../model/utils/AbstractDsUiHandler.java | 4 +- .../model/utils/AbstractDslUiHandler.java | 4 +- .../dataset/model/utils/AtpDsSerializer.java | 4 +- .../atp/dataset/model/utils/Change.java | 2 +- .../atp/dataset/model/utils/ChangeType.java | 4 +- .../model/utils/DsAttrPathUiHandler.java | 6 +- .../dataset/model/utils/DsParamHandler.java | 4 +- .../dataset/model/utils/DslAttrHandler.java | 4 +- .../atp/dataset/model/utils/DslUiHandler.java | 2 +- .../atp/dataset/model/utils/OverlapItem.java | 6 +- .../dataset/model/utils/OverlapIterator.java | 4 +- .../dataset/model/utils/OverlapLayers.java | 6 +- .../atp/dataset/model/utils/Prefix.java | 4 +- .../atp/dataset/model/utils/Utils.java | 10 +- .../model/utils/tree/AllRefsIterator.java | 4 +- .../model/utils/tree/ChainIterator.java | 4 +- .../atp/dataset/model/utils/tree/Leaf.java | 4 +- .../model/utils/tree/LeafsDetector.java | 10 +- .../dataset/model/utils/tree/LeafsWalker.java | 12 +- .../dataset/model/utils/tree/RefsVisitor.java | 7 +- .../utils/tree/TraverseAndLeafsHandler.java | 4 +- .../model/utils/tree/TraverseHandler.java | 4 +- .../model/utils/tree/TraverseVisitor.java | 2 +- .../service/direct/AttributeService.java | 4 +- .../direct/ConcurrentModificationService.java | 2 +- .../service/direct/DataSetListService.java | 4 +- .../service/direct/DataSetService.java | 4 +- .../dataset/service/direct/FilterService.java | 2 +- .../service/direct/IdentifiedService.java | 4 +- .../service/direct/LabelProviderService.java | 2 +- .../service/direct/ParameterService.java | 4 +- .../service/direct/TestPlanService.java | 2 +- .../service/direct/VisibilityAreaService.java | 2 +- .../service/direct/helper/CreationFacade.java | 4 +- .../direct/helper/DbCreationFacade.java | 12 +- .../service/direct/helper/FileDataDao.java | 2 +- .../direct/helper/SimpleCreationFacade.java | 4 +- .../direct/impl/AliasWrapperServiceImpl.java | 17 +- .../direct/impl/AttributeServiceImpl.java | 12 +- .../ConcurrentModificationServiceImpl.java | 2 +- .../direct/impl/DataSetListServiceImpl.java | 4 +- .../direct/impl/DataSetServiceImpl.java | 5 +- .../direct/impl/DateAuditorServiceImpl.java | 2 +- .../direct/impl/FilterServiceImpl.java | 4 +- .../direct/impl/ParameterServiceImpl.java | 11 +- .../direct/impl/TestPlanServiceImpl.java | 8 +- .../impl/VisibilityAreaServiceImpl.java | 4 +- .../DatasetLinkAttributeExportConverter.java | 2 +- .../DataSetListImportExportFactory.java | 2 +- .../service/DatasetListExportService.java | 2 +- .../service/DatasetListImportService.java | 14 +- .../direct/macros/CachingParamEvaluator.java | 4 +- .../service/direct/macros/DsEvaluator.java | 4 +- .../macros/EvaluateDsParamStrategy.java | 2 +- .../macros/EvaluateDsParamStrategyImpl.java | 8 +- .../service/direct/macros/UnwrapAlias.java | 6 +- .../macros/schange/ChangeParameter.java | 7 +- .../schange/EvaluateDsStructureStrategy.java | 2 +- .../EvaluateDsStructureStrategyImpl.java | 2 +- .../macros/schange/NoStructureChange.java | 2 +- .../macros/schange/TraverseMixinSupport.java | 4 +- .../service/jpa/JpaAttributeService.java | 2 +- .../service/jpa/JpaDataSetListService.java | 2 +- .../service/jpa/JpaDataSetService.java | 2 +- .../jpa/delegates/AbstractObjectWrapper.java | 3 +- .../service/jpa/delegates/Attribute.java | 5 +- .../service/jpa/delegates/AttributeKey.java | 4 +- .../service/jpa/delegates/DataSetList.java | 6 +- .../service/jpa/delegates/Parameter.java | 7 +- .../jpa/impl/DataSetListAsyncService.java | 2 +- .../jpa/impl/JpaAttributeServiceImpl.java | 2 +- .../jpa/impl/JpaDataSetListServiceImpl.java | 4 +- .../jpa/impl/JpaDataSetServiceImpl.java | 4 +- .../jpa/model/MacroContextServiceImpl.java | 2 +- .../jpa/model/dscontext/DataSetContext.java | 2 + .../model/dscontext/DataSetListContext.java | 2 + .../jpa/model/dscontext/GroupContext.java | 2 + .../jpa/model/dscontext/ParameterContext.java | 2 + .../service/jpa/model/tree/Overlap.java | 2 + .../service/jpa/model/tree/OverlapNode.java | 7 +- .../tree/params/macros/AbstractMacro.java | 4 +- .../model/tree/params/macros/InnMacro.java | 3 +- .../macros/ParameterPositionContext.java | 3 +- .../dataset/service/rest/QueryParamFlag.java | 2 +- .../rest/dto/manager/UiManParameter.java | 2 +- .../rest/dto/versioning/ChangeSummary.java | 4 +- .../facade/AttachmentControllerFacade.java | 2 +- .../rest/server/AttributeController.java | 2 +- .../rest/server/DataSetController.java | 4 +- .../rest/server/DataSetListController.java | 6 +- .../rest/server/HealthCheckController.java | 4 +- .../rest/server/HistoryController.java | 2 +- .../rest/server/LabelFilterController.java | 4 +- .../rest/server/ParameterController.java | 2 +- .../service/rest/server/SagaController.java | 2 +- .../rest/server/TestPlanController.java | 4 +- .../service/rest/server/UIController.java | 2 +- .../rest/server/VersionController.java | 4 +- .../rest/server/VisibilityAreaController.java | 2 +- .../rest/server/v2/ParameterControllerV2.java | 2 +- .../service/ws/event/EventExecutorImpl.java | 6 +- .../impl/JaversHistoryCacheableService.java | 2 - .../impl/JaversHistoryServiceImpl.java | 4 +- .../service/impl/RestoreServiceImpl.java | 13 +- .../impl/RevisionDetailsServiceImpl.java | 2 +- .../antlr4/TextParameterParserTest.java | 22 +- .../config/IntegrationTestConfiguration.java | 2 + .../config/OverrideOriginBeanConfig.java | 2 + .../api/DatasetsAndCatalogContractTest.java | 6 +- .../DatasetsAndItfExecutorContractTest.java | 54 ++-- .../api/DatasetsAndItfStubsContractTest.java | 4 +- .../DatasetsAndOrchestratorContractTest.java | 4 +- .../api/DatasetsAndRamContractTest.java | 6 +- ...atasetsAndSagaCoordinatorContractTest.java | 4 +- .../dataset/db/AttributeRepositoryTest.java | 8 +- .../db/DataSetListTreeRepositoryTest.java | 28 +- .../db/TransactionInterceptorTest.java | 8 +- .../dataset/ei/DataSetExportExecutorTest.java | 80 +++--- .../dataset/ei/DataSetImportExecutorTest.java | 11 +- ...aSetAttributesImporterIntegrationTest.java | 26 +- .../DataSetAttributesImporterTest.java | 50 ++-- .../service/DataSetExportExecutorPostman.java | 31 +-- .../ei/service/DataSetFileImporterTest.java | 5 +- .../ei/service/DataSetListImporterTest.java | 23 +- .../DataSetParametersImporterTest.java | 29 ++- .../ei/service/DataSetsImporterTest.java | 26 +- .../ei/service/DuplicateNameCheckerTest.java | 4 +- .../dataset/macros/impl/LookupMacrosTest.java | 4 +- .../dataset/macros/impl/RefToRefTestData.java | 4 +- .../macros/parser/ParsingStateTest.java | 2 +- .../processor/AbstractMacroProcessorTest.java | 4 +- .../macros/processor/EvalContextImplTest.java | 30 +-- .../macros/processor/MacrosEvaluator.java | 3 - .../processor/RefAliasProcessorTest.java | 6 +- .../dataset/model/utils/EvaluatorMock.java | 4 +- .../dataset/model/utils/ItfMultiplyTest.java | 4 +- .../dataset/model/utils/MultiplyTestData.java | 4 +- .../model/utils/PhoneCallTestData.java | 2 +- .../model/utils/UiSerializationTest.java | 41 ++- .../model/utils/tree/LeafsWalkerTest.java | 8 +- .../dataset/model/utils/tree/Position.java | 6 +- .../utils/tree/TraverseHandlerToMock.java | 4 +- .../dataset/model/utils/tree/TreeNode.java | 4 +- .../atp/dataset/service/AbstractTest.java | 2 +- .../service/direct/GridFsServiceTest.java | 8 +- .../service/direct/impl/CompareDsTest.java | 36 +-- .../impl/DataSetListServiceImplTest.java | 90 +++---- .../impl/ReferenceResolveServiceImplTest.java | 4 +- .../service/DatasetListImportServiceTest.java | 25 +- .../model/tree/params/macros/TestUtils.java | 230 +++++++++-------- .../params/macros/matcher/MatcherFactory.java | 4 +- .../params/macros/matcher/RegexMatcher.java | 2 +- .../JpaDataSetListServiceImplTest.java | 3 - .../jpa/service/JpaIntegrationTest.java | 63 +++-- .../service/JpaParameterServiceImplTest.java | 37 ++- .../service/JpaVisibilityAreaServiceTest.java | 42 ++- .../versioning/VersioningRestoreTest.java | 13 +- .../server/v2/ParameterControllerV2Test.java | 5 +- .../service/ws/WebSocketHandlerTest.java | 6 +- .../dataset/ui/AbstractIntegrationCase.java | 8 +- .../ui/api/AbstractApiIntegrationCase.java | 6 +- .../atp/dataset/ui/api/AttributeITCase.java | 8 +- .../atp/dataset/ui/api/CopyDslITCase.java | 4 +- .../atp/dataset/ui/api/CreateDslITCase.java | 4 +- .../atp/dataset/ui/api/GetByLabelITCase.java | 6 +- .../atp/dataset/ui/api/JsonViewITCase.java | 6 +- .../atp/dataset/ui/api/ListValuePojo.java | 2 +- .../atp/dataset/ui/api/RestClientConfig.java | 19 +- .../atp-datasets/templates/_helpers.tpl | 2 +- deployments/charts/atp-datasets/values.yaml | 2 +- parent/parent-dependencies/pom.xml | 94 ++++--- parent/parent-java/pom.xml | 7 +- pom.xml | 5 +- 364 files changed, 1558 insertions(+), 1629 deletions(-) diff --git a/.github/deploy_templates/values-dev.yaml b/.github/deploy_templates/values-dev.yaml index 4c62353..45ed545 100644 --- a/.github/deploy_templates/values-dev.yaml +++ b/.github/deploy_templates/values-dev.yaml @@ -10,7 +10,7 @@ KEYCLOAK_ENABLED: "false" # IP of db PG_DB_ADDR: "my-postgres-postgresql" # Spring profile for security -SPRING_PROFILES: "disable-security" +ACTIVE_PROFILES_SPRING: "disable-security" keepHookLogs: true HELPER_IMAGE: "ghcr.io/netcracker/qubership-testing-platform-helm-hook-helper:main_latest" CONTENT_SECURITY_POLICY: "*" diff --git a/atp-dataset-benchmarks/pom.xml b/atp-dataset-benchmarks/pom.xml index f035be9..e815ca4 100644 --- a/atp-dataset-benchmarks/pom.xml +++ b/atp-dataset-benchmarks/pom.xml @@ -59,6 +59,14 @@ log4j-core org.apache.logging.log4j + + junit + junit + + + org.junit.vintage + junit-vintage-engine + @@ -66,6 +74,16 @@ atp-dataset ${project.version} tests + + + junit + junit + + + org.junit.vintage + junit-vintage-engine + + org.apache.logging.log4j diff --git a/atp-dataset-common/pom.xml b/atp-dataset-common/pom.xml index c848eeb..e1b505c 100644 --- a/atp-dataset-common/pom.xml +++ b/atp-dataset-common/pom.xml @@ -19,5 +19,10 @@ com.google.guava guava + + jakarta.annotation + jakarta.annotation-api + compile + diff --git a/atp-dataset-common/src/main/java/org/qubership/atp/dataset/utils/Utils.java b/atp-dataset-common/src/main/java/org/qubership/atp/dataset/utils/Utils.java index 76f88f9..23cb9e7 100644 --- a/atp-dataset-common/src/main/java/org/qubership/atp/dataset/utils/Utils.java +++ b/atp-dataset-common/src/main/java/org/qubership/atp/dataset/utils/Utils.java @@ -22,8 +22,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -78,7 +78,7 @@ public static String replacePlaceholders(Matcher matcher, Function placeholderIntoValue) { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); while (matcher.find()) { matcher.appendReplacement(result, placeholderIntoValue.apply(matcher.group(groupToConvert))); } diff --git a/atp-dataset-distribution/pom.xml b/atp-dataset-distribution/pom.xml index a31b732..5679f77 100644 --- a/atp-dataset-distribution/pom.xml +++ b/atp-dataset-distribution/pom.xml @@ -34,6 +34,14 @@ log4j-core org.apache.logging.log4j + + junit + junit + + + org.junit.vintage + junit-vintage-engine + diff --git a/atp-dataset-import/pom.xml b/atp-dataset-import/pom.xml index 824dfbe..a667a1c 100644 --- a/atp-dataset-import/pom.xml +++ b/atp-dataset-import/pom.xml @@ -77,6 +77,14 @@ log4j-core org.apache.logging.log4j + + junit + junit + + + org.junit.vintage + junit-vintage-engine + diff --git a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/ChildDsImporter.java b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/ChildDsImporter.java index b7af83c..db3d7c5 100644 --- a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/ChildDsImporter.java +++ b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/ChildDsImporter.java @@ -19,7 +19,7 @@ import java.util.Iterator; import java.util.UUID; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; diff --git a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/DsRow.java b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/DsRow.java index fc857e7..77ef1da 100644 --- a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/DsRow.java +++ b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/DsRow.java @@ -16,8 +16,8 @@ package org.qubership.atp.dataset.migration; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.apache.poi.ss.usermodel.Cell; diff --git a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/ParentDsImporter.java b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/ParentDsImporter.java index f63d11f..338b3e8 100644 --- a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/ParentDsImporter.java +++ b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/ParentDsImporter.java @@ -18,8 +18,6 @@ import java.util.Iterator; -import javax.annotation.Nonnull; - import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.qubership.atp.dataset.migration.formula.model.EvaluationContext; @@ -37,12 +35,13 @@ import com.google.common.base.MoreObjects; import com.google.common.base.Throwables; import com.google.common.collect.Iterators; +import jakarta.annotation.Nonnull; public class ParentDsImporter { private static final Logger LOG = LoggerFactory.getLogger(ParentDsImporter.class); - private ImportResources res; + private final ImportResources res; public ParentDsImporter(ImportResources res) { this.res = res; @@ -51,8 +50,7 @@ public ParentDsImporter(ImportResources res) { /** * create parent dataset. * - * @param resources see {@link ImportResources#create(DsServicesFacade, String, String, String, - * String)}. + * @param resources see {@link ImportResources#create(DsServicesFacade, String, String, String, String)}. */ public static ParentDsImporter create(ImportResources resources) { return new ParentDsImporter(resources); diff --git a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/SheetDataIterator.java b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/SheetDataIterator.java index 4f434d7..1f2db33 100644 --- a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/SheetDataIterator.java +++ b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/SheetDataIterator.java @@ -20,8 +20,8 @@ import java.util.Iterator; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; diff --git a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/apply/CreateParam.java b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/apply/CreateParam.java index fed3edf..aba1b6d 100644 --- a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/apply/CreateParam.java +++ b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/apply/CreateParam.java @@ -20,7 +20,7 @@ import java.util.Collections; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.migration.formula.model.Formula; import org.qubership.atp.dataset.migration.formula.model.TransformationException; diff --git a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/apply/Overlap.java b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/apply/Overlap.java index b3214f0..6fe6d41 100644 --- a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/apply/Overlap.java +++ b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/apply/Overlap.java @@ -20,7 +20,7 @@ import java.io.ByteArrayInputStream; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.migration.formula.model.Formula; import org.qubership.atp.dataset.migration.formula.model.TransformationException; diff --git a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/apply/SetParam.java b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/apply/SetParam.java index bf76823..161dd8d 100644 --- a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/apply/SetParam.java +++ b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/apply/SetParam.java @@ -18,7 +18,7 @@ import java.io.ByteArrayInputStream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.migration.formula.model.Formula; import org.qubership.atp.dataset.migration.formula.model.TransformationException; diff --git a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/config/MigrationConfig.java b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/config/MigrationConfig.java index 6256018..58c494c 100644 --- a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/config/MigrationConfig.java +++ b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/config/MigrationConfig.java @@ -16,7 +16,7 @@ package org.qubership.atp.dataset.migration.config; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.qubership.atp.dataset.config.ServiceConfiguration; import org.qubership.atp.dataset.db.CacheRepository; diff --git a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/formula/ExcelFormulasEvaluator.java b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/formula/ExcelFormulasEvaluator.java index e31497e..e6015ef 100644 --- a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/formula/ExcelFormulasEvaluator.java +++ b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/formula/ExcelFormulasEvaluator.java @@ -39,7 +39,7 @@ public class ExcelFormulasEvaluator { private final FalloutReport report; - private Set adapters = new HashSet<>(); + private final Set adapters = new HashSet<>(); /** * creates evaluator with default formulas parsers. @@ -77,9 +77,9 @@ public void add(ExcelFormulaAdapter parsers) { } /** - * tries to find formula by input formula from excel. + * tries to find formula by input formula from Excel. * - * @param cellData data from excel cell + * @param cellData data from Excel cell * @return calculated formula or UNKNOWN formula if formula is not implemented yet */ public Formula getFormula(CellData cellData) { @@ -91,7 +91,7 @@ public Formula getFormula(CellData cellData) { return new Formula(cellData, adapter.getType(), datasetValue, null); } catch (TransformationException e) { report.report(cellData.getLocation(), excelFormula, - String.format("failed to convert formula to '%s'", adapter.getType()), e.getMessage()); + "failed to convert formula to '%s'".formatted(adapter.getType()), e.getMessage()); } } } diff --git a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/formula/parsers/DateParser.java b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/formula/parsers/DateParser.java index da8e85b..6c9ab1f 100644 --- a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/formula/parsers/DateParser.java +++ b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/formula/parsers/DateParser.java @@ -57,7 +57,7 @@ public String transform(CellData cellData) throws TransformationException { date = transformDate(date); time = transformTime(time); suffix = transformSuffix(suffix); - return String.format("#DATE(%s'T'%s%s)", date, time, suffix); + return "#DATE(%s'T'%s%s)".formatted(date, time, suffix); } private String transformSuffix(String suffix) { @@ -88,7 +88,7 @@ private String transformTime(String time) { Integer hours = Integer.valueOf(timeFormatMatcher.group(1)); Integer minutes = Integer.valueOf(timeFormatMatcher.group(2)); Integer seconds = Integer.valueOf(timeFormatMatcher.group(3)); - time = String.format("%02d:%02d:%02d", hours, minutes, seconds); + time = "%02d:%02d:%02d".formatted(hours, minutes, seconds); } return time; } diff --git a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/formula/parsers/InternalReferenceParser.java b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/formula/parsers/InternalReferenceParser.java index 618de00..9becafa 100644 --- a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/formula/parsers/InternalReferenceParser.java +++ b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/formula/parsers/InternalReferenceParser.java @@ -49,7 +49,7 @@ public String transform(CellData cellData) throws TransformationException { private String getAddress(ParameterAssociation referencedParameter) { //IN SCOPE: DSL_NAME.DATA_SET_NAME.ATTRIBUTE_NAME - return String.format("#REF_DSL(%s.%s.%s)", + return "#REF_DSL(%s.%s.%s)".formatted( referencedParameter.parameterSup.getContainer().getGroupDsl().getName(), referencedParameter.parameterSup.getContainer().getGroupDs().getName(), referencedParameter.parameterSup.getAttrName()); diff --git a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/formula/parsers/RandomExcelParser.java b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/formula/parsers/RandomExcelParser.java index 3eef58b..b2ca91a 100644 --- a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/formula/parsers/RandomExcelParser.java +++ b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/formula/parsers/RandomExcelParser.java @@ -36,7 +36,7 @@ public FormulaType getType() { @Override public String transform(CellData cellData) throws TransformationException { final Matcher matcher = getMatcher(cellData); - return String.format("#RANDOMBETWEEN(%s, %s)", matcher.group(1), matcher.group(2)); + return "#RANDOMBETWEEN(%s, %s)".formatted(matcher.group(1), matcher.group(2)); } @Override diff --git a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/formula/parsers/RegexpFormulaAdapter.java b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/formula/parsers/RegexpFormulaAdapter.java index 70b9771..11fcf35 100644 --- a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/formula/parsers/RegexpFormulaAdapter.java +++ b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/formula/parsers/RegexpFormulaAdapter.java @@ -20,7 +20,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.migration.formula.model.CellData; import org.qubership.atp.dataset.migration.formula.model.ExcelFormulaAdapter; @@ -36,7 +36,7 @@ public boolean matches(CellData cellData) { @Nonnull protected final Matcher getMatcher(CellData cellData) throws TransformationException { final Optional matcher = getValidMatcher(cellData); - if (!matcher.isPresent()) { + if (matcher.isEmpty()) { throw new TransformationException( "Text '" + cellData + "' is not supported expression: " + getFormulaDescription()); } diff --git a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/ExcelEvaluator.java b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/ExcelEvaluator.java index 1e62e3f..37cf1d2 100644 --- a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/ExcelEvaluator.java +++ b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/ExcelEvaluator.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.net.URI; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -30,7 +29,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.openxml4j.opc.PackagingURIHelper; @@ -60,10 +59,10 @@ public class ExcelEvaluator { private static final Pattern ATP_MACROS_PATTERN = Pattern.compile("\\$(ENV_VARIABLE|RAND)\\(([^)]*)\\)"); private static final Logger LOG = LoggerFactory.getLogger(ExcelEvaluator.class); private final List refFiles; - private Map evaluators = new HashMap<>(); + private final Map evaluators = new HashMap<>(); private Map filesToExcel = new HashMap<>(); - private Map childParentMapping = new HashMap<>(); - private ExcelFormulasEvaluator formulaEvaluator; + private final Map childParentMapping = new HashMap<>(); + private final ExcelFormulasEvaluator formulaEvaluator; public ExcelEvaluator(List refFiles, ExcelFormulasEvaluator formulaEvaluator) { this.refFiles = refFiles; @@ -84,7 +83,7 @@ private static Set getRefs(@Nonnull XSSFWorkbook workbook) { String path = PackagingURIHelper.decodeURI(URI.create(fileName)); //java.nio.file.InvalidPathException: Illegal char <:> at index 4: // file://///mockingbird-tst/mockingbird_app_26.08.2016/DAO/dataset/WS Parent.xlsx - Paths.get(path); + Path.of(path); paths.add(path); } return paths; @@ -164,7 +163,7 @@ public Formula getFormulaValue(ParameterAssociation parameter, List } FormulaType formulaType = FormulaType.TEXT; Matcher matcher = ATP_MACROS_PATTERN.matcher(parameter.data.getValue()); - StringBuffer valueSb = new StringBuffer(); + StringBuilder valueSb = new StringBuilder(); while (matcher.find()) { formulaType = FormulaType.ATP_MACROS; String convertedValue; @@ -223,7 +222,7 @@ private String getValueUnSafe(Cell cell) throws IllegalArgumentException { result = dataFormatter.formatCellValue(cell, evaluator); // better in most situations } catch (Exception e) { if (cell.getCellTypeEnum() == CellType.ERROR) { - result = cell instanceof XSSFCell ? ((XSSFCell) cell).getErrorCellString() : "####"; + result = cell instanceof XSSFCell xssfc ? xssfc.getErrorCellString() : "####"; } throw new RuntimeException("Cell parsing report" + "\tSheet: " + cell.getSheet().getSheetName() + ", " diff --git a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/FalloutReport.java b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/FalloutReport.java index f923160..8dc12a0 100644 --- a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/FalloutReport.java +++ b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/FalloutReport.java @@ -31,7 +31,7 @@ public FalloutReport(String reportFile) throws IOException { } public void report(String location, String problemPlace, String shortMessage, String detailedMessage) { - writer.println(String.format("%s\t%s\t%s\t%s", location, problemPlace, shortMessage, detailedMessage)); + writer.println("%s\t%s\t%s\t%s".formatted(location, problemPlace, shortMessage, detailedMessage)); } @Override diff --git a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/ImportResources.java b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/ImportResources.java index b0b1669..ad77646 100644 --- a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/ImportResources.java +++ b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/ImportResources.java @@ -19,7 +19,7 @@ import java.io.Closeable; import java.io.IOException; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.util.stream.Collectors; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; @@ -82,12 +82,12 @@ public static ImportResources create(DsServicesFacade services, String bookName, String groupDataSetName) throws IOException, InvalidFormatException { FalloutReport falloutReport = new FalloutReport(bookName + ".fallout.tsv"); - ExcelEvaluator excelEvaluator = new ExcelEvaluator(Files.find(Paths.get(excelDataFolder), Integer.MAX_VALUE, + ExcelEvaluator excelEvaluator = new ExcelEvaluator(Files.find(Path.of(excelDataFolder), Integer.MAX_VALUE, (path, basicFileAttributes) -> basicFileAttributes.isRegularFile() && !path.startsWith("~$") && path.getFileName().toString().toLowerCase().matches(".+\\.xlsx")) .collect(Collectors.toList()), new ExcelFormulasEvaluator(falloutReport)); - XSSFWorkbook book = excelEvaluator.register(Paths.get(bookName)); + XSSFWorkbook book = excelEvaluator.register(Path.of(bookName)); VisibilityArea va = services.get_VA_ByNameOrCreate(visibilityAreaName); return new ImportResources(services, excelEvaluator, falloutReport, bookName, groupDataSetName, book, va); } diff --git a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/ParameterData.java b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/ParameterData.java index 96f1a2f..c6fbd22 100644 --- a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/ParameterData.java +++ b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/ParameterData.java @@ -16,7 +16,7 @@ package org.qubership.atp.dataset.migration.model; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.DataSet; import org.qubership.atp.dataset.model.DataSetList; @@ -66,7 +66,7 @@ public abstract class ParameterData { public abstract ToCreate toCreate(); public String getLocation() { - return String.format("%s.%s.%s", getDsl().getName(), getDs().getName(), getAttrName()); + return "%s.%s.%s".formatted(getDsl().getName(), getDs().getName(), getAttrName()); } @Override diff --git a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/Settings.java b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/Settings.java index 937e61a..8a33a92 100644 --- a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/Settings.java +++ b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/Settings.java @@ -19,8 +19,8 @@ import java.util.Objects; import java.util.Properties; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/ToCreate.java b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/ToCreate.java index a66bd3d..44ff57c 100644 --- a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/ToCreate.java +++ b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/ToCreate.java @@ -16,7 +16,7 @@ package org.qubership.atp.dataset.migration.model; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.DataSet; import org.qubership.atp.dataset.model.DataSetList; diff --git a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/ToOverlap.java b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/ToOverlap.java index 2542698..f662ea9 100644 --- a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/ToOverlap.java +++ b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/model/ToOverlap.java @@ -16,7 +16,7 @@ package org.qubership.atp.dataset.migration.model; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.DataSet; diff --git a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/repo/DsServicesFacade.java b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/repo/DsServicesFacade.java index 6983121..e40b358 100644 --- a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/repo/DsServicesFacade.java +++ b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/repo/DsServicesFacade.java @@ -21,7 +21,7 @@ import java.util.Optional; import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.migration.model.OverlapParamContainer; import org.qubership.atp.dataset.migration.model.ToOverlap; diff --git a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/repo/OrderedAttributeRepository.java b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/repo/OrderedAttributeRepository.java index f4d8bc5..0310fdb 100644 --- a/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/repo/OrderedAttributeRepository.java +++ b/atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/repo/OrderedAttributeRepository.java @@ -19,9 +19,9 @@ import java.util.List; import java.util.UUID; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.inject.Provider; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.inject.Provider; import org.qubership.atp.dataset.db.AttributeRepository; import org.qubership.atp.dataset.db.CacheRepository; diff --git a/atp-dataset-import/src/test/java/org/qubership/atp/dataset/migration/DataSetImporterTest.java b/atp-dataset-import/src/test/java/org/qubership/atp/dataset/migration/DataSetImporterTest.java index afa8dc2..749de7d 100644 --- a/atp-dataset-import/src/test/java/org/qubership/atp/dataset/migration/DataSetImporterTest.java +++ b/atp-dataset-import/src/test/java/org/qubership/atp/dataset/migration/DataSetImporterTest.java @@ -16,17 +16,17 @@ package org.qubership.atp.dataset.migration; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.io.IOException; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; import java.util.Objects; @@ -40,16 +40,12 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Isolated; import org.mockito.Mockito; - import org.qubership.atp.dataset.migration.model.Settings; import org.qubership.atp.dataset.migration.repo.DsServicesFacade; import org.qubership.atp.dataset.model.Attribute; @@ -58,6 +54,9 @@ import org.qubership.atp.dataset.model.VisibilityArea; import org.qubership.atp.dataset.service.direct.helper.SimpleCreationFacade; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; + @Isolated public class DataSetImporterTest { static final DsServicesFacade SERVICES = Mockito.mock(DsServicesFacade.class); @@ -109,14 +108,14 @@ static void doImportWithTimeout(@Nullable String parentFileName, @Nonnull private static List getFallout(@Nonnull String filename) throws IOException { - return Files.readAllLines(Paths.get(EXCEL_FOLDER).resolve(filename), Charset.forName("UTF-8")).stream() + return Files.readAllLines(Path.of(EXCEL_FOLDER).resolve(filename), StandardCharsets.UTF_8).stream() .skip(1)//header .map(FalloutRecord::create) .collect(Collectors.toList()); } @BeforeEach - public void setUp() throws Exception { + public void setUp() { Mockito.reset(SERVICES); when(SERVICES.get_VA_ByNameOrCreate(VA.getName())).thenReturn(VA); when(SERVICES.getDslByNameOrCreate(VA, DSL.getName())).thenReturn(DSL); @@ -126,7 +125,7 @@ public void setUp() throws Exception { } @Test - public void doImport_ParentWithRootAttributes_NothingIsCreated() throws Exception { + public void doImport_ParentWithRootAttributes_NothingIsCreated() { doImportWithTimeout("OneRowDefaultGroup.xlsx", null, true); verify(SERVICES, never()).getDslByNameOrCreate(any(), any()); verify(SERVICES, never()).get_DS_ByNameOrCreate(any(), any()); @@ -134,7 +133,7 @@ public void doImport_ParentWithRootAttributes_NothingIsCreated() throws Exceptio } @Test - public void doImport_ParentWithGroup_GroupDsAndParameterAreCreated() throws Exception { + public void doImport_ParentWithGroup_GroupDsAndParameterAreCreated() { Attribute attr = SimpleCreationFacade.INSTANCE.textAttr(GROUP_DSL, "atpMacro"); when(SERVICES.get_Attr_ByNameOrCreate(eq(GROUP_DSL), eq(attr.getName()), any(), any(), any())).thenReturn(attr); doImportWithTimeout("OneRowDefaultGroup.xlsx", null, false); @@ -149,7 +148,7 @@ public void doImport_ParentWithGroup_GroupDsAndParameterAreCreated() throws Exce } @Test - public void doImport_ChildWithRootAttributes_ParameterIsCreatedAndGroupIsNot() throws Exception { + public void doImport_ChildWithRootAttributes_ParameterIsCreatedAndGroupIsNot() { Attribute attr = SimpleCreationFacade.INSTANCE.textAttr(DSL, "atpMacro"); when(SERVICES.get_Attr_ByNameOrCreate(eq(DSL), eq(attr.getName()), any(), any(), any())).thenReturn(attr); doImportWithTimeout(null, "OneRowDefaultGroup.xlsx", true); diff --git a/atp-dataset-import/src/test/java/org/qubership/atp/dataset/migration/ExcelFormulasTest.java b/atp-dataset-import/src/test/java/org/qubership/atp/dataset/migration/ExcelFormulasTest.java index a8b6bc9..350aea3 100644 --- a/atp-dataset-import/src/test/java/org/qubership/atp/dataset/migration/ExcelFormulasTest.java +++ b/atp-dataset-import/src/test/java/org/qubership/atp/dataset/migration/ExcelFormulasTest.java @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.Collection; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.poi.ss.usermodel.CellType; import org.junit.jupiter.api.parallel.Isolated; @@ -50,7 +50,7 @@ @Isolated public class ExcelFormulasTest { - private static CreationFacade CREATE = SimpleCreationFacade.INSTANCE; + private static final CreationFacade CREATE = SimpleCreationFacade.INSTANCE; public static Collection data() { EvaluationContext context = EvaluationContext.getContext(); @@ -137,9 +137,9 @@ public Parameter getParameterToOverlap() { @ParameterizedTest(name = "{index}: formula {0} is {1} and converts to {2}") @MethodSource("data") - public void excelFormula_parsedToDatasetFormat_successfully(String excelFormula, FormulaType type, - String finalExpression) throws TransformationException, - IOException { + public void excelFormula_parsedToDatasetFormat_successfully(String excelFormula, + FormulaType type, + String finalExpression) throws IOException { ExcelFormulasEvaluator formulas = new ExcelFormulasEvaluator(new FalloutReport("test.report.tsv")); Formula formula = formulas.getFormula(new CellData(excelFormula, "test value", "test location", CellType._NONE)); assertEquals(finalExpression, formula.getDatasetValue()); diff --git a/atp-dataset-import/src/test/java/org/qubership/atp/dataset/migration/ExcelTest.java b/atp-dataset-import/src/test/java/org/qubership/atp/dataset/migration/ExcelTest.java index b3f521b..14cf91a 100644 --- a/atp-dataset-import/src/test/java/org/qubership/atp/dataset/migration/ExcelTest.java +++ b/atp-dataset-import/src/test/java/org/qubership/atp/dataset/migration/ExcelTest.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -62,7 +61,7 @@ public void before() throws IOException { @Test @Disabled//ignored because it is not required to perform such parsing each time public void get_all_formulas() throws IOException, InvalidFormatException { - final List files = Files.find(Paths.get("TEST DATA\\test data"), 1, + final List files = Files.find(Path.of("TEST DATA\\test data"), 1, (path, basicFileAttributes) -> basicFileAttributes.isRegularFile() && !path.startsWith("~") && path.getFileName().toString().toLowerCase().matches(".+\\.xlsx?")) @@ -70,7 +69,7 @@ public void get_all_formulas() throws IOException, InvalidFormatException { //YA - can be removed from here and calculated in the formula parsing test final int[] totalFormulas = {0}; for (Path file : files) { - final Path test_excel = Paths.get("test_excel", file.getFileName().toString() + ".txt"); + final Path test_excel = Path.of("test_excel", file.getFileName().toString() + ".txt"); Files.deleteIfExists(test_excel); ExcelEvaluator excelEvaluator = new ExcelEvaluator(files, evaluator); Path formulasFile = Files.createFile(test_excel); @@ -139,11 +138,11 @@ public void get_formulas_types() throws IOException { .map(s -> evaluator.getFormula(new CellData(s, "unknown")).getFormulaType()) .collect(Collectors.groupingBy( FormulaType::name, Collectors.counting())); - LOG.error("Error: ", result); + LOG.error("Error: {}", result); } private Stream getFormulasStream() throws IOException { - return Files.find(Paths.get("test_excel"), 1, + return Files.find(Path.of("test_excel"), 1, (p, a) -> a.isRegularFile() && p.getFileName().toString().endsWith(".txt")) .flatMap(path -> { try { diff --git a/atp-dataset-import/src/test/java/org/qubership/atp/dataset/migration/ImportDTFilesTest.java b/atp-dataset-import/src/test/java/org/qubership/atp/dataset/migration/ImportDTFilesTest.java index dda1289..0901f1f 100644 --- a/atp-dataset-import/src/test/java/org/qubership/atp/dataset/migration/ImportDTFilesTest.java +++ b/atp-dataset-import/src/test/java/org/qubership/atp/dataset/migration/ImportDTFilesTest.java @@ -28,20 +28,17 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.parallel.Isolated; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit.jupiter.SpringExtension; - +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.qubership.atp.crypt.api.Decryptor; import org.qubership.atp.crypt.api.Encryptor; import org.qubership.atp.dataset.migration.config.TestConfiguration; @@ -59,8 +56,7 @@ import org.qubership.atp.dataset.service.direct.AliasWrapperService; import org.qubership.atp.dataset.service.direct.impl.ClearCacheServiceImpl; -@ExtendWith(SpringExtension.class) -@ContextConfiguration(classes = {TestConfiguration.class}) +@SpringJUnitConfig(classes = {TestConfiguration.class}) @TestPropertySource(properties = { "jdbc.leak.detection.threshold=10", "atp-dataset.last.revision.count=200", diff --git a/atp-dataset-migration/pom.xml b/atp-dataset-migration/pom.xml index 9cec1b2..752c232 100644 --- a/atp-dataset-migration/pom.xml +++ b/atp-dataset-migration/pom.xml @@ -47,6 +47,14 @@ tomcat-embed-websocket org.apache.tomcat.embed + + junit + junit + + + org.junit.vintage + junit-vintage-engine + @@ -71,6 +79,10 @@ + + org.springframework.boot + spring-boot-starter-undertow + org.springframework.boot spring-boot-starter @@ -84,7 +96,6 @@ org.liquibase liquibase-core - ${liquibase.version} com.mattbertolini @@ -404,11 +415,11 @@ --add-exports=java.base/jdk.internal.loader=ALL-UNNAMED --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED - --illegal-access=warn --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED -classpath + -Dspring.config.location="target/config/application.properties" org.qubership.atp.dataset.db.migration.Main diff --git a/atp-dataset-migration/src/main/config/application.properties b/atp-dataset-migration/src/main/config/application.properties index de513b3..89bc563 100644 --- a/atp-dataset-migration/src/main/config/application.properties +++ b/atp-dataset-migration/src/main/config/application.properties @@ -1,3 +1,6 @@ jdbc.Url=${jdbc.Url} jdbc.User=${jdbc.User} jdbc.Password=${jdbc.Password} +# Logging pattern containing traceId and spanId; no longer provided through Sleuth by default +logging.pattern.level="%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]" +spring.profiles.active=${ACTIVE_PROFILES_SPRING:disable-security} diff --git a/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/LiquibaseFactory.java b/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/LiquibaseFactory.java index 71a0565..be4cf01 100644 --- a/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/LiquibaseFactory.java +++ b/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/LiquibaseFactory.java @@ -20,8 +20,6 @@ import javax.sql.DataSource; -import org.springframework.beans.factory.annotation.Autowired; - import liquibase.Liquibase; import liquibase.database.Database; import liquibase.database.DatabaseFactory; @@ -34,7 +32,6 @@ public class LiquibaseFactory { private final DataSource dataSource; - @Autowired public LiquibaseFactory(DataSource dataSource) { this.dataSource = dataSource; } diff --git a/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/Main.java b/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/Main.java index 6f224b9..1332112 100644 --- a/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/Main.java +++ b/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/Main.java @@ -20,6 +20,7 @@ import org.qubership.atp.dataset.db.migration.config.DbConfiguration; import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -28,7 +29,7 @@ import liquibase.exception.LiquibaseException; import lombok.extern.slf4j.Slf4j; -@Import({DbConfiguration.class}) +@Import({DbConfiguration.class, ServletWebServerFactoryAutoConfiguration.class}) @Configuration @ComponentScan("org.qubership.atp.dataset.db.migration") @Slf4j diff --git a/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/MigrationRunner.java b/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/MigrationRunner.java index 0efdbfb..5c77ca9 100644 --- a/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/MigrationRunner.java +++ b/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/MigrationRunner.java @@ -1,5 +1,5 @@ /* - * # Copyright 2024-2025 NetCracker Technology Corporation + * # Copyright 2024-2026 NetCracker Technology Corporation * # * # Licensed under the Apache License, Version 2.0 (the "License"); * # you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import java.net.URL; import java.net.URLClassLoader; import java.nio.file.Path; -import java.nio.file.Paths; +import java.sql.SQLException; import java.util.HashMap; import java.util.Map; @@ -32,6 +32,9 @@ import liquibase.LabelExpression; import liquibase.Liquibase; import liquibase.Scope; +import liquibase.database.Database; +import liquibase.database.DatabaseConnection; +import liquibase.exception.LiquibaseException; import liquibase.resource.ClassLoaderResourceAccessor; import lombok.extern.slf4j.Slf4j; @@ -61,26 +64,47 @@ public void runMigration() { if (migrationModuleLaunchEnabled) { log.info("Migration module launch is Enabled. DB update has been launched."); try { - Liquibase lb = lbFactory.create("install.xml"); - if (isTests) { - log.info("drop database because of flag (drop.database.for.tests)"); - lb.dropAll(); + log.info("Liquibase migration: install.xml to be processed..."); + Liquibase liquibase = null; + try { + liquibase = lbFactory.create("install.xml"); + if (isTests) { + log.info("drop database because of flag (drop.database.for.tests)"); + liquibase.dropAll(); + } + liquibase.update(new Contexts(), new LabelExpression()); + } catch (LiquibaseException | SQLException e) { + throw new RuntimeException("Liquibase migration failed", e); + } finally { + closeDatabaseConnection(liquibase); } - lb.update(new Contexts(), new LabelExpression()); - lb.getDatabase().getConnection().close(); - Path path = Paths.get("atp-dataset-migration/target/scripts"); + + Path path = Path.of("atp-dataset-migration/target/scripts"); URL[] urls = new URL[]{path.toUri().toURL()}; URLClassLoader urlClassLoader = new URLClassLoader(urls); ParentLastClassloader customClassLoader = new ParentLastClassloader( urlClassLoader, sourcePath, jdbcType); Map scopeValues = new HashMap<>(); scopeValues.put(Scope.Attr.classLoader.name(), customClassLoader); - Scope.child(scopeValues, () -> { - Liquibase liquibase = lbFactory.create("update.xml", - new ClassLoaderResourceAccessor()); - liquibase.update(new Contexts(), new LabelExpression()); - liquibase.getDatabase().getConnection().close(); - }); + + log.info("Liquibase migration: update.xml to be processed..."); + try { + Scope.child(scopeValues, () -> { + Liquibase lb = null; + try { + lb = lbFactory.create("update.xml", + new ClassLoaderResourceAccessor()); + lb.update(new Contexts(), new LabelExpression()); + } catch (LiquibaseException e) { + throw new RuntimeException("Liquibase migration failed", e); + } finally { + closeDatabaseConnection(lb); + } + return null; + }); + } catch (Exception e) { + throw new RuntimeException("Liquibase migration: something went wrong", e); + } log.info("DB update completed."); } catch (Throwable e) { log.error("Migration module launch scripts was failed, Uncaught exception", e); @@ -89,4 +113,20 @@ public void runMigration() { log.info("Migration module launch is Disabled."); } } + + private void closeDatabaseConnection(Liquibase liquibase) { + if (liquibase != null) { + try { + Database db = liquibase.getDatabase(); + if (db != null) { + DatabaseConnection connection = db.getConnection(); + if (connection != null && !connection.isClosed()) { + connection.close(); + } + } + } catch (LiquibaseException e) { + log.error("Failed to close connection", e); + } + } + } } diff --git a/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/Utils.java b/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/Utils.java index d8ceaf6..c3913ad 100644 --- a/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/Utils.java +++ b/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/Utils.java @@ -20,7 +20,7 @@ import java.io.IOException; import java.nio.file.Path; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/classloader/ChildClassLoader.java b/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/classloader/ChildClassLoader.java index 2ab16b6..a67e3ea 100644 --- a/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/classloader/ChildClassLoader.java +++ b/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/classloader/ChildClassLoader.java @@ -60,7 +60,7 @@ public Class findClass(String name) throws ClassNotFoundException { return realParent.loadClass(name); } catch (ClassNotFoundException | NoClassDefFoundError ex) { ClassNotFoundException detailedException = new ClassNotFoundException( - String.format("Error while loading [%s]", name)); + "Error while loading [%s]".formatted(name)); detailedException.addSuppressed(ex); throw detailedException; } diff --git a/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/classloader/ParentLastClassloader.java b/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/classloader/ParentLastClassloader.java index 9451341..a3eb16a 100644 --- a/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/classloader/ParentLastClassloader.java +++ b/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/classloader/ParentLastClassloader.java @@ -22,7 +22,6 @@ import java.net.URLClassLoader; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.Enumeration; import java.util.HashMap; import java.util.LinkedList; @@ -47,8 +46,8 @@ public class ParentLastClassloader extends URLClassLoader { private static final Logger LOGGER = LoggerFactory.getLogger(ParentLastClassloader.class); private static final String Q_CLASSES_JAR_EXPRESSION = "atp-dataset-q-classes-generation.+\\.jar"; private final String sourcePath; - private Map urlClassLoaders = new HashMap<>(); - private String jdbcType; + private final Map urlClassLoaders = new HashMap<>(); + private final String jdbcType; /** * ClassLoader based on {@link URLClassLoader} for loading classes from self. In case class not @@ -74,7 +73,7 @@ public ParentLastClassloader(URLClassLoader urlClassLoader, String sourcePath, S + "atp-dataset-q-classes-generation-pg.jar - there is jdbc_type is 'pg'"); } this.sourcePath = sourcePath; - try (Stream walk = Files.walk(Paths.get(sourcePath))) { + try (Stream walk = Files.walk(Path.of(sourcePath))) { walk .filter(path -> !Utils.isJarFile(path)) .forEach(path -> { @@ -164,7 +163,7 @@ protected ChildClassLoader refreshClassLoader(String className) { return urlClassLoader; } try { - Path dir = Paths.get(sourcePath, jarPath); + Path dir = Path.of(sourcePath, jarPath); List jarList = Files.list(dir).filter(Utils::isJarFile).collect(Collectors.toList()); urlClassLoader = createNewUrlClassLoader(jarList); urlClassLoaders.put(jarPath, urlClassLoader); diff --git a/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/config/DbConfiguration.java b/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/config/DbConfiguration.java index 26a6715..1950237 100644 --- a/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/config/DbConfiguration.java +++ b/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/config/DbConfiguration.java @@ -20,6 +20,7 @@ import org.qubership.atp.dataset.db.migration.LiquibaseFactory; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -54,6 +55,7 @@ public DataSource dataSource(@Value("${jdbc.Url}") String url, } @Bean + @DependsOnDatabaseInitialization public LiquibaseFactory liquibaseFactory(DataSource dataSource) { return new LiquibaseFactory(dataSource); } diff --git a/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/customchange/task/ListValueCustomChange.java b/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/customchange/task/ListValueCustomChange.java index 334f410..59e8878 100644 --- a/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/customchange/task/ListValueCustomChange.java +++ b/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/customchange/task/ListValueCustomChange.java @@ -133,9 +133,10 @@ private List getListValues(UUID attributeId) throws DatabaseExcept private void updateParameter(UUID listValueId, UUID parameterId) throws DatabaseException, SQLException { - String updateParameter = String.format("UPDATE public.\"parameter\"\n" - + "SET list='%s'::uuid\n" - + "WHERE id='%s'::uuid", listValueId, parameterId); + String updateParameter = """ + UPDATE public."parameter" + SET list='%s'::uuid + WHERE id='%s'::uuid""".formatted(listValueId, parameterId); PreparedStatement stmt2 = connection.prepareStatement(updateParameter); stmt2.execute(); } diff --git a/atp-dataset-migration/src/main/resources/application.properties b/atp-dataset-migration/src/main/resources/application.properties index b420d3f..4ff2cf1 100644 --- a/atp-dataset-migration/src/main/resources/application.properties +++ b/atp-dataset-migration/src/main/resources/application.properties @@ -1 +1,4 @@ +# Logging pattern containing traceId and spanId; no longer provided through Sleuth by default +logging.pattern.level="%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]" spring.main.web-application-type=none +spring.profiles.active=${ACTIVE_PROFILES_SPRING:disable-security} \ No newline at end of file diff --git a/atp-dataset-migration/src/test/java/TestSample.java b/atp-dataset-migration/src/test/java/TestSample.java index b2a8f4b..e90092b 100644 --- a/atp-dataset-migration/src/test/java/TestSample.java +++ b/atp-dataset-migration/src/test/java/TestSample.java @@ -16,16 +16,13 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit.jupiter.SpringExtension; import org.qubership.atp.dataset.db.migration.Main; import org.qubership.atp.dataset.db.migration.config.DbConfiguration; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; @Disabled -@ContextConfiguration(classes = {DbConfiguration.class}) -@ExtendWith(SpringExtension.class) +@SpringJUnitConfig(classes = {DbConfiguration.class}) public class TestSample { @Test diff --git a/atp-dataset-migration/src/test/java/org/qubership/atp/dataset/db/migration/MigrationRunnerTest.java b/atp-dataset-migration/src/test/java/org/qubership/atp/dataset/db/migration/MigrationRunnerTest.java index a7da5fd..9c275b9 100644 --- a/atp-dataset-migration/src/test/java/org/qubership/atp/dataset/db/migration/MigrationRunnerTest.java +++ b/atp-dataset-migration/src/test/java/org/qubership/atp/dataset/db/migration/MigrationRunnerTest.java @@ -27,16 +27,14 @@ import javax.sql.DataSource; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; -import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit.jupiter.SpringExtension; - +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import liquibase.Contexts; import liquibase.LabelExpression; import liquibase.Liquibase; @@ -46,8 +44,7 @@ import liquibase.resource.ClassLoaderResourceAccessor; import liquibase.resource.ResourceAccessor; -@ContextConfiguration(classes = {MigrationRunnerTest.TestConfiguration.class}) -@ExtendWith(SpringExtension.class) +@SpringJUnitConfig(classes = {MigrationRunnerTest.TestConfiguration.class}) @TestPropertySource("classpath:test.properties") public class MigrationRunnerTest { @@ -67,6 +64,7 @@ public DataSource dataSource() { } @Bean + @DependsOnDatabaseInitialization public LiquibaseFactory liquibaseFactory() { return mock(LiquibaseFactory.class); } diff --git a/atp-dataset-migration/src/test/java/org/qubership/atp/dataset/db/migration/classloader/ParentLastClassloaderTest.java b/atp-dataset-migration/src/test/java/org/qubership/atp/dataset/db/migration/classloader/ParentLastClassloaderTest.java index 9ba274c..ea5da12 100644 --- a/atp-dataset-migration/src/test/java/org/qubership/atp/dataset/db/migration/classloader/ParentLastClassloaderTest.java +++ b/atp-dataset-migration/src/test/java/org/qubership/atp/dataset/db/migration/classloader/ParentLastClassloaderTest.java @@ -25,7 +25,6 @@ import java.net.URL; import java.net.URLClassLoader; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.Enumeration; import org.hamcrest.core.StringContains; @@ -41,7 +40,7 @@ public class ParentLastClassloaderTest { @BeforeEach public void setUp() throws MalformedURLException { - Path path = Paths.get("atp-dataset-migration/target/scripts"); + Path path = Path.of("atp-dataset-migration/target/scripts"); URL[] urls = new URL[]{path.toUri().toURL()}; URLClassLoader urlClassLoader = new URLClassLoader(urls); parentLassCL = new ParentLastClassloader(urlClassLoader, "src/test/resources/data", "pg"); diff --git a/atp-dataset-openapi-specifications/v1/health-check-controller-v1.yaml b/atp-dataset-openapi-specifications/v1/health-check-controller-v1.yaml index 2024971..7208cf5 100644 --- a/atp-dataset-openapi-specifications/v1/health-check-controller-v1.yaml +++ b/atp-dataset-openapi-specifications/v1/health-check-controller-v1.yaml @@ -32,4 +32,3 @@ paths: description: Forbidden '404': description: Not Found -components: {} diff --git a/atp-dataset-q-classes-generation/pom.xml b/atp-dataset-q-classes-generation/pom.xml index 958795d..d2f6447 100644 --- a/atp-dataset-q-classes-generation/pom.xml +++ b/atp-dataset-q-classes-generation/pom.xml @@ -257,7 +257,7 @@ maven-compiler-plugin - 3.13.0 + 3.15.0 pg-compile diff --git a/atp-dataset/pom.xml b/atp-dataset/pom.xml index d27abb7..4f37ae7 100644 --- a/atp-dataset/pom.xml +++ b/atp-dataset/pom.xml @@ -123,6 +123,10 @@ org.springframework.security spring-security-web + + org.junit.vintage + junit-vintage-engine + @@ -219,10 +223,6 @@ org.springframework.boot spring-boot-starter-data-jpa - - org.hibernate - hibernate-entitymanager - org.slf4j slf4j-api @@ -328,6 +328,12 @@ json-path test + + jakarta.ws.rs + jakarta.ws.rs-api + compile + 3.1.0 + org.antlr antlr4-runtime @@ -340,18 +346,25 @@ org.qubership.atp atp-crypt + + + junit + junit + + org.springframework.cloud spring-cloud-starter-bootstrap - org.springframework.cloud - spring-cloud-sleuth-zipkin + io.zipkin.reporter2 + zipkin-reporter-brave - org.springframework.cloud - spring-cloud-starter-sleuth + io.micrometer + micrometer-tracing-bridge-brave + 1.0.12 org.javers @@ -372,7 +385,7 @@ org.openapitools openapi-generator - 6.2.1 + 7.9.0 com.github.fge @@ -390,9 +403,18 @@ io.swagger.core.v3 - swagger-annotations - 2.2.16 - + swagger-annotations-jakarta + 2.2.22 + + + jakarta.inject + jakarta.inject-api + 2.0.1 + + + jakarta.servlet + jakarta.servlet-api + org.springframework.cloud spring-cloud-starter-vault-config @@ -419,7 +441,6 @@ org.liquibase liquibase-core - ${liquibase.version} org.junit.jupiter @@ -437,6 +458,11 @@ json-smart test + + org.apache.httpcomponents.client5 + httpclient5 + test + au.com.dius.pact.provider junit5 @@ -509,6 +535,11 @@ qubership-atp-common-monitoring-undertow org.qubership.atp.common + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.6.0 + @@ -569,10 +600,8 @@ org.apache.maven.plugins maven-compiler-plugin - 3.13.0 + 3.15.0 - ${maven.compiler.source} - ${maven.compiler.target} org.mapstruct @@ -590,6 +619,7 @@ 0.2.0 + ${java.version} @@ -768,7 +798,22 @@ org.openapitools openapi-generator-maven-plugin - 6.2.1 + 7.9.0 + + spring + ${project.build.directory}/generated-sources + Dto + false + false + + true + true + true + true + true + true + + history-controller-v1.yaml @@ -777,20 +822,9 @@ generate - spring ${project.basedir}/../atp-dataset-openapi-specifications/v1/history-controller-v1.yaml - ${project.build.directory}/generated-sources org.qubership.atp.dataset.service.rest.server org.qubership.atp.dataset.service.rest.dto.versioning - Dto - false - false - - true - true - true - true - @@ -800,22 +834,9 @@ generate - spring - - ${project.basedir}/../atp-dataset-openapi-specifications/v1/attachment-controller-v1.yaml - - ${project.build.directory}/generated-sources + ${project.basedir}/../atp-dataset-openapi-specifications/v1/attachment-controller-v1.yaml org.qubership.atp.dataset.controllers.api org.qubership.atp.dataset.controllers.api.dto.attachments - Dto - false - false - - true - true - true - true - @@ -825,22 +846,9 @@ generate - spring - - ${project.basedir}/../atp-dataset-openapi-specifications/v1/attribute-controller-v1.yaml - - ${project.build.directory}/generated-sources + ${project.basedir}/../atp-dataset-openapi-specifications/v1/attribute-controller-v1.yaml org.qubership.atp.dataset.controllers.api org.qubership.atp.dataset.controllers.api.dto.attributes - Dto - false - false - - true - true - true - true - @@ -850,22 +858,9 @@ generate - spring - - ${project.basedir}/../atp-dataset-openapi-specifications/v1/data-set-controller-v1.yaml - - ${project.build.directory}/generated-sources + ${project.basedir}/../atp-dataset-openapi-specifications/v1/data-set-controller-v1.yaml org.qubership.atp.dataset.controllers.api org.qubership.atp.dataset.controllers.api.dto.datasets - Dto - false - false - - true - true - true - true - @@ -875,22 +870,9 @@ generate - spring - - ${project.basedir}/../atp-dataset-openapi-specifications/v1/data-set-list-controller-v1.yaml - - ${project.build.directory}/generated-sources + ${project.basedir}/../atp-dataset-openapi-specifications/v1/data-set-list-controller-v1.yaml org.qubership.atp.dataset.controllers.api org.qubership.atp.dataset.controllers.api.dto.datasetlists - Dto - false - false - - true - true - true - true - @@ -900,22 +882,9 @@ generate - spring - - ${project.basedir}/../atp-dataset-openapi-specifications/v1/data-set-list-lazy-loading-controller-v1.yaml - - ${project.build.directory}/generated-sources + ${project.basedir}/../atp-dataset-openapi-specifications/v1/data-set-list-lazy-loading-controller-v1.yaml org.qubership.atp.dataset.controllers.api org.qubership.atp.dataset.controllers.api.dto.datasetlists.lazy - Dto - false - false - - true - true - true - true - @@ -925,22 +894,9 @@ generate - spring - - ${project.basedir}/../atp-dataset-openapi-specifications/v1/health-check-controller-v1.yaml - - ${project.build.directory}/generated-sources + ${project.basedir}/../atp-dataset-openapi-specifications/v1/health-check-controller-v1.yaml org.qubership.atp.dataset.controllers.api org.qubership.atp.dataset.controllers.api.dto.healthcheck - Dto - false - false - - true - true - true - true - @@ -950,22 +906,9 @@ generate - spring - - ${project.basedir}/../atp-dataset-openapi-specifications/v1/label-filter-controller-v1.yaml - - ${project.build.directory}/generated-sources + ${project.basedir}/../atp-dataset-openapi-specifications/v1/label-filter-controller-v1.yaml org.qubership.atp.dataset.controllers.api org.qubership.atp.dataset.controllers.api.dto.labels - Dto - false - false - - true - true - true - true - @@ -975,22 +918,9 @@ generate - spring - - ${project.basedir}/../atp-dataset-openapi-specifications/v1/parameter-controller-v1.yaml - - ${project.build.directory}/generated-sources + ${project.basedir}/../atp-dataset-openapi-specifications/v1/parameter-controller-v1.yaml org.qubership.atp.dataset.controllers.api org.qubership.atp.dataset.controllers.api.dto.parameters - Dto - false - false - - true - true - true - true - @@ -1000,22 +930,9 @@ generate - spring - - ${project.basedir}/../atp-dataset-openapi-specifications/v1/test-plan-controller-v1.yaml - - ${project.build.directory}/generated-sources + ${project.basedir}/../atp-dataset-openapi-specifications/v1/test-plan-controller-v1.yaml org.qubership.atp.dataset.controllers.api org.qubership.atp.dataset.controllers.api.dto.testplans - Dto - false - false - - true - true - true - true - @@ -1025,22 +942,9 @@ generate - spring - - ${project.basedir}/../atp-dataset-openapi-specifications/v1/visibility-area-controller-v1.yaml - - ${project.build.directory}/generated-sources + ${project.basedir}/../atp-dataset-openapi-specifications/v1/visibility-area-controller-v1.yaml org.qubership.atp.dataset.controllers.api org.qubership.atp.dataset.controllers.api.dto.visibilityareas - Dto - false - false - - true - true - true - true - diff --git a/atp-dataset/src/main/config/application.properties b/atp-dataset/src/main/config/application.properties index 2f43e7c..53bb777 100644 --- a/atp-dataset/src/main/config/application.properties +++ b/atp-dataset/src/main/config/application.properties @@ -4,7 +4,7 @@ server.shutdown=graceful server.ssl.enabled=false server.http.interface=0.0.0.0 http.websockets-support-enabled=true -spring.resources.static-locations=file:./web/ +spring.web.resources.static-locations=file:./web/ spring.main.allow-bean-definition-overriding=true spring.mvc.pathmatch.matching-strategy=ANT_PATH_MATCHER spring.mvc.async.request-timeout=${request.timeout:1200000} @@ -29,8 +29,8 @@ ei.gridfs.user=${EI_GRID_USER:user} ei.gridfs.password=${EI_GRID_PASS:pass} ##==================SSL===================== -server.ssl.key-store: ${javax.net.ssl.keyStore} -server.ssl.key-store-password: ${javax.net.ssl.keyStorePassword} +server.ssl.key-store: ${jakarta.net.ssl.keyStore} +server.ssl.key-store-password: ${jakarta.net.ssl.keyStorePassword} server.ssl.keyStoreType: PKCS12 ##==================Zipkin===================== @@ -41,7 +41,7 @@ spring.sleuth.web.additional-skip-pattern=/health/visibility_areas_list ##==================atp-auth-spring-boot-starter===================== # spring -spring.profiles.active=${SPRING_PROFILES:disable-security} +spring.profiles.active=${ACTIVE_PROFILES_SPRING:disable-security} spring.cache.cache-names=auth_projects spring.cache.caffeine.spec=maximumSize=100, expireAfterAccess=120s, expireAfterWrite=120s # keycloak diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/config/AtpSwaggerConfig.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/config/AtpSwaggerConfig.java index ec4422e..d03e761 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/config/AtpSwaggerConfig.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/config/AtpSwaggerConfig.java @@ -20,9 +20,9 @@ import java.util.TreeMap; import org.apache.commons.lang3.StringUtils; -import org.springdoc.core.SpringDocUtils; import org.springdoc.core.converters.models.Pageable; -import org.springdoc.core.customizers.OpenApiCustomiser; +import org.springdoc.core.customizers.OpenApiCustomizer; +import org.springdoc.core.utils.SpringDocUtils; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -64,7 +64,7 @@ public OpenAPI openApiDefinition() { * Bean global operation customizer for OpenApi. */ @Bean - public OpenApiCustomiser globalOperationOpenApiCustomiser() { + public OpenApiCustomizer globalOperationOpenApiCustomiser() { return openAPI -> openAPI.getPaths().values() .forEach(pathItem -> pathItem.readOperations() .forEach(operation -> { @@ -83,7 +83,7 @@ public OpenApiCustomiser globalOperationOpenApiCustomiser() { * Bean for sorting schemas. */ @Bean - public OpenApiCustomiser sortSchemasAlphabetically() { + public OpenApiCustomizer sortSchemasAlphabetically() { return openApi -> { Map schemas = openApi.getComponents().getSchemas(); openApi.getComponents().setSchemas(new TreeMap<>(schemas)); diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/config/DbConfiguration.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/config/DbConfiguration.java index 63bfe08..29bc0e3 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/config/DbConfiguration.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/config/DbConfiguration.java @@ -24,6 +24,7 @@ import org.qubership.atp.dataset.db.DBConfig; import org.qubership.atp.dataset.db.DbConfigImpl; import org.qubership.atp.dataset.service.direct.helper.DbCreationFacade; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; @@ -97,6 +98,7 @@ public Configuration qdslConfig(DataSource dataSource) { } @Bean + @DependsOnDatabaseInitialization public SQLQueryFactory queryFactory(DataSource dataSource, Configuration qdslConfig) { return new SQLQueryFactory(qdslConfig, new TransactionAwareDataSourceProxy(dataSource)); } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/config/DsSecurityConfiguration.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/config/DsSecurityConfiguration.java index 0bde05c..5ed3bd9 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/config/DsSecurityConfiguration.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/config/DsSecurityConfiguration.java @@ -16,57 +16,53 @@ package org.qubership.atp.dataset.config; -import org.keycloak.adapters.springsecurity.KeycloakConfiguration; import org.qubership.atp.auth.springbootstarter.config.SecurityConfiguration; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.annotation.Order; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.builders.WebSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer; import org.springframework.security.config.http.SessionCreationPolicy; +@Configuration @Order(1) -@KeycloakConfiguration -@EnableGlobalMethodSecurity(prePostEnabled = true) +@EnableMethodSecurity @Profile("default") public class DsSecurityConfiguration extends SecurityConfiguration { @Value("${atp-auth.headers.content-security-policy}") private String contentSecurityPolicy; + public void configure(HttpSecurity http) throws Exception { + configureHttpSecurity(http); + } + @Override - protected void configure(HttpSecurity http) throws Exception { - super.configure(http); + public void configureHttpSecurity(HttpSecurity http) throws Exception { + super.configureHttpSecurity(http); http - .headers() - .xssProtection().xssProtectionEnabled(false) - .and() - .contentSecurityPolicy(contentSecurityPolicy) - .and() - .frameOptions() - .sameOrigin() - .and() - .csrf().disable() - .authorizeRequests() - .antMatchers("/v3/api-docs/**", - "/swagger-ui/**", - "/webjars/**", - "/metrics", - "/info", - "/scheduledtasks") - .permitAll() - .and() - .authorizeRequests() - .antMatchers("/**") - .authenticated() - .and() - .sessionManagement() - .sessionCreationPolicy(SessionCreationPolicy.STATELESS); + .headers(headers -> headers + .xssProtection(HeadersConfigurer.XXssConfig::disable) + .contentSecurityPolicy(policy -> policy + .policyDirectives(contentSecurityPolicy)) + .frameOptions(HeadersConfigurer.FrameOptionsConfig::sameOrigin)) + .csrf(AbstractHttpConfigurer::disable) + .authorizeHttpRequests(requests -> requests + .requestMatchers("/v3/api-docs/**", "/swagger-ui/**", "/webjars/**", "/metrics", + "/info", "/scheduledtasks") + .permitAll()) + .authorizeHttpRequests(requests -> requests + .requestMatchers("/**") + .authenticated()) + .sessionManagement(management -> management + .sessionCreationPolicy(SessionCreationPolicy.STATELESS)); } - @Override public void configure(WebSecurity web) { - web.ignoring().antMatchers("/health/**"); + web.ignoring().requestMatchers("/health/**"); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/config/HttpsConfig.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/config/HttpsConfig.java index 25e48d6..0359376 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/config/HttpsConfig.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/config/HttpsConfig.java @@ -18,7 +18,7 @@ import java.io.InputStream; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.security.KeyStore; import javax.net.ssl.KeyManager; @@ -56,9 +56,8 @@ public class HttpsConfig { */ @Bean public WebServerFactoryCustomizer containerCustomizer() { - return factory -> factory.getBuilderCustomizers().add(builder -> { - builder.addHttpsListener(httpsPort, httpInterface, sslContext()); - }); + return factory -> factory.getBuilderCustomizers() + .add(builder -> builder.addHttpsListener(httpsPort, httpInterface, sslContext())); } /** @@ -66,7 +65,7 @@ public WebServerFactoryCustomizer containerCust */ @Bean public KeyStore loadKeyStore() { - try (InputStream stream = Files.newInputStream(Paths.get(keyStoreLocation))) { + try (InputStream stream = Files.newInputStream(Path.of(keyStoreLocation))) { KeyStore loadedKeystore = KeyStore.getInstance(keyStoreType); loadedKeystore.load(stream, keyStorePassword.toCharArray()); diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/config/KafkaConfiguration.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/config/KafkaConfiguration.java index 8fadc8a..4c45221 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/config/KafkaConfiguration.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/config/KafkaConfiguration.java @@ -20,7 +20,9 @@ import java.util.Map; import java.util.UUID; +import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; +import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.UUIDDeserializer; import org.qubership.atp.dataset.kafka.entities.project.ProjectEvent; @@ -33,6 +35,8 @@ import org.springframework.kafka.config.KafkaListenerContainerFactory; import org.springframework.kafka.core.ConsumerFactory; import org.springframework.kafka.core.DefaultKafkaConsumerFactory; +import org.springframework.kafka.listener.CommonErrorHandler; +import org.springframework.kafka.listener.MessageListenerContainer; @Configuration @ConditionalOnProperty( @@ -56,8 +60,20 @@ public KafkaListenerContainerFactory projectEventContainerFactory() { new ConcurrentKafkaListenerContainerFactory<>(); factory.setConsumerFactory(projectEventConsumerFactory()); - factory.setErrorHandler((e, consumerRecord) -> { - throw new RuntimeException("Error during event processing.", e); + factory.setCommonErrorHandler(new CommonErrorHandler() { + @Override + public void handleOtherException(Exception exception, Consumer consumer, + MessageListenerContainer container, boolean batchListener) { + // Handler to process non-record-processing errors (i.e. during poll) + throw new RuntimeException("Error during event processing.", exception); + } + + @Override + public boolean handleOne(Exception exception, ConsumerRecord record, + Consumer consumer, MessageListenerContainer container) { + // Handler to process record-processing errors (record listener) + throw new RuntimeException("Error during event processing.", exception); + } }); return factory; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/config/ServiceConfiguration.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/config/ServiceConfiguration.java index 12c8ec2..4385cb9 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/config/ServiceConfiguration.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/config/ServiceConfiguration.java @@ -21,7 +21,7 @@ import javax.script.ScriptEngineManager; import javax.sql.DataSource; -import javax.validation.Validator; +import jakarta.validation.Validator; import org.javers.core.Javers; import org.javers.repository.api.JaversRepository; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/config/SpringLiquibaseConfig.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/config/SpringLiquibaseConfig.java index 6b283a2..2cecd58 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/config/SpringLiquibaseConfig.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/config/SpringLiquibaseConfig.java @@ -35,8 +35,8 @@ @EnableConfigurationProperties(LiquibaseProperties.class) public class SpringLiquibaseConfig { - private DataSource dataSource; - private LiquibaseProperties properties; + private final DataSource dataSource; + private final LiquibaseProperties properties; @Value("${spring.application.name}") private String serviceName; @@ -60,7 +60,6 @@ public SpringLiquibase liquibase() { liquibase.setDefaultSchema(this.properties.getDefaultSchema()); liquibase.setDropFirst(this.properties.isDropFirst()); liquibase.setShouldRun(this.properties.isEnabled()); - liquibase.setLabels(this.properties.getLabels()); Map parameters = this.properties.getParameters(); if (null == parameters) { parameters = new HashMap<>(); diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/config/interceptors/SimpleCorsRequestFilter.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/config/interceptors/SimpleCorsRequestFilter.java index 1dcda87..bff07db 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/config/interceptors/SimpleCorsRequestFilter.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/config/interceptors/SimpleCorsRequestFilter.java @@ -18,14 +18,14 @@ import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.qubership.atp.dataset.service.jpa.model.CacheCleanupService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/AttributePathRepository.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/AttributePathRepository.java index 292324a..c16d54f 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/AttributePathRepository.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/AttributePathRepository.java @@ -21,13 +21,12 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.inject.Provider; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.inject.Provider; import org.qubership.atp.dataset.db.dto.AttributePathDto; import org.qubership.atp.dataset.db.generated.QAttributeKey; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import com.google.common.base.Joiner; @@ -54,7 +53,6 @@ public class AttributePathRepository extends AbstractRepository { * * @param queryFactory is used for creating sql queries. */ - @Autowired public AttributePathRepository(@Nonnull Provider paramRepo, @Nonnull SQLQueryFactory queryFactory) { super(); diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/AttributeRepository.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/AttributeRepository.java index 479727f..5910141 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/AttributeRepository.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/AttributeRepository.java @@ -25,9 +25,9 @@ import java.util.Map; import java.util.UUID; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.inject.Provider; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.inject.Provider; import org.qubership.atp.dataset.db.generated.QAttribute; import org.qubership.atp.dataset.db.utils.Proxies; @@ -39,7 +39,6 @@ import org.qubership.atp.dataset.model.impl.AttributeImpl; import org.qubership.atp.dataset.model.impl.ListValueImpl; import org.qubership.atp.dataset.service.ws.entities.Pair; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import com.google.common.base.Preconditions; @@ -84,7 +83,6 @@ public class AttributeRepository extends AbstractRepository { /** * AttributeRepository. */ - @Autowired public AttributeRepository(@Nonnull SQLQueryFactory queryFactory, @Nonnull Provider dslRepo, @Nonnull Provider paramRepo, diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/CacheRepository.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/CacheRepository.java index f643021..134c7eb 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/CacheRepository.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/CacheRepository.java @@ -19,8 +19,8 @@ import java.util.UUID; import java.util.function.Function; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.db.utils.IdentifiedCacheDelegate; import org.qubership.atp.dataset.db.utils.WeakIdentifiedCache; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/DataSetListRepository.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/DataSetListRepository.java index e40d59d..8046d7e 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/DataSetListRepository.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/DataSetListRepository.java @@ -24,9 +24,9 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.inject.Provider; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.inject.Provider; import org.qubership.atp.dataset.db.utils.Proxies; import org.qubership.atp.dataset.model.Attribute; @@ -39,7 +39,6 @@ import org.qubership.atp.dataset.model.impl.DataSetListImpl; import org.qubership.atp.dataset.model.impl.TableResponse; import org.qubership.atp.dataset.service.rest.dto.manager.AffectedDataSetList; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import com.google.common.base.Preconditions; @@ -66,7 +65,6 @@ public class DataSetListRepository extends AbstractRepository { * * @param queryFactory is used for creating sql queries. */ - @Autowired public DataSetListRepository(@Nonnull SQLQueryFactory queryFactory, @Nonnull Provider vaRepo, @Nonnull Provider dsRepo, diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/DataSetListTreeRepository.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/DataSetListTreeRepository.java index 6b8d9d8..e61dce1 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/DataSetListTreeRepository.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/DataSetListTreeRepository.java @@ -26,9 +26,9 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.inject.Provider; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.inject.Provider; import org.qubership.atp.dataset.db.dto.AttributePathDto; import org.qubership.atp.dataset.db.utils.Proxies; @@ -52,7 +52,6 @@ import org.qubership.atp.dataset.model.impl.DataSetListImpl; import org.qubership.atp.dataset.model.impl.ParameterImpl; import org.qubership.atp.dataset.model.impl.ParameterOverlapImpl; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import org.springframework.util.CollectionUtils; @@ -102,7 +101,6 @@ public class DataSetListTreeRepository extends AbstractRepository { * * @param queryFactory is used for creating sql queries. */ - @Autowired public DataSetListTreeRepository(@Nonnull SQLQueryFactory queryFactory, @Nonnull Provider vaRepo, @Nonnull Provider testPlanRepo, diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/DataSetRepository.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/DataSetRepository.java index 959c9c3..1a09fa3 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/DataSetRepository.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/DataSetRepository.java @@ -20,9 +20,9 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.inject.Provider; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.inject.Provider; import org.qubership.atp.dataset.db.utils.Proxies; import org.qubership.atp.dataset.model.DataSet; @@ -31,7 +31,6 @@ import org.qubership.atp.dataset.model.Parameter; import org.qubership.atp.dataset.model.impl.DataSetImpl; import org.qubership.atp.dataset.model.impl.TableResponse; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import com.google.common.base.Preconditions; @@ -59,7 +58,6 @@ public class DataSetRepository extends AbstractRepository { * * @param queryFactory is used for creating sql queries. */ - @Autowired public DataSetRepository(@Nonnull SQLQueryFactory queryFactory, @Nonnull Provider dslRepo, @Nonnull Provider paramRepo, diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/FilterRepository.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/FilterRepository.java index fabe715..790e3b2 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/FilterRepository.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/FilterRepository.java @@ -24,7 +24,6 @@ import org.qubership.atp.dataset.model.DataSetList; import org.qubership.atp.dataset.model.Filter; import org.qubership.atp.dataset.model.impl.FilterImpl; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import com.google.common.collect.Sets; @@ -40,7 +39,6 @@ public class FilterRepository extends AbstractRepository { private final SQLQueryFactory queryFactory; private final FilterProjection filterProjection = new FilterProjection(); - @Autowired public FilterRepository(SQLQueryFactory queryFactory) { this.queryFactory = queryFactory; } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/GridFsRepositoryImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/GridFsRepositoryImpl.java index 3c58388..b18252c 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/GridFsRepositoryImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/GridFsRepositoryImpl.java @@ -30,7 +30,6 @@ import org.bson.Document; import org.qubership.atp.dataset.model.Parameter; import org.qubership.atp.dataset.model.impl.file.FileData; -import org.springframework.beans.factory.annotation.Autowired; import com.mongodb.client.gridfs.GridFSBucket; import com.mongodb.client.gridfs.model.GridFSFile; @@ -43,10 +42,9 @@ public class GridFsRepositoryImpl implements GridFsRepository { private final GridFSBucket gridFsBucket; - private ThreadLocal>> cachedFileInfo = + private final ThreadLocal>> cachedFileInfo = ThreadLocal.withInitial(() -> new ConcurrentHashMap<>()); - @Autowired public GridFsRepositoryImpl(GridFSBucket gridFsBucket) { this.gridFsBucket = gridFsBucket; } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/IdentifiedCache.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/IdentifiedCache.java index d87fd4c..3255c5d 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/IdentifiedCache.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/IdentifiedCache.java @@ -19,8 +19,8 @@ import java.util.UUID; import java.util.function.Function; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.Identified; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/LabelRepository.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/LabelRepository.java index 9841d40..a33452f 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/LabelRepository.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/LabelRepository.java @@ -19,12 +19,11 @@ import java.util.List; import java.util.UUID; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.Label; import org.qubership.atp.dataset.model.impl.LabelImpl; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import com.google.common.base.Preconditions; @@ -47,7 +46,6 @@ public class LabelRepository extends AbstractRepository { * * @param queryFactory is used for creating sql queries. */ - @Autowired public LabelRepository(@Nonnull SQLQueryFactory queryFactory) { super(); this.queryFactory = queryFactory; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/ListValueRepository.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/ListValueRepository.java index cc9dcfe..e633bce 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/ListValueRepository.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/ListValueRepository.java @@ -21,15 +21,14 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.inject.Provider; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.inject.Provider; import org.qubership.atp.dataset.db.utils.Proxies; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.ListValue; import org.qubership.atp.dataset.model.impl.ListValueImpl; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import com.google.common.base.Preconditions; @@ -52,7 +51,6 @@ public class ListValueRepository extends AbstractRepository { /** * AttributeRepository. */ - @Autowired public ListValueRepository(@Nonnull SQLQueryFactory queryFactory, @Nonnull Provider attrRepo, @Nonnull Provider paramRepo, diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/ParameterRepository.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/ParameterRepository.java index 8b42a25..050e632 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/ParameterRepository.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/ParameterRepository.java @@ -24,8 +24,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.constants.CacheEnum; import org.qubership.atp.dataset.db.dto.AttributePathDto; @@ -47,7 +47,6 @@ import org.qubership.atp.dataset.model.impl.TableResponse; import org.qubership.atp.dataset.model.impl.file.FileData; import org.qubership.atp.dataset.service.direct.ClearCacheService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Repository; @@ -75,7 +74,6 @@ public class ParameterRepository extends AbstractRepository { private final CacheRepository cacheRepo; private final ClearCacheService clearCacheService; - @Autowired protected ParameterRepository(SQLQueryFactory queryFactory, DataSetRepository dsRepo, ListValueRepository lvRepo, diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/TestPlanRepository.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/TestPlanRepository.java index 1378a7c..a4712bd 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/TestPlanRepository.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/TestPlanRepository.java @@ -20,9 +20,9 @@ import java.util.List; import java.util.UUID; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.inject.Provider; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.inject.Provider; import org.qubership.atp.dataset.db.utils.Proxies; import org.qubership.atp.dataset.model.TestPlan; @@ -30,7 +30,6 @@ import org.qubership.atp.dataset.model.impl.TestPlanImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import com.google.common.base.Preconditions; @@ -55,7 +54,6 @@ public class TestPlanRepository extends AbstractRepository { /** * visibility area repository. */ - @Autowired public TestPlanRepository(@Nonnull SQLQueryFactory queryFactory, @Nonnull CacheRepository cacheRepo, @Nonnull Provider visibilityAreaRepo, diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/VisibilityAreaRepository.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/VisibilityAreaRepository.java index 09012dc..ba34774 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/VisibilityAreaRepository.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/VisibilityAreaRepository.java @@ -19,15 +19,14 @@ import java.util.List; import java.util.UUID; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.inject.Provider; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.inject.Provider; import org.qubership.atp.dataset.db.utils.Proxies; import org.qubership.atp.dataset.model.DataSetList; import org.qubership.atp.dataset.model.VisibilityArea; import org.qubership.atp.dataset.model.impl.VisibilityAreaImpl; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import com.google.common.base.Preconditions; @@ -53,7 +52,6 @@ public class VisibilityAreaRepository extends AbstractRepository { * @param queryFactory is used for creating sql queries. * @param filtersRepo repository for deleting filters; */ - @Autowired public VisibilityAreaRepository(@Nonnull SQLQueryFactory queryFactory, @Nonnull Provider dslRepo, @Nonnull CacheRepository cacheRepo, diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/dto/AttributePathDto.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/dto/AttributePathDto.java index 797411b..754a6f7 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/dto/AttributePathDto.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/dto/AttributePathDto.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.UUID; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.google.common.base.MoreObjects; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/dto/ParameterDataDto.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/dto/ParameterDataDto.java index 16208e5..38a8bad 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/dto/ParameterDataDto.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/dto/ParameterDataDto.java @@ -18,7 +18,7 @@ import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import com.google.common.base.MoreObjects; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/dto/ParameterDto.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/dto/ParameterDto.java index b090ce8..cd2770b 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/dto/ParameterDto.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/dto/ParameterDto.java @@ -18,7 +18,7 @@ import java.util.UUID; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.google.common.base.MoreObjects; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jdbc/JdbcTemplatesImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jdbc/JdbcTemplatesImpl.java index 7e76098..332b682 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jdbc/JdbcTemplatesImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jdbc/JdbcTemplatesImpl.java @@ -26,9 +26,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.stereotype.Component; @Component +@DependsOnDatabaseInitialization public class JdbcTemplatesImpl implements JdbcTemplates { private static final Logger LOG = LoggerFactory.getLogger(JdbcTemplatesImpl.class); @Autowired diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/JaversSnapshotService.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/JaversSnapshotService.java index 3fa6bd2..e36acbc 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/JaversSnapshotService.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/JaversSnapshotService.java @@ -33,7 +33,6 @@ import org.qubership.atp.dataset.db.jpa.repositories.JpaJvCommitRepository; import org.qubership.atp.dataset.db.jpa.repositories.JpaJvGlobalIdRepository; import org.qubership.atp.dataset.db.jpa.repositories.JpaJvSnapshotRepository; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -68,7 +67,6 @@ public class JaversSnapshotService { * @param commitRepository commitRepository * @param commitPropertyRepository commitPropertyRepository */ - @Autowired public JaversSnapshotService(JpaJvSnapshotRepository snapshotRepository, JpaJvGlobalIdRepository globalIdRepository, JpaJvCommitRepository commitRepository, diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/JobRunner.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/JobRunner.java index 0d2ee4b..ae544e7 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/JobRunner.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/JobRunner.java @@ -19,7 +19,6 @@ import java.util.List; import org.qubership.atp.dataset.db.jpa.entities.JvSnapshotEntity; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; @@ -38,7 +37,6 @@ public class JobRunner { @Value("${atp-dataset.last.revision.count}") private Long lastRevisionCount; - @Autowired public JobRunner(JaversSnapshotService javersSnapshotService, ThreadPoolTaskExecutor archiveJobExecutor) { this.javersSnapshotService = javersSnapshotService; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/ModelsProvider.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/ModelsProvider.java index 384e8b1..5ffcbe6 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/ModelsProvider.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/ModelsProvider.java @@ -325,7 +325,7 @@ public ListValue getListValueById(UUID id) { if (id == null) { return null; } - ListValueEntity entity = listValueRepository.getById(id); + ListValueEntity entity = listValueRepository.getReferenceById(id); return new ListValue(entity); } @@ -355,7 +355,7 @@ public DataSetList replicateDataSetList(UUID id, String name, UUID visibilityAre dataSetListEntity.setModifiedBy(modifiedBy); dataSetListEntity.setModifiedWhen(modifiedWhen); Optional visibilityArea = visibilityAreaRepository.findById(visibilityAreaId); - if (!visibilityArea.isPresent()) { + if (visibilityArea.isEmpty()) { throw new DataSetServiceException("Visibility Area with id " + visibilityAreaId + " not found"); } dataSetListEntity.setVisibilityArea(visibilityArea.get()); @@ -380,7 +380,7 @@ public DataSet replicateDataSet(UUID id, String name, UUID dataSetListId, Long o dataSetEntity.setName(name); dataSetEntity.setId(id); Optional dataSetListEntity = dataSetListRepository.findById(dataSetListId); - if (!dataSetListEntity.isPresent()) { + if (dataSetListEntity.isEmpty()) { throw new DataSetServiceException("Data Set with id " + dataSetListEntity + " not found"); } dataSetEntity.setDataSetList(dataSetListEntity.get()); @@ -409,7 +409,7 @@ public Attribute replicateAttribute(UUID id, String name, AttributeTypeName type attributeEntity.setName(name); attributeEntity.setId(id); Optional dataSetListEntity = dataSetListRepository.findById(dataSetListId); - if (!dataSetListEntity.isPresent()) { + if (dataSetListEntity.isEmpty()) { throw new DataSetServiceException("Data Set with id " + dataSetListEntity + " not found"); } attributeEntity.setDataSetList(dataSetListEntity.get()); @@ -438,14 +438,14 @@ public Parameter replicateParameter(UUID id, UUID dataSetId, UUID attributeId, U parameterEntity.setSourceId(sourceId); Optional dataSetEntity = dataSetRepository.findById(dataSetId); - if (!dataSetEntity.isPresent()) { + if (dataSetEntity.isEmpty()) { throw new DataSetServiceException("Data Set with id " + dataSetEntity + " not found"); } parameterEntity.setDataSet(dataSetEntity.get()); - AbstractAttributeEntity attributeEntity = attributeRepository.getById(attributeId); + AbstractAttributeEntity attributeEntity = attributeRepository.getReferenceById(attributeId); if (attributeEntity == null) { - attributeEntity = attributeKeyRepository.getById(attributeId); + attributeEntity = attributeKeyRepository.getReferenceById(attributeId); } if (attributeEntity == null) { throw new DataSetServiceException("Attribute with id " + attributeId + " not found"); diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/Wrapper.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/Wrapper.java index ad8d958..375aee0 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/Wrapper.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/Wrapper.java @@ -16,8 +16,8 @@ package org.qubership.atp.dataset.db.jpa; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.qubership.atp.dataset.db.jdbc.JdbcTemplates; import org.qubership.atp.dataset.service.direct.GridFsService; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AbstractAttributeEntity.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AbstractAttributeEntity.java index fe7850e..38c2087 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AbstractAttributeEntity.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AbstractAttributeEntity.java @@ -16,16 +16,17 @@ package org.qubership.atp.dataset.db.jpa.entities; +import java.io.Serial; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Transient; import lombok.Getter; import lombok.Setter; @@ -36,6 +37,7 @@ @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) public abstract class AbstractAttributeEntity extends AbstractUuidBasedEntity { + @Serial private static final long serialVersionUID = -2890156869462056670L; @ManyToOne(fetch = FetchType.LAZY) diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AbstractUuidBasedEntity.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AbstractUuidBasedEntity.java index 3d91c4d..0ecf735 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AbstractUuidBasedEntity.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AbstractUuidBasedEntity.java @@ -19,15 +19,14 @@ import java.io.Serializable; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Type; import lombok.Getter; import lombok.Setter; @@ -37,7 +36,6 @@ public abstract class AbstractUuidBasedEntity implements Serializable { @Id @Getter @Setter - @Type(type = "pg-uuid") @Column(name = "id", updatable = false, nullable = false, columnDefinition = "uuid DEFAULT uuid_generate_v4()") @GeneratedValue( strategy = GenerationType.TABLE, @@ -55,7 +53,7 @@ public abstract class AbstractUuidBasedEntity implements Serializable { /* To resolve deletion conflicts. DS removal and attribute removal both lead to parameter deletion. If both events happen in single transaction - there can be conflict, when we trying to delete already deleted parameter. + there can be conflict, when we are trying to delete already deleted parameter. */ @Getter @Setter @@ -64,8 +62,7 @@ public abstract class AbstractUuidBasedEntity implements Serializable { @Override public boolean equals(Object other) { - if (other instanceof AttributeKeyEntity) { - AttributeKeyEntity otherEntity = (AttributeKeyEntity) other; + if (other instanceof AttributeKeyEntity otherEntity) { return otherEntity.getId().equals(getId()); } return false; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AttributeEntity.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AttributeEntity.java index 010dcf0..299e1c2 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AttributeEntity.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AttributeEntity.java @@ -16,18 +16,19 @@ package org.qubership.atp.dataset.db.jpa.entities; +import java.io.Serial; import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Set; import java.util.UUID; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; @@ -37,6 +38,7 @@ @Entity @Table(name = "attribute") public class AttributeEntity extends AbstractAttributeEntity { + @Serial private static final long serialVersionUID = -7352787552599934981L; @Column(name = "name") diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AttributeKeyEntity.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AttributeKeyEntity.java index 895670d..1b85625 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AttributeKeyEntity.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AttributeKeyEntity.java @@ -16,18 +16,19 @@ package org.qubership.atp.dataset.db.jpa.entities; +import java.io.Serial; import java.util.LinkedList; import java.util.List; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import lombok.Getter; import lombok.Setter; @@ -37,6 +38,7 @@ @Entity @Table(name = "attribute_key") public class AttributeKeyEntity extends AbstractAttributeEntity { + @Serial private static final long serialVersionUID = 9009718864988359127L; @Column(name = "key") diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AttributeTypeEntity.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AttributeTypeEntity.java index 7604616..c671b11 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AttributeTypeEntity.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AttributeTypeEntity.java @@ -16,12 +16,12 @@ package org.qubership.atp.dataset.db.jpa.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.qubership.atp.dataset.service.jpa.model.AttributeTypeName; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AttributesSortType.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AttributesSortType.java index 09a0e72..5c0ae61 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AttributesSortType.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/AttributesSortType.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.AttributeType; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/DataSetEntity.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/DataSetEntity.java index 174d75c..15f94b6 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/DataSetEntity.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/DataSetEntity.java @@ -16,19 +16,20 @@ package org.qubership.atp.dataset.db.jpa.entities; +import java.io.Serial; import java.util.LinkedList; import java.util.List; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; @@ -39,6 +40,7 @@ @Table(name = "dataset") public class DataSetEntity extends AbstractUuidBasedEntity { + @Serial private static final long serialVersionUID = 137890563796237611L; @Column(name = "name") diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/DataSetListEntity.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/DataSetListEntity.java index d6d9f61..8f9e23e 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/DataSetListEntity.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/DataSetListEntity.java @@ -16,6 +16,7 @@ package org.qubership.atp.dataset.db.jpa.entities; +import java.io.Serial; import java.sql.Timestamp; import java.util.HashSet; import java.util.LinkedList; @@ -23,17 +24,17 @@ import java.util.Set; import java.util.UUID; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; @@ -44,6 +45,7 @@ @Table(name = "datasetlist") public class DataSetListEntity extends AbstractUuidBasedEntity { + @Serial private static final long serialVersionUID = 1558849568530137446L; @Column(name = "name") diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/FilterEntity.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/FilterEntity.java index ee87734..72413e8 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/FilterEntity.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/FilterEntity.java @@ -19,13 +19,13 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/JvCommitEntity.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/JvCommitEntity.java index e49a8f4..d9aa8d4 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/JvCommitEntity.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/JvCommitEntity.java @@ -16,10 +16,10 @@ package org.qubership.atp.dataset.db.jpa.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/JvCommitPropertyEntity.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/JvCommitPropertyEntity.java index e5004e8..d81d1bd 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/JvCommitPropertyEntity.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/JvCommitPropertyEntity.java @@ -16,10 +16,10 @@ package org.qubership.atp.dataset.db.jpa.entities; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/JvCommitPropertyId.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/JvCommitPropertyId.java index eb2c599..fdea66f 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/JvCommitPropertyId.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/JvCommitPropertyId.java @@ -18,8 +18,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/JvGlobalIdEntity.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/JvGlobalIdEntity.java index e1a39c9..20025d2 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/JvGlobalIdEntity.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/JvGlobalIdEntity.java @@ -16,10 +16,10 @@ package org.qubership.atp.dataset.db.jpa.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/JvSnapshotEntity.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/JvSnapshotEntity.java index 03be355..a9a5ea4 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/JvSnapshotEntity.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/JvSnapshotEntity.java @@ -16,12 +16,12 @@ package org.qubership.atp.dataset.db.jpa.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.javers.core.metamodel.object.SnapshotType; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/LabelEntity.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/LabelEntity.java index 91133c0..63b1952 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/LabelEntity.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/LabelEntity.java @@ -19,13 +19,13 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/ListValueEntity.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/ListValueEntity.java index dcebbdf..e27a32e 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/ListValueEntity.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/ListValueEntity.java @@ -16,14 +16,15 @@ package org.qubership.atp.dataset.db.jpa.entities; +import java.io.Serial; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; @@ -33,6 +34,7 @@ @Entity @Table(name = "list_values") public class ListValueEntity extends AbstractUuidBasedEntity { + @Serial private static final long serialVersionUID = -5573359622797789816L; @ManyToOne(fetch = FetchType.LAZY) diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/ParameterEntity.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/ParameterEntity.java index 352ca17..04be004 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/ParameterEntity.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/ParameterEntity.java @@ -16,15 +16,16 @@ package org.qubership.atp.dataset.db.jpa.entities; +import java.io.Serial; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import lombok.Getter; import lombok.Setter; @@ -34,6 +35,7 @@ @Entity @Table(name = "parameter") public class ParameterEntity extends AbstractUuidBasedEntity { + @Serial private static final long serialVersionUID = 5436974377291909573L; @Column(name = "string") diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/TestPlanEntity.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/TestPlanEntity.java index 85e0e2e..ff6fbf2 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/TestPlanEntity.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/TestPlanEntity.java @@ -19,13 +19,13 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/UserSettingsEntity.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/UserSettingsEntity.java index 80ac9b5..edc9c80 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/UserSettingsEntity.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/UserSettingsEntity.java @@ -18,10 +18,10 @@ import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/VisibilityAreaEntity.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/VisibilityAreaEntity.java index 3f35b04..1ed9c3a 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/VisibilityAreaEntity.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/entities/VisibilityAreaEntity.java @@ -19,12 +19,12 @@ import java.util.LinkedList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/repositories/JpaAttributeRepository.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/repositories/JpaAttributeRepository.java index 7c8ff9b..5b95fee 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/repositories/JpaAttributeRepository.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/repositories/JpaAttributeRepository.java @@ -56,14 +56,15 @@ public interface JpaAttributeRepository extends JpaAbstractAttributeRepository getByDatasetId(UUID datasetId); - @Query(value = "select \n" - + " (CASE WHEN leftAttr.type_datasetlist_id != rightAttr.type_datasetlist_id \n" - + " and leftAttr.attribute_type_id = 4 \n" - + " and leftAttr.attribute_type_id = rightAttr.attribute_type_id\n" - + " THEN true ELSE false END) AS is_equal\n" - + " from \n" - + " (select * from \"attribute\" a2 where id = ?1) as leftAttr,\n" - + " (select * from \"attribute\" a2 where id = ?2) as rightAttr", nativeQuery = true) + @Query(value = """ + select\s + (CASE WHEN leftAttr.type_datasetlist_id != rightAttr.type_datasetlist_id\s + and leftAttr.attribute_type_id = 4\s + and leftAttr.attribute_type_id = rightAttr.attribute_type_id + THEN true ELSE false END) AS is_equal + from\s + (select * from "attribute" a2 where id = ?1) as leftAttr, + (select * from "attribute" a2 where id = ?2) as rightAttr""", nativeQuery = true) boolean isDifferentDslAttributes(UUID leftAttrId, UUID rightAttrId); @Query(value = "SELECT * from \"attribute\" a WHERE a.datasetlist_id = ?1" diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/repositories/JpaListValueRepository.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/repositories/JpaListValueRepository.java index f99deb3..8c9eadc 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/repositories/JpaListValueRepository.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/repositories/JpaListValueRepository.java @@ -28,7 +28,7 @@ public interface JpaListValueRepository extends JpaRepository getByAttributeId(UUID id); - ListValueEntity getById(UUID id); + ListValueEntity getReferenceById(UUID id); List getByAttributeIdAndSourceId(UUID id, UUID sourceId); diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/repositories/JpaParameterRepository.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/repositories/JpaParameterRepository.java index c4f0ba7..1574705 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/repositories/JpaParameterRepository.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/jpa/repositories/JpaParameterRepository.java @@ -48,11 +48,12 @@ public interface JpaParameterRepository extends JpaRepository getByDataSetIdSorted(UUID dataSetId); - @Query(value = "select p.* from parameter p, attribute a, attribute_key ak \n" - + "where p.dataset_id =?1 \n" - + "and p.attribute_id = ak.id \n" - + "and a.id = ak.attribute_id \n" - + "ORDER by a.name", nativeQuery = true) + @Query(value = """ + select p.* from parameter p, attribute a, attribute_key ak\s + where p.dataset_id =?1\s + and p.attribute_id = ak.id\s + and a.id = ak.attribute_id\s + ORDER by a.name""", nativeQuery = true) List getOverlapByDataSetIdSorted(UUID dataSetId); @Query(value = "select distinct p.dataSet.id from ParameterEntity p where p.dataSetReferenceId = ?1") diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/utils/IdentifiedCacheDelegate.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/utils/IdentifiedCacheDelegate.java index b26f5e1..f69b51a 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/utils/IdentifiedCacheDelegate.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/utils/IdentifiedCacheDelegate.java @@ -19,8 +19,8 @@ import java.util.UUID; import java.util.function.Function; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.db.IdentifiedCache; import org.qubership.atp.dataset.model.Identified; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/utils/Proxies.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/utils/Proxies.java index f06e34e..9bd2cf3 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/utils/Proxies.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/utils/Proxies.java @@ -23,7 +23,7 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import javax.annotation.concurrent.NotThreadSafe; import org.qubership.atp.dataset.model.Identified; @@ -111,7 +111,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl @Override public String toString() { - return String.format("[%s with id: %s]", type.getSimpleName(), id); + return "[%s with id: %s]".formatted(type.getSimpleName(), id); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/utils/StrongIdentifiedCache.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/utils/StrongIdentifiedCache.java index 45437bb..c8d2e06 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/utils/StrongIdentifiedCache.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/utils/StrongIdentifiedCache.java @@ -22,8 +22,8 @@ import java.util.UUID; import java.util.function.Function; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.db.IdentifiedCache; import org.qubership.atp.dataset.model.Identified; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/utils/WeakIdentifiedCache.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/utils/WeakIdentifiedCache.java index cff5ed8..61dbcdb 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/db/utils/WeakIdentifiedCache.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/db/utils/WeakIdentifiedCache.java @@ -22,8 +22,8 @@ import java.util.concurrent.ExecutionException; import java.util.function.Function; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.db.IdentifiedCache; import org.qubership.atp.dataset.model.Identified; @@ -33,7 +33,7 @@ import com.google.common.cache.CacheBuilder; public class WeakIdentifiedCache implements IdentifiedCache { - private static CacheBuilder CACHE_BUILDER = CacheBuilder.from("weakValues"); + private static final CacheBuilder CACHE_BUILDER = CacheBuilder.from("weakValues"); private Map, Cache> caches = null; @Nonnull diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/DataSetExportExecutor.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/DataSetExportExecutor.java index d197ab7..5635386 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/DataSetExportExecutor.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/DataSetExportExecutor.java @@ -39,7 +39,7 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.antlr4.TextParameterParser; import org.qubership.atp.dataset.db.GridFsRepository; @@ -164,7 +164,7 @@ public DataSetExportExecutor(ObjectSaverToDiskService objectSaverToDiskService, } @Override - public void exportToFolder(ExportImportData exportData, Path workDir) throws Exception { + public void exportToFolder(ExportImportData exportData, Path workDir) { log.info("Start export by request {}", exportData); switch (exportData.getFormat()) { case ATP: @@ -239,7 +239,7 @@ private void collectReferencesOnDslFromAttribute(String dataSetListId, Set dataSetListEntity = dataSetListRepository.findById(UUID.fromString(dataSetListId)); - if (!dataSetListEntity.isPresent()) { + if (dataSetListEntity.isEmpty()) { log.info("Data Set List not found by id {}", dataSetListId); return; } @@ -275,7 +275,7 @@ private void collectReferencesOnDsAndCorrespondingDsl(String dataSetId, dataSetId, macroContext, attrPath); alreadyCollectedDs.add(dataSetId); Optional dataSet = dataSetRepository.findById(UUID.fromString(dataSetId)); - if (!dataSet.isPresent()) { + if (dataSet.isEmpty()) { log.info("Data Set not found by id {}", dataSetId); return; } @@ -410,9 +410,9 @@ private void walkThroughResultTree(AbstractTextParameter parseResult, Set walkThroughResultTree(parameter, dataSets, dataSetLists); } } - if (parseResult instanceof RefDslMacro) { - dataSets.addAll(((RefDslMacro) parseResult).getDataSets()); - dataSetLists.addAll(((RefDslMacro) parseResult).getDataSetLists()); + if (parseResult instanceof RefDslMacro macro) { + dataSets.addAll(macro.getDataSets()); + dataSetLists.addAll(macro.getDataSetLists()); } } @@ -446,7 +446,7 @@ private void exportProjectByScope(ExportImportData atpScopeData, Path workDir) t private void exportDataSet(UUID dataSetId, Path workDir, Map attributeTypes, ExportScope atpScopeExport) { Optional dataSet = dataSetRepository.findById(dataSetId); - if (!dataSet.isPresent()) { + if (dataSet.isEmpty()) { log.info("Data Set not found by id {}", dataSetId); return; } @@ -490,7 +490,7 @@ private void exportFiles(List idsOfFileParameters, Optional file = entry.getValue(); if (file.isPresent()) { Optional fileInfo = gridFsRepository.getFileInfo(parameterId); - if (!fileInfo.isPresent()) { + if (fileInfo.isEmpty()) { log.info("File not found for parameter with id {}", parameterId); continue; } @@ -506,11 +506,11 @@ private void checkListValueParameter(ParameterEntity param, ListValueEntity list DataSetParameter exportParameter, Path workDir) { AbstractAttributeEntity listValueAttr = listValue.getAttribute(); AbstractAttributeEntity paramAttr = param.getAttribute(); - if (paramAttr instanceof AttributeEntity) { + if (paramAttr instanceof AttributeEntity entity) { UUID attrParamId = paramAttr.getId(); UUID attrListValueId = listValueAttr.getId(); if (!attrParamId.equals(attrListValueId)) { - Optional optionalListValue = ((AttributeEntity) paramAttr).getListValues().stream() + Optional optionalListValue = entity.getListValues().stream() .filter(value -> value.getText().equals(listValue.getText())).findFirst(); if (optionalListValue.isPresent()) { exportParameter.setListValue(optionalListValue.get().getId()); @@ -564,7 +564,7 @@ private void exportDataSetStorage(UUID dataSetListId, Path workDir, Map attributeTypes, ExportScope atpScopeExport) { Optional dataSetListEntity = dataSetListRepository.findById(dataSetListId); - if (!dataSetListEntity.isPresent()) { + if (dataSetListEntity.isEmpty()) { log.info("Data Set List not found by id {}", dataSetListId); return; } @@ -710,8 +710,8 @@ private void exportDataset(DataSetContext dataset, MacroContext macroContext, for (ParameterContext param : dataset.getParameters()) { processParameter(param, dataset, macroContext, dataSetListContext.getGroups(), parameters, null); } - String dsName = String.format("%s.%s", dataSetListContext.getDataSetListName(), dataset.getName()); - String fileName = String.format("%s.%s", dsName, DATASET); + String dsName = "%s.%s".formatted(dataSetListContext.getDataSetListName(), dataset.getName()); + String fileName = "%s.%s".formatted(dsName, DATASET); ExportPostmanDataset exportDataset = new ExportPostmanDataset(dataset.getId(), dsName, parameters); objectSaverToDiskService.writeAtpEntityToFile(fileName, exportDataset, DATASET, workDir, true); } @@ -759,7 +759,7 @@ private String getPath(String attrPath, String paramName) { if (Strings.isNullOrEmpty(attrPath)) { return paramName; } else { - return String.format("%s.%s", attrPath, paramName); + return "%s.%s".formatted(attrPath, paramName); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/service/DataSetAttributesImporter.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/service/DataSetAttributesImporter.java index 305132b..4cc2539 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/service/DataSetAttributesImporter.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/service/DataSetAttributesImporter.java @@ -16,7 +16,6 @@ package org.qubership.atp.dataset.ei.service; -import java.io.IOException; import java.nio.file.Path; import java.util.ArrayList; import java.util.HashMap; @@ -105,7 +104,7 @@ private void importDataSetAttributes(UUID id, Path path, List dataSetLists } log.debug("importDataSetAttributes import object: {}", object); if (object == null) { - String message = String.format("Cannot load file by path %s", path.toString()); + String message = "Cannot load file by path %s".formatted(path.toString()); log.error(message); throw new RuntimeException(message); } @@ -147,7 +146,7 @@ private void importDataSetListValues(UUID id, Path path, List createdAttri } log.debug("import object: {}", object); if (object == null) { - String message = String.format("Cannot load file by path %s", path.toString()); + String message = "Cannot load file by path %s".formatted(path.toString()); log.error(message); throw new RuntimeException(message); } @@ -163,7 +162,7 @@ private void importDataSetListValues(UUID id, Path path, List createdAttri attrService.replicateListValue(object.getId(), object.getText(), object.getAttribute(), object.getSourceId()); } catch (DataSetServiceException e) { - String message = String.format("Cannot create list value by import object %s", object); + String message = "Cannot create list value by import object %s".formatted(object); log.error(message); throw new ExportException(message, e); } @@ -192,7 +191,7 @@ private void createWithCheckName(DataSetAttribute object, AttributeTypeName type attribute.setTypeDataSetListId(object.getTypeDataSetList()); attrService.save(attribute); } catch (DataSetServiceException e) { - String message = String.format("Cannot create new attribute by import object %s", object); + String message = "Cannot create new attribute by import object %s".formatted(object); log.error(message); throw new ExportException(message, e); } @@ -255,7 +254,7 @@ private void importDataSetAttributeKeys(UUID id, Path path, ExportImportData imp } log.debug("import object: {}", object); if (object == null) { - String message = String.format("Cannot load file by path %s", path.toString()); + String message = "Cannot load file by path %s".formatted(path.toString()); log.error(message); throw new RuntimeException(message); } @@ -273,7 +272,7 @@ private void importDataSetAttributeKeys(UUID id, Path path, ExportImportData imp object.getDataSet(), object.getDataSetList(), object.getSourceId()); } catch (DataSetServiceException e) { String message = - String.format("Cannot create new attribute key by import object %s", object); + "Cannot create new attribute key by import object %s".formatted(object); log.error(message); throw new ExportException(message, e); } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/service/DataSetListImporter.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/service/DataSetListImporter.java index 4373247..7f0a2ec 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/service/DataSetListImporter.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/service/DataSetListImporter.java @@ -16,7 +16,6 @@ package org.qubership.atp.dataset.ei.service; -import java.io.IOException; import java.nio.file.Path; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -102,7 +101,7 @@ private UUID importDataSetList(UUID id, Path path, ExportImportData importData) } log.debug("Import object: {} in path: {}", object, path); if (object == null) { - String message = String.format("Cannot load file by path %s", path.toString()); + String message = "Cannot load file by path %s".formatted(path.toString()); log.error(message); throw new RuntimeException(message); } @@ -149,7 +148,7 @@ private void createWithCheckName(org.qubership.atp.dataset.ei.model.DataSetList object.getSourceId(), object.getCreatedBy(), object.getCreatedWhen(), object.getModifiedBy(), object.getModifiedWhen()); } catch (DataSetServiceException e) { - String message = String.format("Cannot create new data set list by import object %s", object); + String message = "Cannot create new data set list by import object %s".formatted(object); log.error(message); throw new ExportException(message, e); } @@ -191,7 +190,7 @@ private void createVisibilityAreaIfAbsent(UUID vaId) { } } catch (DataSetServiceException e) { String message = - String.format("Cannot create Visibility Area %s", vaId); + "Cannot create Visibility Area %s".formatted(vaId); throw new ExportException(message, e); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/service/DataSetParametersImporter.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/service/DataSetParametersImporter.java index d08cb75..466b85e 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/service/DataSetParametersImporter.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/service/DataSetParametersImporter.java @@ -105,7 +105,7 @@ private void importDataSetParameters(UUID id, Path path, ExportImportData import log.debug("importDataSetParameters import object: {}", object); if (object == null) { - String message = String.format("Cannot load file by path %s", path.toString()); + String message = "Cannot load file by path %s".formatted(path.toString()); log.error(message); throw new RuntimeException(message); } @@ -139,7 +139,7 @@ private void importDataSetParameters(UUID id, Path path, ExportImportData import updateParameter(parameter, object); paramService.save(parameter); } catch (DataSetServiceException e) { - String message = String.format("Cannot create new parameter by import object %s", object); + String message = "Cannot create new parameter by import object %s".formatted(object); log.error(message, e); throw new ExportException(message, e); } @@ -278,7 +278,7 @@ private void validateDataSetParameters(UUID id, Path path, .loadFileAsObject(dataSetAttributesWithoutReplacement.get(attributeIdWithoutReplacement), DataSetAttribute.class); if (attribute == null) { - String message = String.format("Cannot load file by path %s", path.toString()); + String message = "Cannot load file by path %s".formatted(path.toString()); log.error(message); result.add(message); return; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/service/DataSetsImporter.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/service/DataSetsImporter.java index e05ec32..392290a 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/service/DataSetsImporter.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/service/DataSetsImporter.java @@ -101,7 +101,7 @@ private void importDataSets(UUID id, Path path, Map maxOrdering, Exp } log.debug("import object: {}", object); if (object == null) { - String message = String.format("Cannot load file by path %s", path.toString()); + String message = "Cannot load file by path %s".formatted(path.toString()); log.error(message); throw new RuntimeException(message); } @@ -151,7 +151,7 @@ private void createWithCheckName(org.qubership.atp.dataset.ei.model.DataSet obje dsService.replicate(object.getId(), object.getName(), object.getDataSetList(), order, object.getSourceId(), isDataSetLocked(object)); } catch (DataSetServiceException e) { - String message = String.format("Cannot create new data set by import object %s", object); + String message = "Cannot create new data set by import object %s".formatted(object); throw new ExportException(message, e); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/service/EntityManagerController.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/service/EntityManagerController.java index f4cd275..1e7cc69 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/service/EntityManagerController.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/ei/service/EntityManagerController.java @@ -16,8 +16,8 @@ package org.qubership.atp.dataset.ei.service; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.springframework.stereotype.Service; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/attribute/AttributeExistsException.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/attribute/AttributeExistsException.java index 6e78775..284291a 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/attribute/AttributeExistsException.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/attribute/AttributeExistsException.java @@ -23,9 +23,9 @@ @ResponseStatus(value = HttpStatus.CONFLICT, reason = "TDS-3001") public class AttributeExistsException extends DataSetException { - private static String DEFAULT_MESSAGE = "Attribute with name '%s' already exists"; + private static final String DEFAULT_MESSAGE = "Attribute with name '%s' already exists"; public AttributeExistsException(String message) { - super(String.format(DEFAULT_MESSAGE, message)); + super(DEFAULT_MESSAGE.formatted(message)); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/attribute/AttributeTypeException.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/attribute/AttributeTypeException.java index c3d5abd..e9e12f2 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/attribute/AttributeTypeException.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/attribute/AttributeTypeException.java @@ -23,9 +23,9 @@ @ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR, reason = "TDS-3002") public class AttributeTypeException extends DataSetException { - private static String DEFAULT_MESSAGE = "Attribute '%s' has invalid type '%s'"; + private static final String DEFAULT_MESSAGE = "Attribute '%s' has invalid type '%s'"; public AttributeTypeException(String attrName, String type) { - super(String.format(DEFAULT_MESSAGE, attrName, type)); + super(DEFAULT_MESSAGE.formatted(attrName, type)); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/dataset/DataSetExistsException.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/dataset/DataSetExistsException.java index 7ff0d66..e4cf927 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/dataset/DataSetExistsException.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/dataset/DataSetExistsException.java @@ -23,9 +23,9 @@ @ResponseStatus(value = HttpStatus.CONFLICT, reason = "TDS-4002") public class DataSetExistsException extends DataSetException { - private static String DEFAULT_MESSAGE = "Dataset with name '%s' already exists"; + private static final String DEFAULT_MESSAGE = "Dataset with name '%s' already exists"; public DataSetExistsException(String message) { - super(String.format(DEFAULT_MESSAGE, message)); + super(DEFAULT_MESSAGE.formatted(message)); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/dataset/DataSetLockedException.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/dataset/DataSetLockedException.java index 186d2bc..883c4fe 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/dataset/DataSetLockedException.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/dataset/DataSetLockedException.java @@ -26,6 +26,6 @@ public class DataSetLockedException extends DataSetException { private static final String DEFAULT_MESSAGE = "Dataset with name '%s' is locked"; public DataSetLockedException(String dataSetName) { - super(String.format(DEFAULT_MESSAGE, dataSetName)); + super(DEFAULT_MESSAGE.formatted(dataSetName)); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/datasetlist/DataSetListExistsException.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/datasetlist/DataSetListExistsException.java index 5f8b6cb..13d4950 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/datasetlist/DataSetListExistsException.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/datasetlist/DataSetListExistsException.java @@ -23,9 +23,9 @@ @ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR, reason = "TDS-2002") public class DataSetListExistsException extends DataSetException { - private static String DEFAULT_MESSAGE = "Dataset list with name '%s' already exists"; + private static final String DEFAULT_MESSAGE = "Dataset list with name '%s' already exists"; public DataSetListExistsException(String message) { - super(String.format(DEFAULT_MESSAGE, message)); + super(DEFAULT_MESSAGE.formatted(message)); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelExportNotExistDatasetListlException.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelExportNotExistDatasetListlException.java index c269063..b42f202 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelExportNotExistDatasetListlException.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelExportNotExistDatasetListlException.java @@ -25,9 +25,9 @@ @ResponseStatus(value = HttpStatus.NOT_FOUND, reason = "TDS-8002") public class ExcelExportNotExistDatasetListlException extends DataSetException { - private static String DEFAULT_MESSAGE = "No DSL was found for the specified id: '%s' during Excel import"; + private static final String DEFAULT_MESSAGE = "No DSL was found for the specified id: '%s' during Excel import"; public ExcelExportNotExistDatasetListlException(UUID dslId) { - super(String.format(DEFAULT_MESSAGE, dslId)); + super(DEFAULT_MESSAGE.formatted(dslId)); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelExportUnexpectedException.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelExportUnexpectedException.java index 9673e30..b456cc1 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelExportUnexpectedException.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelExportUnexpectedException.java @@ -23,9 +23,9 @@ @ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR, reason = "TDS-8001") public class ExcelExportUnexpectedException extends DataSetException { - private static String DEFAULT_MESSAGE = "Error while creating export data file for DSL: '%s' Error: '%s'"; + private static final String DEFAULT_MESSAGE = "Error while creating export data file for DSL: '%s' Error: '%s'"; public ExcelExportUnexpectedException(String dslName, Exception ex) { - super(String.format(DEFAULT_MESSAGE, dslName, ex.getMessage())); + super(DEFAULT_MESSAGE.formatted(dslName, ex.getMessage())); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelImportNotExistingAttributeException.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelImportNotExistingAttributeException.java index a79cf83..59a40a8 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelImportNotExistingAttributeException.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelImportNotExistingAttributeException.java @@ -23,11 +23,11 @@ @ResponseStatus(value = HttpStatus.BAD_REQUEST, reason = "TDS-7002") public class ExcelImportNotExistingAttributeException extends DataSetException { - private static String DEFAULT_MESSAGE = "Failed to import data set list: attribute '%s' doesn't exist " + private static final String DEFAULT_MESSAGE = "Failed to import data set list: attribute '%s' doesn't exist " + "in DSL schema"; public ExcelImportNotExistingAttributeException(String attributeName) { - super(String.format(DEFAULT_MESSAGE, attributeName)); + super(DEFAULT_MESSAGE.formatted(attributeName)); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelImportNotExistingChildAttributeException.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelImportNotExistingChildAttributeException.java index 282b032..fbb422f 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelImportNotExistingChildAttributeException.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelImportNotExistingChildAttributeException.java @@ -23,10 +23,10 @@ @ResponseStatus(value = HttpStatus.BAD_REQUEST, reason = "TDS-7003") public class ExcelImportNotExistingChildAttributeException extends DataSetException { - private static String DEFAULT_MESSAGE = "Failed to import child dsl : attribute '%s' doesn't exist in DSL schema"; + private static final String DEFAULT_MESSAGE = "Failed to import child dsl : attribute '%s' doesn't exist in DSL schema"; public ExcelImportNotExistingChildAttributeException(String attributeName) { - super(String.format(DEFAULT_MESSAGE, attributeName)); + super(DEFAULT_MESSAGE.formatted(attributeName)); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelImportNotExistingRefParameterException.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelImportNotExistingRefParameterException.java index b1188fb..a5526e4 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelImportNotExistingRefParameterException.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelImportNotExistingRefParameterException.java @@ -23,13 +23,13 @@ @ResponseStatus(value = HttpStatus.BAD_REQUEST, reason = "TDS-7004") public class ExcelImportNotExistingRefParameterException extends DataSetException { - private static String DEFAULT_MESSAGE = "Provided referenced [%s], DS '%s', in attribute '%s' " + private static final String DEFAULT_MESSAGE = "Provided referenced [%s], DS '%s', in attribute '%s' " + "parameter doesn't exist"; public ExcelImportNotExistingRefParameterException(String parameterValue, String parameterDsRefName, String attributeName) { - super(String.format(DEFAULT_MESSAGE, parameterValue, parameterDsRefName, attributeName)); + super(DEFAULT_MESSAGE.formatted(parameterValue, parameterDsRefName, attributeName)); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelImportUnexpectedException.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelImportUnexpectedException.java index 840a02f..e9abc7e 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelImportUnexpectedException.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ExcelImportUnexpectedException.java @@ -23,9 +23,9 @@ @ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR, reason = "TDS-7005") public class ExcelImportUnexpectedException extends DataSetException { - private static String DEFAULT_MESSAGE = "Unexpected error while import. Exception: '%s'"; + private static final String DEFAULT_MESSAGE = "Unexpected error while import. Exception: '%s'"; public ExcelImportUnexpectedException(Exception e) { - super(String.format(DEFAULT_MESSAGE, e.getMessage())); + super(DEFAULT_MESSAGE.formatted(e.getMessage())); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ImportExcelNotEqualsAttributeTypeException.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ImportExcelNotEqualsAttributeTypeException.java index 7a12914..e51fb19 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ImportExcelNotEqualsAttributeTypeException.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ImportExcelNotEqualsAttributeTypeException.java @@ -23,9 +23,9 @@ @ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR, reason = "TDS-7006") public class ImportExcelNotEqualsAttributeTypeException extends DataSetException { - private static String DEFAULT_MESSAGE = "The attribute '%s' with type '%s' is different compared to DSL"; + private static final String DEFAULT_MESSAGE = "The attribute '%s' with type '%s' is different compared to DSL"; public ImportExcelNotEqualsAttributeTypeException(String attributeName, String attributeTypeValue) { - super(String.format(DEFAULT_MESSAGE, attributeName, attributeTypeValue)); + super(DEFAULT_MESSAGE.formatted(attributeName, attributeTypeValue)); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ImportExcelNotSupportedAttributeTypeException.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ImportExcelNotSupportedAttributeTypeException.java index e8da7d0..d6e075c 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ImportExcelNotSupportedAttributeTypeException.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/excel/ImportExcelNotSupportedAttributeTypeException.java @@ -26,10 +26,10 @@ @ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR, reason = "TDS-7007") public class ImportExcelNotSupportedAttributeTypeException extends DataSetException { - private static String DEFAULT_MESSAGE = "Invalid attribute '%s' type: '%s'. Supported import types: %s"; + private static final String DEFAULT_MESSAGE = "Invalid attribute '%s' type: '%s'. Supported import types: %s"; public ImportExcelNotSupportedAttributeTypeException(String attributeName, String attributeTypeValue, List supportedImportAttributeTypes) { - super(String.format(DEFAULT_MESSAGE, attributeName, attributeTypeValue, supportedImportAttributeTypes)); + super(DEFAULT_MESSAGE.formatted(attributeName, attributeTypeValue, supportedImportAttributeTypes)); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/file/FileDsUploadException.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/file/FileDsUploadException.java index 66e0fb3..3aeb504 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/file/FileDsUploadException.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/file/FileDsUploadException.java @@ -23,9 +23,9 @@ @ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR, reason = "TDS-6003") public class FileDsUploadException extends DataSetException { - private static String DEFAULT_MESSAGE = "Cannot bulk upload file '%s'"; + private static final String DEFAULT_MESSAGE = "Cannot bulk upload file '%s'"; public FileDsUploadException(String message) { - super(String.format(DEFAULT_MESSAGE, message)); + super(DEFAULT_MESSAGE.formatted(message)); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/file/FileExcelExportNotFoundException.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/file/FileExcelExportNotFoundException.java index b47db88..7d08433 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/file/FileExcelExportNotFoundException.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/exception/file/FileExcelExportNotFoundException.java @@ -23,9 +23,9 @@ @ResponseStatus(value = HttpStatus.NOT_FOUND, reason = "TDS-6006") public class FileExcelExportNotFoundException extends DataSetException { - private static String DEFAULT_MESSAGE = "Excel file with name '%s' not found"; + private static final String DEFAULT_MESSAGE = "Excel file with name '%s' not found"; public FileExcelExportNotFoundException(String message) { - super(String.format(DEFAULT_MESSAGE, message)); + super(DEFAULT_MESSAGE.formatted(message)); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/kafka/handlers/project/ProjectEventHandler.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/kafka/handlers/project/ProjectEventHandler.java index 517f7f4..55b1b7f 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/kafka/handlers/project/ProjectEventHandler.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/kafka/handlers/project/ProjectEventHandler.java @@ -23,7 +23,6 @@ import org.qubership.atp.dataset.kafka.entities.project.EventType; import org.qubership.atp.dataset.kafka.entities.project.ProjectEvent; import org.qubership.atp.dataset.kafka.handlers.KafkaEventHandler; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; @@ -34,14 +33,13 @@ ) public class ProjectEventHandler implements KafkaEventHandler { - private Map processingStrategyMap; + private final Map processingStrategyMap; /** * ProjectEventHandler constructor. * * @param handleStrategySet is set of processing strategies for a project event. */ - @Autowired public ProjectEventHandler(Set> handleStrategySet) { processingStrategyMap = new HashMap<>(); diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/EvalContextImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/EvalContextImpl.java index 3c8bb6c..f4045d8 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/EvalContextImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/EvalContextImpl.java @@ -30,8 +30,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.macros.args.RefArg; import org.qubership.atp.dataset.macros.cache.Cache; @@ -115,7 +115,7 @@ private static T resolveUsingCtx( throws Exception { try { Optional> sigOpt = arg.asSignature(); - if (!sigOpt.isPresent()) { + if (sigOpt.isEmpty()) { RefArg.Context ctx = arg.asContextRef().orElseThrow(() -> new IllegalArgumentException("Expected to be context ref: " + arg)); return ctx.resolve(context); @@ -344,7 +344,7 @@ public int hashCode() { @Nonnull @Override public Iterator getStrictContexts() { - return new AbstractIterator() { + return new AbstractIterator<>() { private EvalContextImpl next = EvalContextImpl.this; @@ -363,7 +363,7 @@ protected EvalContextImpl computeNext() { @Nonnull @Override public Iterator getNonStrictContexts() { - return new AbstractIterator() { + return new AbstractIterator<>() { private final TreeSet checked = new TreeSet<>(SAME_NON_STRICT); private EvalContextImpl next = EvalContextImpl.this; private boolean isStrict = true; @@ -390,7 +390,7 @@ protected EvalContextImpl computeNext() { private static class AppendDebugIdentifier implements Function { - private static AppendDebugIdentifier INSTANCE = new AppendDebugIdentifier(); + private static final AppendDebugIdentifier INSTANCE = new AppendDebugIdentifier(); @Override public String apply(String s) { diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/EvaluationContext.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/EvaluationContext.java index 298f9ba..7fd9f77 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/EvaluationContext.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/EvaluationContext.java @@ -19,8 +19,8 @@ import java.util.Iterator; import java.util.List; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.macros.args.RefArg; import org.qubership.atp.dataset.macros.exception.CtxEvalException; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/MacroRegistry.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/MacroRegistry.java index 6289a26..9a4d810 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/MacroRegistry.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/MacroRegistry.java @@ -16,7 +16,7 @@ package org.qubership.atp.dataset.macros; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; public interface MacroRegistry { diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/MacroRegistryImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/MacroRegistryImpl.java index 5594e63..0d7b5f8 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/MacroRegistryImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/MacroRegistryImpl.java @@ -20,8 +20,8 @@ import java.util.List; import java.util.Map; -import javax.annotation.Nonnull; -import javax.annotation.PostConstruct; +import jakarta.annotation.Nonnull; +import jakarta.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/Macros.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/Macros.java index bce2a65..5cd26cd 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/Macros.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/Macros.java @@ -18,7 +18,7 @@ import java.util.stream.Stream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.macros.args.ArgsParser; import org.qubership.atp.dataset.macros.args.MacroArg; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/ArgSignature.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/ArgSignature.java index 0da429b..7473eb7 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/ArgSignature.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/ArgSignature.java @@ -16,7 +16,7 @@ package org.qubership.atp.dataset.macros.args; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.macros.Position; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/ArgSignatureImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/ArgSignatureImpl.java index 72f2550..22f3791 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/ArgSignatureImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/ArgSignatureImpl.java @@ -18,7 +18,7 @@ import java.util.Objects; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.macros.Position; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/CtxValueSup.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/CtxValueSup.java index a9c0499..d4249ad 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/CtxValueSup.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/CtxValueSup.java @@ -16,7 +16,7 @@ package org.qubership.atp.dataset.macros.args; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.macros.EvaluationContext; import org.qubership.atp.dataset.macros.impl.reference.ReferenceAliasType; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/DotSeparatedArgsParser.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/DotSeparatedArgsParser.java index 4bd73c3..cbffbfb 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/DotSeparatedArgsParser.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/DotSeparatedArgsParser.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.macros.Position; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/MacroArgFactoryImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/MacroArgFactoryImpl.java index 3cab8d5..618a3b3 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/MacroArgFactoryImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/MacroArgFactoryImpl.java @@ -20,7 +20,7 @@ import java.util.NoSuchElementException; import java.util.Optional; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.macros.Position; import org.qubership.atp.dataset.macros.exception.EvalException; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/MacroArgsFactory.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/MacroArgsFactory.java index 9ae94e9..4651df8 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/MacroArgsFactory.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/MacroArgsFactory.java @@ -16,7 +16,7 @@ package org.qubership.atp.dataset.macros.args; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.macros.Position; import org.qubership.atp.dataset.macros.impl.reference.ReferenceAliasType; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/RefArg.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/RefArg.java index 69fc716..637433f 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/RefArg.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/RefArg.java @@ -21,8 +21,8 @@ import java.util.Optional; import java.util.function.Supplier; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.macros.EvaluationContext; import org.qubership.atp.dataset.macros.impl.reference.ReferenceAliasType; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/SigValueSup.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/SigValueSup.java index 125f65e..e9e3f52 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/SigValueSup.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/SigValueSup.java @@ -18,7 +18,7 @@ import java.util.List; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.DataSetList; import org.qubership.atp.dataset.model.VisibilityArea; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/SignatureArg.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/SignatureArg.java index 5c549eb..4847118 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/SignatureArg.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/SignatureArg.java @@ -18,7 +18,7 @@ import java.util.Optional; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * May be text or ref. Contains in macro arguments signature. diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/TextArg.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/TextArg.java index 22122ed..73e5bc5 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/TextArg.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/args/TextArg.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Optional; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.macros.Position; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/cache/Cache.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/cache/Cache.java index c315139..464d745 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/cache/Cache.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/cache/Cache.java @@ -16,7 +16,7 @@ package org.qubership.atp.dataset.macros.cache; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; public interface Cache { diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/cache/CachedParameter.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/cache/CachedParameter.java index 55e03c4..f7fafc3 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/cache/CachedParameter.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/cache/CachedParameter.java @@ -50,8 +50,7 @@ public int hashCode() { @Override public boolean equals(Object obj) { - if (obj instanceof CachedParameter) { - CachedParameter other = (CachedParameter) obj; + if (obj instanceof CachedParameter other) { boolean sameParameter = other.getParameter().equals(parameter); boolean samePath = other.getParameterPath().equals(parameterPath); boolean sameDataSet = other.getTopDataSetId().equals(topDataSetId); diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/cache/MacroCacheKey.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/cache/MacroCacheKey.java index 23ff6ae..7a8adde 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/cache/MacroCacheKey.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/cache/MacroCacheKey.java @@ -16,8 +16,8 @@ package org.qubership.atp.dataset.macros.cache; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; public interface MacroCacheKey { diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/cache/NoCache.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/cache/NoCache.java index c9a89b8..3739f26 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/cache/NoCache.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/cache/NoCache.java @@ -16,8 +16,8 @@ package org.qubership.atp.dataset.macros.cache; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; public class NoCache implements Cache, MacroCacheKey { private static final NoCache SELF = new NoCache();//to not to expose impl class diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/cache/SimpleCache.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/cache/SimpleCache.java index 236b75b..8eacaf1 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/cache/SimpleCache.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/cache/SimpleCache.java @@ -19,11 +19,11 @@ import java.util.HashMap; import java.util.Map; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; public class SimpleCache implements Cache { - private Map map = new HashMap<>(); + private final Map map = new HashMap<>(); public SimpleCache() { } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/exception/CtxEvalException.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/exception/CtxEvalException.java index 0259bc6..346d45b 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/exception/CtxEvalException.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/exception/CtxEvalException.java @@ -20,8 +20,8 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.macros.EvaluationContext; import org.qubership.atp.dataset.macros.processor.MacroContextBase; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/exception/EvalException.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/exception/EvalException.java index 4f2d880..3abc6b4 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/exception/EvalException.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/exception/EvalException.java @@ -23,7 +23,7 @@ public EvalException(String message) { } public EvalException(String format, Object... args) { - super(String.format(format, args)); + super(format.formatted(args)); } public EvalException(String message, Throwable cause) { diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/InnMacros.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/InnMacros.java index 4b51a94..bcfc383 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/InnMacros.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/InnMacros.java @@ -16,6 +16,7 @@ package org.qubership.atp.dataset.macros.impl; +import java.util.concurrent.ThreadLocalRandom; import java.util.stream.Stream; import org.qubership.atp.dataset.macros.EvaluationContext; @@ -39,7 +40,7 @@ public String evaluate(Stream input, EvaluationContext conte StringBuilder result = new StringBuilder(); int last = 0; for (int i = 0; i < 9; i++) { - int floor = (int) Math.floor(Math.random() * (10 - 1) + 1); + int floor = (int) Math.floor(ThreadLocalRandom.current().nextDouble() * (10 - 1) + 1); result.append(floor); last += FACTORS[i] * floor; } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/RandomBetweenMacros.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/RandomBetweenMacros.java index 4bd6912..78e68ab 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/RandomBetweenMacros.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/RandomBetweenMacros.java @@ -17,6 +17,7 @@ package org.qubership.atp.dataset.macros.impl; import java.util.List; +import java.util.concurrent.ThreadLocalRandom; import java.util.stream.Stream; import org.qubership.atp.dataset.macros.EvaluationContext; @@ -47,7 +48,7 @@ public Long evaluate(Stream input, EvaluationContext context long min = getLong(list.get(0)); long max = getLong(list.get(1)); - return min + (long) (Math.random() * ((max - min) + 1)); + return min + (long) (ThreadLocalRandom.current().nextDouble() * ((max - min) + 1)); } @Override diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/ReferenceMacros.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/ReferenceMacros.java index 1c4453d..5343e73 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/ReferenceMacros.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/ReferenceMacros.java @@ -18,7 +18,7 @@ import java.util.stream.Stream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.macros.EvaluationContext; import org.qubership.atp.dataset.macros.Macros; @@ -57,12 +57,7 @@ public ArgsParser createArgsParser() { @Override protected SignatureArg createArg(int index, @Nonnull MacroArgFactory args) throws Exception { - switch (index) { - case 0: - return args.ds(); - default: - return args.attr(); - } + return index == 0 ? args.ds() : args.attr(); } }; } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/ReferenceThisDsMacros.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/ReferenceThisDsMacros.java index 51be573..b270d8a 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/ReferenceThisDsMacros.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/ReferenceThisDsMacros.java @@ -18,7 +18,7 @@ import java.util.stream.Stream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.macros.EvaluationContext; import org.qubership.atp.dataset.macros.Macros; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/ReferenceToDslMacros.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/ReferenceToDslMacros.java index 4362622..09f76c0 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/ReferenceToDslMacros.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/ReferenceToDslMacros.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.macros.EvaluationContext; import org.qubership.atp.dataset.macros.Macros; @@ -86,12 +86,12 @@ private static String evaluate(@Nonnull RefArg dslArg, } OverlapItem.Reachable reachable = refItem.asReachable(); Optional paramOpt = reachable.getParameter(); - if (!paramOpt.isPresent()) { + if (paramOpt.isEmpty()) { return ""; } Parameter parameter = paramOpt.get(); Optional valueOpt = reachable.getValue(); - if (!valueOpt.isPresent()) { + if (valueOpt.isEmpty()) { return ""; } String value = valueOpt.get(); diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/reference/ReferenceAliasType.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/reference/ReferenceAliasType.java index e8cdbab..a14a96b 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/reference/ReferenceAliasType.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/impl/reference/ReferenceAliasType.java @@ -20,7 +20,7 @@ import java.util.Optional; import java.util.Set; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.DataSet; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/parser/Strategy.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/parser/Strategy.java index a987249..6a7e884 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/parser/Strategy.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/parser/Strategy.java @@ -43,6 +43,6 @@ public String setValue(String value) { @Override public String toString() { - return String.format("%s %s", String.valueOf(getKey()), String.valueOf(getValue())); + return "%s %s".formatted(String.valueOf(getKey()), String.valueOf(getValue())); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/parser/Token.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/parser/Token.java index f02c22b..af408d5 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/parser/Token.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/parser/Token.java @@ -18,7 +18,7 @@ import java.util.Map; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; public interface Token extends Map.Entry { diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/AbstractMacroProcessor.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/AbstractMacroProcessor.java index 4e37395..b2bc9ab 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/AbstractMacroProcessor.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/AbstractMacroProcessor.java @@ -16,7 +16,7 @@ package org.qubership.atp.dataset.macros.processor; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.macros.MacroRegistry; import org.qubership.atp.dataset.macros.exception.CtxEvalException; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/MacroContext.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/MacroContext.java index fd52ae1..c4bfb62 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/MacroContext.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/MacroContext.java @@ -21,8 +21,8 @@ import java.util.Objects; import java.util.Optional; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.macros.EvaluationContext; import org.qubership.atp.dataset.macros.MacroRegistry; @@ -140,7 +140,7 @@ private void unwrapAliases(ArgsParser.Result result) { Iterator iterator = parsed.iterator(); for (int i = 0; i < wrappedArgs; i++) { Optional> signature = iterator.next().asRef(); - if (!signature.isPresent()) { + if (signature.isEmpty()) { continue;//nothing to init } RefArg.Signature arg = signature.get(); diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/MacroContextBase.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/MacroContextBase.java index e26d1c8..89ed6e6 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/MacroContextBase.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/MacroContextBase.java @@ -16,7 +16,7 @@ package org.qubership.atp.dataset.macros.processor; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.macros.exception.CtxEvalException; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/MacroProcessorBase.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/MacroProcessorBase.java index 4fd10ce..83f4b90 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/MacroProcessorBase.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/MacroProcessorBase.java @@ -16,8 +16,8 @@ package org.qubership.atp.dataset.macros.processor; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.macros.exception.CtxEvalException; import org.qubership.atp.dataset.macros.parser.Token; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/MacroProcessorImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/MacroProcessorImpl.java index e8f2c6a..e9f23fa 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/MacroProcessorImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/MacroProcessorImpl.java @@ -16,7 +16,7 @@ package org.qubership.atp.dataset.macros.processor; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.macros.EvaluationContext; import org.qubership.atp.dataset.macros.MacroRegistry; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/RefAliasContext.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/RefAliasContext.java index 9d4c976..5f73746 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/RefAliasContext.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/RefAliasContext.java @@ -16,7 +16,7 @@ package org.qubership.atp.dataset.macros.processor; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.macros.MacroRegistry; import org.qubership.atp.dataset.macros.Macros; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/RefAliasProcessor.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/RefAliasProcessor.java index a5fb20b..9ff224e 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/RefAliasProcessor.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/macros/processor/RefAliasProcessor.java @@ -16,7 +16,7 @@ package org.qubership.atp.dataset.macros.processor; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.macros.MacroRegistry; import org.qubership.atp.dataset.macros.args.ArgsParser; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/Attribute.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/Attribute.java index 13d9075..98bdd32 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/Attribute.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/Attribute.java @@ -18,7 +18,7 @@ import java.util.List; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.ObjectIdGenerators; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/AttributeType.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/AttributeType.java index fba814c..1fb7ac9 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/AttributeType.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/AttributeType.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; public enum AttributeType { TEXT((short) 1), FILE((short) 2), LIST((short) 3), DSL((short) 4), CHANGE((short) 5), ENCRYPTED((short) 6); diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/DataSetList.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/DataSetList.java index 5b2a74e..d0b26c9 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/DataSetList.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/DataSetList.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/Identified.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/Identified.java index 75f9394..bc6d414 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/Identified.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/Identified.java @@ -19,7 +19,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.service.rest.View; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/MixInId.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/MixInId.java index 5dd87ae..187a2ed 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/MixInId.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/MixInId.java @@ -21,8 +21,8 @@ import java.util.Base64; import java.util.UUID; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.impl.MixInIdImpl; import org.qubership.atp.dataset.service.rest.MixInIdSerializer; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/Parameter.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/Parameter.java index 8281a4d..868d40d 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/Parameter.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/Parameter.java @@ -16,8 +16,8 @@ package org.qubership.atp.dataset.model; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.impl.file.FileData; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/ParameterOverlap.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/ParameterOverlap.java index 0487ac8..2d4b065 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/ParameterOverlap.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/ParameterOverlap.java @@ -16,7 +16,7 @@ package org.qubership.atp.dataset.model; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/api/CopyDsAttributeRequest.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/api/CopyDsAttributeRequest.java index 82b2fc2..debf07b 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/api/CopyDsAttributeRequest.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/api/CopyDsAttributeRequest.java @@ -18,7 +18,7 @@ import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/api/saga/requests/CopyDataSetListsRequest.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/api/saga/requests/CopyDataSetListsRequest.java index d74e2c7..9436b24 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/api/saga/requests/CopyDataSetListsRequest.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/api/saga/requests/CopyDataSetListsRequest.java @@ -19,8 +19,8 @@ import java.util.List; import java.util.UUID; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/api/saga/requests/RevertRequest.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/api/saga/requests/RevertRequest.java index 8e0ae76..a3c09d1 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/api/saga/requests/RevertRequest.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/api/saga/requests/RevertRequest.java @@ -18,7 +18,7 @@ import java.util.UUID; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/AttributeImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/AttributeImpl.java index 0f0e7ae..37b4094 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/AttributeImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/AttributeImpl.java @@ -20,7 +20,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.AttributeType; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/AttributePathImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/AttributePathImpl.java index cf9681f..8a22db7 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/AttributePathImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/AttributePathImpl.java @@ -20,7 +20,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.AttributePath; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/DataSetImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/DataSetImpl.java index 83fe4cc..923a0cf 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/DataSetImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/DataSetImpl.java @@ -21,7 +21,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.DataSet; import org.qubership.atp.dataset.model.DataSetList; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/DataSetListImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/DataSetListImpl.java index c300f4b..a960b87 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/DataSetListImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/DataSetListImpl.java @@ -21,7 +21,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.DataSet; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/FilterImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/FilterImpl.java index 8ecbb27..0b3285d 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/FilterImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/FilterImpl.java @@ -20,7 +20,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.Filter; import org.qubership.atp.dataset.model.Identified; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/FlatDataImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/FlatDataImpl.java index 41f6eca..96b6e04 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/FlatDataImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/FlatDataImpl.java @@ -20,7 +20,7 @@ import java.util.function.Consumer; import java.util.function.Supplier; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.DataSet; @@ -96,7 +96,7 @@ public void accept(@Nonnull Identified entry) { } else if (DataSetList.class.isAssignableFrom(clazz)) { fillEntry((DataSetList) entry, this::getDataSetLists, this::setDataSetLists); } else { - throw new IllegalArgumentException(String.format("[%s] is not designed to accept [%s]", this, clazz)); + throw new IllegalArgumentException("[%s] is not designed to accept [%s]".formatted(this, clazz)); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/LabelImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/LabelImpl.java index 0902d85..d3262d7 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/LabelImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/LabelImpl.java @@ -19,7 +19,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.Identified; import org.qubership.atp.dataset.model.Label; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/ListValueImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/ListValueImpl.java index 39ad075..fe3384f 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/ListValueImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/ListValueImpl.java @@ -19,7 +19,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.Identified; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/MixInIdImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/MixInIdImpl.java index a49bc0b..227a82b 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/MixInIdImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/MixInIdImpl.java @@ -19,8 +19,8 @@ import java.util.Objects; import java.util.UUID; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.MixInId; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/ParameterBaseImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/ParameterBaseImpl.java index 000de6d..6d9978d 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/ParameterBaseImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/ParameterBaseImpl.java @@ -18,7 +18,7 @@ import java.util.UUID; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.DataSet; import org.qubership.atp.dataset.model.ListValue; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/ParameterImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/ParameterImpl.java index 119b64e..74c9aaf 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/ParameterImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/ParameterImpl.java @@ -19,7 +19,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.DataSet; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/ParameterOverlapImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/ParameterOverlapImpl.java index 638ffc4..184cab9 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/ParameterOverlapImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/ParameterOverlapImpl.java @@ -19,7 +19,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.AttributePath; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/TestPlanImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/TestPlanImpl.java index 234d8f3..ff9759c 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/TestPlanImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/TestPlanImpl.java @@ -19,7 +19,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.Identified; import org.qubership.atp.dataset.model.TestPlan; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/VisibilityAreaImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/VisibilityAreaImpl.java index 6f16263..4cc8856 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/VisibilityAreaImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/VisibilityAreaImpl.java @@ -20,7 +20,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.DataSetList; import org.qubership.atp.dataset.model.Identified; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/file/FileData.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/file/FileData.java index db02cdb..ebf99e2 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/file/FileData.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/impl/file/FileData.java @@ -18,7 +18,7 @@ import java.util.UUID; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.Parameter; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/AbstractDsUiHandler.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/AbstractDsUiHandler.java index f41274a..70e2100 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/AbstractDsUiHandler.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/AbstractDsUiHandler.java @@ -18,8 +18,8 @@ import java.util.Iterator; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.AttributeType; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/AbstractDslUiHandler.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/AbstractDslUiHandler.java index 2f70b68..e48e4dd 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/AbstractDslUiHandler.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/AbstractDslUiHandler.java @@ -18,8 +18,8 @@ import java.util.Iterator; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.AttributeType; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/AtpDsSerializer.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/AtpDsSerializer.java index 4261fab..773ebf0 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/AtpDsSerializer.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/AtpDsSerializer.java @@ -26,8 +26,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.AttributeType; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/Change.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/Change.java index 4cf3bc6..36bd7fa 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/Change.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/Change.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.UUID; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/ChangeType.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/ChangeType.java index 560095f..ad0a0bb 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/ChangeType.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/ChangeType.java @@ -20,8 +20,8 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.google.common.base.Joiner; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/DsAttrPathUiHandler.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/DsAttrPathUiHandler.java index f21e31c..e844971 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/DsAttrPathUiHandler.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/DsAttrPathUiHandler.java @@ -24,8 +24,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.DataSetList; @@ -44,7 +44,7 @@ public class DsAttrPathUiHandler extends AbstractDsUiHandler { private final Deque groupsPath = new ArrayDeque<>(); private boolean isLeaf = false; private UiManAttribute result = null; - private Deque convertedGroupsPath = new ArrayDeque<>(); + private final Deque convertedGroupsPath = new ArrayDeque<>(); public DsAttrPathUiHandler(DsEvaluator evaluator, List attrPath) { this.evaluator = evaluator; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/DsParamHandler.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/DsParamHandler.java index 542ebb3..e29eca2 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/DsParamHandler.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/DsParamHandler.java @@ -24,8 +24,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.AttributeType; import org.qubership.atp.dataset.model.DataSet; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/DslAttrHandler.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/DslAttrHandler.java index 6759a99..9edc6dd 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/DslAttrHandler.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/DslAttrHandler.java @@ -20,8 +20,8 @@ import java.util.LinkedList; import java.util.List; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.DataSetList; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/DslUiHandler.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/DslUiHandler.java index 402c7bc..365986c 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/DslUiHandler.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/DslUiHandler.java @@ -85,7 +85,7 @@ protected void attributeStarts(Attribute attr) { OverlapIterator overlapIterator = OverlapIterator.create(uiDataSet.getSource(), attr.getId(), attrPath); OverlapItem context = overlapIterator.next(); Optional parameter = context.getParameter(); - if (!parameter.isPresent()) { + if (parameter.isEmpty()) { continue; } Parameter param = parameter.get(); diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/OverlapItem.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/OverlapItem.java index 10a8403..c7c5052 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/OverlapItem.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/OverlapItem.java @@ -23,8 +23,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.DataSet; @@ -343,7 +343,7 @@ public Optional getValue() { return Optional.ofNullable(param.getFileData()).map(FileData::getFileName); default: throw new UnsupportedOperationException( - String.format("Could not extract text value from parameter %s with type %s", + "Could not extract text value from parameter %s with type %s".formatted( this, getAttribute().getType().getName())); } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/OverlapIterator.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/OverlapIterator.java index 8492510..a1e9e00 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/OverlapIterator.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/OverlapIterator.java @@ -26,8 +26,8 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.AttributePath; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/OverlapLayers.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/OverlapLayers.java index 6aa3d93..b15b393 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/OverlapLayers.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/OverlapLayers.java @@ -27,8 +27,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.AttributeType; @@ -113,7 +113,7 @@ protected DataSet computeNext() { } OverlapItem.Reachable reachable = refSup.asReachable(); Optional parameterOpt = reachable.getParameter(); - if (!parameterOpt.isPresent() || reachable.getAttribute().getType() != AttributeType.DSL) { + if (parameterOpt.isEmpty() || reachable.getAttribute().getType() != AttributeType.DSL) { return endOfData(); } DataSet dataSetReference = parameterOpt.get().getDataSetReference(); diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/Prefix.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/Prefix.java index 5a93144..f957178 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/Prefix.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/Prefix.java @@ -18,8 +18,8 @@ import java.util.function.BiConsumer; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * https://stackoverflow.com/questions/32131987/how-can-i-make-cartesian-product-with-java-8-streams diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/Utils.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/Utils.java index bdce588..3e7db9e 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/Utils.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/Utils.java @@ -33,8 +33,8 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.DataSet; @@ -138,7 +138,7 @@ public static boolean isEqual(@Nonnull Class clazz, */ @Nonnull public static Stream allRefs(@Nonnull Identified root) { - Iterator allRefs = new AllRefsIterator(Iterators.singletonIterator(root), true) { + Iterator allRefs = new AllRefsIterator<>(Iterators.singletonIterator(root), true) { @Override protected Iterator getChildren(@Nonnull Identified parent) { return parent.getReferences().iterator(); @@ -444,8 +444,8 @@ private static void collectRootCauses(@Nonnull StringBuilder to, @Nonnull Throwa public static boolean isUuid(Object value) { if (value instanceof UUID) { return true; - } else if (value instanceof String) { - return uuidPattern.matcher((String)value).matches(); + } else if (value instanceof String string) { + return uuidPattern.matcher(string).matches(); } else { return false; } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/AllRefsIterator.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/AllRefsIterator.java index 870e3ba..a87426d 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/AllRefsIterator.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/AllRefsIterator.java @@ -22,8 +22,8 @@ import java.util.Set; import java.util.function.Predicate; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.google.common.collect.AbstractIterator; import com.google.common.collect.Sets; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/ChainIterator.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/ChainIterator.java index 4642301..0d850c4 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/ChainIterator.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/ChainIterator.java @@ -18,8 +18,8 @@ import java.util.Iterator; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.google.common.collect.AbstractIterator; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/Leaf.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/Leaf.java index 4d90cb7..541a480 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/Leaf.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/Leaf.java @@ -19,8 +19,8 @@ import java.util.List; import java.util.Map; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; public class Leaf implements Map.Entry, Object> { diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/LeafsDetector.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/LeafsDetector.java index 13ab17e..88fe622 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/LeafsDetector.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/LeafsDetector.java @@ -19,8 +19,8 @@ import java.util.Iterator; import java.util.function.Predicate; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * Adds leafs detector functionality to {@link AllRefsIterator}.
Designed to be used in @@ -37,12 +37,10 @@ class LeafsDetector extends AllRefsIterator { * of current iteration, same as {@link AllRefsIterator}.
Reports about vertical level * changes using childrenSup and backToParentsCb.
Does not resolve recursion by default. * You can do that in childrenSup or itemsFilter.
Reports about leafs found using - * leafsConsumer.
One iteration may result in invocation of leafsConsumer no more then one - * time. + * leafsConsumer.
One iteration may result in invocation of leafsConsumer no more than one time. * * @param parents to iterate over. Inclusive. - * @param itemsFilter filters objects to iterate over. Delegates to {@link - * AllRefsIterator#itemsFilter} + * @param itemsFilter filters objects to iterate over. Delegates to {@link AllRefsIterator}. */ LeafsDetector(@Nonnull Iterator parents, @Nonnull TraverseHandler traverseHandler, diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/LeafsWalker.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/LeafsWalker.java index c4abd06..cae8835 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/LeafsWalker.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/LeafsWalker.java @@ -19,8 +19,8 @@ import java.util.Iterator; import java.util.function.Predicate; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.google.common.collect.AbstractIterator; @@ -34,16 +34,12 @@ public class LeafsWalker extends AbstractIterator { * * @param parents to iterate over. Inclusive. * @param traverseHandler describes paths to iterate over and explains how construct leaf. - * @param itemsFilter may filter any tree node. See {@link AllRefsIterator#itemsFilter}. May - * be used to resolve recursion. + * @param itemsFilter may filter any tree node. See {@link AllRefsIterator}. May be used to resolve recursion. */ public LeafsWalker(@Nonnull Iterator parents, @Nonnull TraverseAndLeafsHandler traverseHandler, @Nullable Predicate itemsFilter) { - leafsSup = new LeafsDetector(parents, - traverseHandler, - itemsFilter) { - + leafsSup = new LeafsDetector<>(parents, traverseHandler, itemsFilter) { @Nullable @Override protected Iterator getChildren(@Nonnull Object parent) { diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/RefsVisitor.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/RefsVisitor.java index b86df55..96474cd 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/RefsVisitor.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/RefsVisitor.java @@ -19,8 +19,8 @@ import java.util.Iterator; import java.util.function.Predicate; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; public class RefsVisitor extends LeafsDetector { @@ -34,8 +34,7 @@ public class RefsVisitor extends LeafsDetector { * * @param parents to iterate over. Inclusive. * @param visitor to handle visit events. - * @param itemsFilter filters objects to iterate over. Delegates to {@link - * AllRefsIterator#itemsFilter} + * @param itemsFilter filters objects to iterate over. Delegates to {@link AllRefsIterator}. */ public RefsVisitor(@Nonnull Iterator parents, @Nonnull TraverseVisitor visitor, diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/TraverseAndLeafsHandler.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/TraverseAndLeafsHandler.java index db2bafa..ce0ab50 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/TraverseAndLeafsHandler.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/TraverseAndLeafsHandler.java @@ -16,8 +16,8 @@ package org.qubership.atp.dataset.model.utils.tree; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * Describes paths to iterate over and explains how to construct leaf. Make possible to iterate over diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/TraverseHandler.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/TraverseHandler.java index 2d72ee3..c05e542 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/TraverseHandler.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/TraverseHandler.java @@ -18,8 +18,8 @@ import java.util.Iterator; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * Describes paths to iterate over and explains how to construct leaf. Make possible to iterate over diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/TraverseVisitor.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/TraverseVisitor.java index f5ea89b..619dde4 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/TraverseVisitor.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/model/utils/tree/TraverseVisitor.java @@ -16,7 +16,7 @@ package org.qubership.atp.dataset.model.utils.tree; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; public interface TraverseVisitor extends TraverseHandler { diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/AttributeService.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/AttributeService.java index 7b09d11..3ea73c5 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/AttributeService.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/AttributeService.java @@ -21,8 +21,8 @@ import java.util.Map; import java.util.UUID; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.db.jpa.entities.UserSettingsEntity; import org.qubership.atp.dataset.model.Attribute; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/ConcurrentModificationService.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/ConcurrentModificationService.java index 3785510..ffd727d 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/ConcurrentModificationService.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/ConcurrentModificationService.java @@ -18,7 +18,7 @@ import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.springframework.http.HttpStatus; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/DataSetListService.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/DataSetListService.java index 09625ae..054111c 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/DataSetListService.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/DataSetListService.java @@ -23,8 +23,8 @@ import java.util.Set; import java.util.UUID; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.apache.commons.lang3.tuple.Pair; import org.qubership.atp.dataset.model.DataSet; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/DataSetService.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/DataSetService.java index 48693f3..b63c46b 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/DataSetService.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/DataSetService.java @@ -24,8 +24,8 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.DataSet; import org.qubership.atp.dataset.model.DataSetList; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/FilterService.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/FilterService.java index 08c3759..4abf831 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/FilterService.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/FilterService.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.UUID; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.Filter; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/IdentifiedService.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/IdentifiedService.java index 2b1acd9..3272939 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/IdentifiedService.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/IdentifiedService.java @@ -19,8 +19,8 @@ import java.util.List; import java.util.UUID; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.Identified; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/LabelProviderService.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/LabelProviderService.java index e3bb4fa..e531c6d 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/LabelProviderService.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/LabelProviderService.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.UUID; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.Label; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/ParameterService.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/ParameterService.java index 4b2ca6c..ece21a8 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/ParameterService.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/ParameterService.java @@ -23,8 +23,8 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.AttributePath; import org.qubership.atp.dataset.model.DataSet; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/TestPlanService.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/TestPlanService.java index be4e533..d2acf19 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/TestPlanService.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/TestPlanService.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.UUID; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.DataSetList; import org.qubership.atp.dataset.model.TestPlan; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/VisibilityAreaService.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/VisibilityAreaService.java index 90198dd..8249173 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/VisibilityAreaService.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/VisibilityAreaService.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.UUID; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.VisibilityArea; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/helper/CreationFacade.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/helper/CreationFacade.java index d6aaf3d..34ace11 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/helper/CreationFacade.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/helper/CreationFacade.java @@ -20,8 +20,8 @@ import java.util.List; import java.util.UUID; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.AttributeType; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/helper/DbCreationFacade.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/helper/DbCreationFacade.java index 69cde42..2f71cc0 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/helper/DbCreationFacade.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/helper/DbCreationFacade.java @@ -23,8 +23,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.exception.dataset.DataSetExistsException; import org.qubership.atp.dataset.model.Attribute; @@ -105,12 +105,12 @@ public Parameter param(@Nonnull DataSet ds, @Nonnull Attribute attr, public Label label(@Nonnull LabelProvider labelProvider, @Nonnull String name) { LabelProviderService service; UUID targetId; - if (labelProvider instanceof DataSet) { + if (labelProvider instanceof DataSet set) { service = dataSetService; - targetId = ((DataSet) labelProvider).getId(); - } else if (labelProvider instanceof DataSetList) { + targetId = set.getId(); + } else if (labelProvider instanceof DataSetList list) { service = dataSetListService; - targetId = ((DataSetList) labelProvider).getId(); + targetId = list.getId(); } else { throw new IllegalArgumentException("No service found for [" + labelProvider.getClass().getSimpleName() + "] LabelProvider"); diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/helper/FileDataDao.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/helper/FileDataDao.java index 20bb8eb..963e32c 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/helper/FileDataDao.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/helper/FileDataDao.java @@ -16,7 +16,7 @@ package org.qubership.atp.dataset.service.direct.helper; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; public class FileDataDao { public final String fileName; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/helper/SimpleCreationFacade.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/helper/SimpleCreationFacade.java index 93afebc..3cfd055 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/helper/SimpleCreationFacade.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/helper/SimpleCreationFacade.java @@ -24,8 +24,8 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.AttributePath; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/AliasWrapperServiceImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/AliasWrapperServiceImpl.java index 6993680..8143889 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/AliasWrapperServiceImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/AliasWrapperServiceImpl.java @@ -21,9 +21,9 @@ import java.util.Optional; import java.util.UUID; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.inject.Provider; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.inject.Provider; import org.qubership.atp.dataset.macros.MacroRegistry; import org.qubership.atp.dataset.macros.args.ArgsParser; @@ -161,10 +161,7 @@ private UUID createAlias(@Nonnull ReferenceAliasType type, @Nonnull UUID objectI @Nullable private T getAlias(@Nonnull ReferenceAliasType type, @Nonnull UUID objectId) { T result = getAliasObject(type, objectId); - if (result != null) { - return result; - } - return null; + return result; } @Nullable @@ -203,7 +200,7 @@ public boolean replace(ArgsParser.Result args) throws Exception { List toResolve = args.getParsed(); for (int i = 0; i < toResolve.size(); i++) { Optional> signature = toResolve.get(i).asRef(); - if (!signature.isPresent()) { + if (signature.isEmpty()) { continue; } resolve(toResolve.subList(0, i), signature.get()); @@ -216,13 +213,13 @@ public boolean replace(ArgsParser.Result args) throws Exception { private class UnWrap implements Replacer { @Override - public boolean replace(ArgsParser.Result args) throws Exception { + public boolean replace(ArgsParser.Result args) { boolean changed = false; Iterator argsIter = args.getParsed().iterator(); while (argsIter.hasNext()) { SignatureArg macroArg = argsIter.next(); Optional> signature = macroArg.asRef(); - if (!signature.isPresent()) { + if (signature.isEmpty()) { continue; } UnwrapStatus unwrapStatus = AliasWrapperServiceImpl.this.unWrapAlias(signature.get()); diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/AttributeServiceImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/AttributeServiceImpl.java index df0b758..7af6043 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/AttributeServiceImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/AttributeServiceImpl.java @@ -30,9 +30,9 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.inject.Provider; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.inject.Provider; import org.javers.common.string.Strings; import org.jetbrains.annotations.NotNull; @@ -62,7 +62,6 @@ import org.qubership.atp.dataset.service.rest.dto.manager.UiManParameter; import org.qubership.atp.dataset.service.ws.entities.Pair; import org.qubership.atp.dataset.versioning.service.DataSetListSnapshotService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -90,7 +89,6 @@ public class AttributeServiceImpl implements AttributeService { /** * Constructor with autowire. */ - @Autowired public AttributeServiceImpl( ListValueRepository listValueRepository, AttributeRepository attributeRepository, @@ -162,8 +160,8 @@ public boolean updateDslReference(@Nonnull UUID id, @Nonnull UUID dslReferenceId paramsToDelete.addAll(ds.getParameters() .stream() .filter(param -> param.getAttribute().getId().equals(attribute.getId()) - || param instanceof ParameterOverlap - && ((ParameterOverlap) param).getAttributePath().getPath() + || param instanceof ParameterOverlap po + && po.getAttributePath().getPath() .stream() .anyMatch(attr -> attr.getId().equals(attribute.getId()))) .collect(Collectors.toSet())); diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/ConcurrentModificationServiceImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/ConcurrentModificationServiceImpl.java index d232e51..35154ef 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/ConcurrentModificationServiceImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/ConcurrentModificationServiceImpl.java @@ -21,7 +21,7 @@ import java.sql.Timestamp; import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.service.direct.ConcurrentModificationService; import org.qubership.atp.dataset.service.direct.DataSetListService; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/DataSetListServiceImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/DataSetListServiceImpl.java index dc2ba64..50a714c 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/DataSetListServiceImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/DataSetListServiceImpl.java @@ -31,8 +31,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.tuple.ImmutablePair; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/DataSetServiceImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/DataSetServiceImpl.java index 8d2b156..155152b 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/DataSetServiceImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/DataSetServiceImpl.java @@ -34,9 +34,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.jetbrains.annotations.NotNull; import org.qubership.atp.dataset.constants.CacheEnum; import org.qubership.atp.dataset.db.DataSetListRepository; @@ -79,6 +76,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.base.Preconditions; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/DateAuditorServiceImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/DateAuditorServiceImpl.java index 7e7d91e..0c0fe87 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/DateAuditorServiceImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/DateAuditorServiceImpl.java @@ -20,7 +20,7 @@ import java.time.Instant; import java.util.UUID; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.qubership.atp.auth.springbootstarter.entities.UserInfo; import org.qubership.atp.dataset.service.direct.DataSetListService; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/FilterServiceImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/FilterServiceImpl.java index 220ec07..b8e112d 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/FilterServiceImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/FilterServiceImpl.java @@ -19,8 +19,8 @@ import java.util.List; import java.util.UUID; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.NotNull; import org.qubership.atp.dataset.db.FilterRepository; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/ParameterServiceImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/ParameterServiceImpl.java index 25fb752..4124f2a 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/ParameterServiceImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/ParameterServiceImpl.java @@ -31,8 +31,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -84,7 +84,7 @@ public class ParameterServiceImpl implements ParameterService { private static final String EMPTY_STRING = ""; private static final int OVERLAP_MAX_LEVELS = 15; - private final javax.inject.Provider dsServiceProvider; + private final jakarta.inject.Provider dsServiceProvider; private final DateAuditorService dateAuditorService; private final ParameterRepository repo; private final AliasWrapperService aliasWrapperService; @@ -230,8 +230,7 @@ private Parameter setParameter(@NotNull UUID dsId, @NotNull UUID targetAttrId, return parameter; } if (attrPathIds.size() > OVERLAP_MAX_LEVELS) { - String message = String.format( - "You cannot overlap parameters deeper than %s levels down", OVERLAP_MAX_LEVELS); + String message = "You cannot overlap parameters deeper than %s levels down".formatted(OVERLAP_MAX_LEVELS); log.error(message); throw new ParameterOverlapLevelDownException(message); } @@ -557,7 +556,7 @@ private ParameterDataDto prepareData(@Nonnull UUID attrId, if (text != null) { Attribute attribute = attributeService.get(attrId); if (attribute == null) { - log.error(String.format("Attribute %s not found", attrId)); + log.error("Attribute %s not found".formatted(attrId)); throw new AttributeNotFoundException(); } if (AttributeType.ENCRYPTED.equals(attribute.getType()) diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/TestPlanServiceImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/TestPlanServiceImpl.java index 017bb99..5474972 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/TestPlanServiceImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/TestPlanServiceImpl.java @@ -21,8 +21,8 @@ import java.util.List; import java.util.UUID; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.NotNull; import org.qubership.atp.auth.springbootstarter.entities.UserInfo; @@ -96,9 +96,7 @@ public boolean delete(@Nonnull UUID vaId, @Nonnull String name) { TestPlan testPlan = getByNameUnderVisibilityArea(vaId, name); if (testPlan != null) { dataSetListRepo.getUnderTestPlan(testPlan.getId()) - .forEach(dataSetList -> { - dataSetListSnapshotService.commitEntity(dataSetList.getId()); - }); + .forEach(dataSetList -> dataSetListSnapshotService.commitEntity(dataSetList.getId())); } return repo.delete(vaId, name, modifiedBy, modifiedWhen); } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/VisibilityAreaServiceImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/VisibilityAreaServiceImpl.java index f1386d1..649b171 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/VisibilityAreaServiceImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/impl/VisibilityAreaServiceImpl.java @@ -19,8 +19,8 @@ import java.util.List; import java.util.UUID; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.NotNull; import org.qubership.atp.dataset.db.VisibilityAreaRepository; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/importexport/converters/DatasetLinkAttributeExportConverter.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/importexport/converters/DatasetLinkAttributeExportConverter.java index fa85c1f..0200680 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/importexport/converters/DatasetLinkAttributeExportConverter.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/importexport/converters/DatasetLinkAttributeExportConverter.java @@ -53,7 +53,7 @@ public void mapAttributeToRow(SXSSFRow row, Set datasetIds, UiManAttribute if (Objects.nonNull(reference) && Objects.nonNull(parameter) && Objects.nonNull(parameter.getValue()) && Strings.isNotBlank(parameter.getValue().toString())) { - cell.setCellValue(String.format("%s %s %s", + cell.setCellValue("%s %s %s".formatted( reference.getName(), REFERENCE_DELIMITER, parameter.getValue())); } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/importexport/service/DataSetListImportExportFactory.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/importexport/service/DataSetListImportExportFactory.java index 925581d..02a9f0e 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/importexport/service/DataSetListImportExportFactory.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/importexport/service/DataSetListImportExportFactory.java @@ -23,7 +23,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.qubership.atp.dataset.exception.attribute.AttributeExportException; import org.qubership.atp.dataset.exception.attribute.AttributeImportException; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/importexport/service/DatasetListExportService.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/importexport/service/DatasetListExportService.java index c2ee2ad..58ea492 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/importexport/service/DatasetListExportService.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/importexport/service/DatasetListExportService.java @@ -218,7 +218,7 @@ private void mapAttributeReferencesToRow(SXSSFSheet sheet, Set datasetIds, UiManAttribute attribute, String attrName) { List dslAttributesList = attribute.getAttributes(); for (UiManAttribute attrItem : dslAttributesList) { - String attrItemName = String.format("%s %s %s", attrName, REFERENCE_DELIMITER, attrItem.getName()); + String attrItemName = "%s %s %s".formatted(attrName, REFERENCE_DELIMITER, attrItem.getName()); String attrType = getAttributeType(attrItem); mapAttributeToRow(sheet, attrItemName, attrType, datasetIds, attrItem); if (AttributeTypeConverterEnum.DSL.getName().equals(attrType)) { diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/importexport/service/DatasetListImportService.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/importexport/service/DatasetListImportService.java index fac6705..5df4e7a 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/importexport/service/DatasetListImportService.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/importexport/service/DatasetListImportService.java @@ -26,7 +26,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.ListIterator; @@ -292,9 +291,8 @@ void validateDataSetsAreNotLocked(UUID targetDslId) { if (Objects.nonNull(dataSets) && !dataSets.isEmpty()) { Map map = dataSets.stream().collect(Collectors.toMap(DataSet::getName, DataSet::getId)); String dslName = dataSetListService.getById(targetDslId).getName(); - String message = String.format( - "Failed to import DataSetList '%s' with id: '%s'. Reason: some datasets are locked: %s", - dslName, targetDslId, map); + String message = "Failed to import DataSetList '%s' with id: '%s'. Reason: some datasets are locked: %s" + .formatted(dslName, targetDslId, map); log.error(message); throw new ImportFailedException(message); } @@ -370,7 +368,7 @@ private AttributeType validateAttributeTypeCells(Map row, Strin boolean isSupportedAttributeType = supportedImportAttributeTypes.stream() .anyMatch(attributeType -> attributeType.name().equalsIgnoreCase(attributeTypeValue)); if (!isSupportedAttributeType) { - log.error(String.format("Invalid attribute '%s' type: '%s'. Supported import types: %s", + log.error("Invalid attribute '%s' type: '%s'. Supported import types: %s".formatted( attributeName, attributeTypeValue, supportedImportAttributeTypes)); throw new ImportExcelNotSupportedAttributeTypeException(attributeName, attributeTypeValue, supportedImportAttributeTypes); @@ -378,7 +376,7 @@ private AttributeType validateAttributeTypeCells(Map row, Strin boolean isAttrTypeEquals = context.getAttributesNameMap().get(attributeName) .getAttributeType().getName().equalsIgnoreCase(attributeTypeValue); if (!isAttrTypeEquals) { - log.error(String.format("The attribute '%s' with type '%s' is different compared to DSL", attributeName, + log.error("The attribute '%s' with type '%s' is different compared to DSL".formatted(attributeName, attributeTypeValue)); throw new ImportExcelNotEqualsAttributeTypeException(attributeName, attributeTypeValue); } @@ -676,7 +674,7 @@ private void validateRequiredHeading(Map headingRow) { final boolean isRowHeaderCellIsTrue = headingRow.containsKey(requiredHeaderIndex); if (!isRowHeaderCellIsTrue) { - String errorMessage = String.format("Required heading '%s' is absent", requiredHeader); + String errorMessage = "Required heading '%s' is absent".formatted(requiredHeader); log.error(errorMessage); throw new ImportFailedException(errorMessage); } else { @@ -685,7 +683,7 @@ private void validateRequiredHeading(Map headingRow) { final boolean isRowHeaderValueDoesntMatch = !requiredHeader.equals(rowHeader); if (isRowHeaderValueDoesntMatch) { - String errorMessage = String.format("Required heading '%s' has incorrect name", requiredHeader); + String errorMessage = "Required heading '%s' has incorrect name".formatted(requiredHeader); log.error(errorMessage); throw new ImportFailedException(errorMessage); } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/CachingParamEvaluator.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/CachingParamEvaluator.java index c34ddf2..e9484e4 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/CachingParamEvaluator.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/CachingParamEvaluator.java @@ -19,8 +19,8 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.DataSet; import org.qubership.atp.dataset.model.DataSetList; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/DsEvaluator.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/DsEvaluator.java index f1e80cb..f067ec4 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/DsEvaluator.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/DsEvaluator.java @@ -20,8 +20,8 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.DataSet; import org.qubership.atp.dataset.model.DataSetList; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/EvaluateDsParamStrategy.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/EvaluateDsParamStrategy.java index 618304b..6c23cec 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/EvaluateDsParamStrategy.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/EvaluateDsParamStrategy.java @@ -18,7 +18,7 @@ import java.util.Optional; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.DataSet; import org.qubership.atp.dataset.model.utils.OverlapItem; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/EvaluateDsParamStrategyImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/EvaluateDsParamStrategyImpl.java index 8b846b4..126feee 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/EvaluateDsParamStrategyImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/EvaluateDsParamStrategyImpl.java @@ -20,8 +20,8 @@ import java.util.List; import java.util.Optional; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.macros.EvalContextImpl; import org.qubership.atp.dataset.macros.MacroRegistry; @@ -67,12 +67,12 @@ public EvaluateDsParamStrategyImpl(@Nonnull MacroRegistry registry, @Override public Optional apply(@Nonnull OverlapItem.Reachable target) { Optional parameterOpt = target.getParameter(); - if (!parameterOpt.isPresent()) { + if (parameterOpt.isEmpty()) { return Optional.empty(); } Parameter parameter = parameterOpt.get(); Optional valueOpt = target.getValue(); - if (!valueOpt.isPresent()) { + if (valueOpt.isEmpty()) { return Optional.empty(); } String value = valueOpt.get(); diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/UnwrapAlias.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/UnwrapAlias.java index 4561069..10fec4d 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/UnwrapAlias.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/UnwrapAlias.java @@ -18,15 +18,15 @@ import java.util.Optional; -import javax.annotation.Nonnull; - import org.qubership.atp.dataset.model.DataSet; import org.qubership.atp.dataset.model.utils.OverlapItem; import org.qubership.atp.dataset.service.direct.AliasWrapperService; +import jakarta.annotation.Nonnull; + public class UnwrapAlias implements EvaluateDsParamStrategy { - private AliasWrapperService aliasWrapperService; + private final AliasWrapperService aliasWrapperService; public UnwrapAlias(AliasWrapperService aliasWrapperService) { this.aliasWrapperService = aliasWrapperService; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/schange/ChangeParameter.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/schange/ChangeParameter.java index b8e1653..d1c92f3 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/schange/ChangeParameter.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/schange/ChangeParameter.java @@ -25,7 +25,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.DataSet; @@ -61,8 +61,7 @@ public static ChangeParameter create(@Nonnull Attribute targetAttribute, case MULTIPLY: return new Multiplication(targetAttribute, targetParameter, change); default: - throw new UnsupportedOperationException(String.format( - "Unknown type of structure change %s in %s", change, targetParameter)); + throw new UnsupportedOperationException("Unknown type of structure change %s in %s".formatted(change, targetParameter)); } } @@ -121,7 +120,7 @@ public static Stream getChanges(@Nonnull Collection Optional parameter = changeAttr.getParameters().stream() .filter(param -> source.getId().equals(param.getDataSet().getId())) .findAny(); - if (!parameter.isPresent()) { + if (parameter.isEmpty()) { continue; } String text = parameter.get().getText(); diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/schange/EvaluateDsStructureStrategy.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/schange/EvaluateDsStructureStrategy.java index b1c27a8..1365d24 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/schange/EvaluateDsStructureStrategy.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/schange/EvaluateDsStructureStrategy.java @@ -18,7 +18,7 @@ import java.util.stream.Stream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.DataSet; import org.qubership.atp.dataset.model.DataSetList; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/schange/EvaluateDsStructureStrategyImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/schange/EvaluateDsStructureStrategyImpl.java index c51d0ed..16bd597 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/schange/EvaluateDsStructureStrategyImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/schange/EvaluateDsStructureStrategyImpl.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.stream.Stream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.db.DataSetListRepository; import org.qubership.atp.dataset.db.DataSetRepository; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/schange/NoStructureChange.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/schange/NoStructureChange.java index b5ff145..6b3dc4d 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/schange/NoStructureChange.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/schange/NoStructureChange.java @@ -18,7 +18,7 @@ import java.util.stream.Stream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.db.DataSetRepository; import org.qubership.atp.dataset.model.DataSet; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/schange/TraverseMixinSupport.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/schange/TraverseMixinSupport.java index 7c65102..2675c35 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/schange/TraverseMixinSupport.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/direct/macros/schange/TraverseMixinSupport.java @@ -23,8 +23,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.AttributeType; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/JpaAttributeService.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/JpaAttributeService.java index 623c806..2351ac9 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/JpaAttributeService.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/JpaAttributeService.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.db.jpa.entities.ListValueEntity; import org.qubership.atp.dataset.ei.model.AttributeKeyIdsDbUpdate; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/JpaDataSetListService.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/JpaDataSetListService.java index daf9c4b..400c33c 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/JpaDataSetListService.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/JpaDataSetListService.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.service.jpa.delegates.DataSetList; import org.qubership.atp.dataset.service.jpa.model.DataSetListDependencyNode; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/JpaDataSetService.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/JpaDataSetService.java index db8ddbf..701f6a3 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/JpaDataSetService.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/JpaDataSetService.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.json.simple.JSONObject; import org.qubership.atp.dataset.service.jpa.delegates.DataSet; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/AbstractObjectWrapper.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/AbstractObjectWrapper.java index 9e878c3..5049104 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/AbstractObjectWrapper.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/AbstractObjectWrapper.java @@ -94,8 +94,7 @@ public void replicate() { @Override public boolean equals(Object other) { - if (other instanceof AbstractObjectWrapper) { - AbstractObjectWrapper otherWrapper = (AbstractObjectWrapper) other; + if (other instanceof AbstractObjectWrapper otherWrapper) { return entity.getId().equals(otherWrapper.entity.getId()); } return false; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/Attribute.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/Attribute.java index 6aa6a79..6a6dcca 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/Attribute.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/Attribute.java @@ -16,6 +16,7 @@ package org.qubership.atp.dataset.service.jpa.delegates; +import java.io.Serial; import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; @@ -27,12 +28,10 @@ import org.qubership.atp.dataset.db.jpa.entities.DataSetListEntity; import org.qubership.atp.dataset.db.jpa.entities.ListValueEntity; import org.qubership.atp.dataset.service.jpa.model.AttributeTypeName; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class Attribute extends AbstractObjectWrapper { + @Serial private static final long serialVersionUID = -55774378413986230L; - private static final Logger LOG = LoggerFactory.getLogger(Attribute.class); public Attribute(AttributeEntity entity) { super(entity); diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/AttributeKey.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/AttributeKey.java index bd8be35..37c3397 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/AttributeKey.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/AttributeKey.java @@ -16,11 +16,12 @@ package org.qubership.atp.dataset.service.jpa.delegates; +import java.io.Serial; import java.util.LinkedList; import java.util.List; import java.util.UUID; -import javax.persistence.NoResultException; +import jakarta.persistence.NoResultException; import org.qubership.atp.dataset.db.jpa.entities.AttributeKeyEntity; import org.qubership.atp.dataset.db.jpa.entities.ParameterEntity; @@ -30,6 +31,7 @@ @Slf4j public class AttributeKey extends AbstractObjectWrapper { + @Serial private static final long serialVersionUID = 3769738483534840381L; private Parameter cachedParameter = null; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/DataSetList.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/DataSetList.java index b6a88a8..428e6c2 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/DataSetList.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/DataSetList.java @@ -31,7 +31,7 @@ import java.util.Set; import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.apache.commons.lang3.StringUtils; import org.qubership.atp.dataset.db.jpa.entities.AttributeEntity; @@ -694,11 +694,11 @@ private String getNextCopyName(String postfix, String prevNamePattern) { if (!StringUtils.isEmpty(prevNamePattern) && name.contains(prevNamePattern)) { newName = name.replaceAll(prevNamePattern, postfix); } else { - newName = String.format("%s %s", name, postfix); + newName = "%s %s".formatted(name, postfix); } while (dataSetListNames.contains(newName)) { - newName = String.format("%s %s", newName, "Copy"); + newName = "%s %s".formatted(newName, "Copy"); } return newName; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/Parameter.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/Parameter.java index b291c73..a6a4e6f 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/Parameter.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/Parameter.java @@ -16,10 +16,11 @@ package org.qubership.atp.dataset.service.jpa.delegates; +import java.io.Serial; import java.util.Objects; import java.util.UUID; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; @@ -33,6 +34,7 @@ public class Parameter extends AbstractObjectWrapper { + @Serial private static final long serialVersionUID = -7205269656851827042L; public Parameter(ParameterEntity entity) { @@ -123,8 +125,7 @@ public Attribute getAttribute() { if (attribute == null || attribute.isAttributeKey()) { return null; } - if (attribute instanceof HibernateProxy) { - HibernateProxy hibernateProxy = (HibernateProxy) attribute; + if (attribute instanceof HibernateProxy hibernateProxy) { LazyInitializer initializer = hibernateProxy.getHibernateLazyInitializer(); return modelsProvider.getAttribute((AttributeEntity) initializer.getImplementation()); } else { diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/impl/DataSetListAsyncService.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/impl/DataSetListAsyncService.java index 2694429..213b4bf 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/impl/DataSetListAsyncService.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/impl/DataSetListAsyncService.java @@ -20,7 +20,7 @@ import java.util.UUID; import java.util.concurrent.Future; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.db.jpa.ModelsProvider; import org.qubership.atp.dataset.service.jpa.delegates.DataSetList; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/impl/JpaAttributeServiceImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/impl/JpaAttributeServiceImpl.java index c9f1282..5125e2f 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/impl/JpaAttributeServiceImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/impl/JpaAttributeServiceImpl.java @@ -26,7 +26,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.constants.CacheEnum; import org.qubership.atp.dataset.db.jpa.ModelsProvider; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/impl/JpaDataSetListServiceImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/impl/JpaDataSetListServiceImpl.java index 8c99b26..0b551ad 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/impl/JpaDataSetListServiceImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/impl/JpaDataSetListServiceImpl.java @@ -30,7 +30,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.db.jpa.ModelsProvider; import org.qubership.atp.dataset.exception.attribute.AttributeNotFoundException; @@ -439,7 +439,7 @@ public LinkedList getDataSetsIdsByDataSetListId(UUID dataSetListId) { public void checkDslNames(UUID visibilityArea) { List names = modelsProvider.getNotUniqueDslNames(visibilityArea); if (!names.isEmpty()) { - throw new RuntimeException(String.format("There are duplicated DSL names: %s", names)); + throw new RuntimeException("There are duplicated DSL names: %s".formatted(names)); } } } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/impl/JpaDataSetServiceImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/impl/JpaDataSetServiceImpl.java index 735e7f1..63c6f77 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/impl/JpaDataSetServiceImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/impl/JpaDataSetServiceImpl.java @@ -29,7 +29,7 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.apache.commons.lang3.StringUtils; import org.json.simple.JSONObject; @@ -656,7 +656,7 @@ private UUID copyOverlapParameter(DataSet targetDataset, && attr.getAttributeType().equals(sourceHeadLinkAttr.getAttributeType())) .findFirst(); - if (!targetHeadLinkAttr.isPresent()) { + if (targetHeadLinkAttr.isEmpty()) { throw new AttributeParentDslNotExistException(); } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/MacroContextServiceImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/MacroContextServiceImpl.java index 8fce28f..31aa630 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/MacroContextServiceImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/MacroContextServiceImpl.java @@ -188,7 +188,7 @@ public UUID getDataSetUuid(String dataSetName, UUID dataSetListId) throws DataSe } if (dataSets.size() > 1) { throw new DataSetServiceException( - String.format("Multiple datasets found with name %s under dslId %s", dataSetName, dataSetListId)); + "Multiple datasets found with name %s under dslId %s".formatted(dataSetName, dataSetListId)); } return dataSets.get(0).getId(); } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/dscontext/DataSetContext.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/dscontext/DataSetContext.java index 2a0a251..5ff9ea0 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/dscontext/DataSetContext.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/dscontext/DataSetContext.java @@ -16,6 +16,7 @@ package org.qubership.atp.dataset.service.jpa.model.dscontext; +import java.io.Serial; import java.io.Serializable; import java.util.LinkedHashMap; import java.util.LinkedList; @@ -36,6 +37,7 @@ @Getter @Setter public class DataSetContext implements Serializable { + @Serial private static final long serialVersionUID = -7846470332343480118L; private UUID id; private String name; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/dscontext/DataSetListContext.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/dscontext/DataSetListContext.java index f53f48b..9f51d12 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/dscontext/DataSetListContext.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/dscontext/DataSetListContext.java @@ -16,6 +16,7 @@ package org.qubership.atp.dataset.service.jpa.model.dscontext; +import java.io.Serial; import java.io.Serializable; import java.util.LinkedList; import java.util.List; @@ -38,6 +39,7 @@ @Getter @Setter public class DataSetListContext implements Serializable { + @Serial private static final long serialVersionUID = 8928150301939110223L; private UUID visibilityAreaId; private UUID dataSetListId; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/dscontext/GroupContext.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/dscontext/GroupContext.java index d16856d..9fdb4dd 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/dscontext/GroupContext.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/dscontext/GroupContext.java @@ -16,6 +16,7 @@ package org.qubership.atp.dataset.service.jpa.model.dscontext; +import java.io.Serial; import java.io.Serializable; import java.util.LinkedList; import java.util.List; @@ -39,6 +40,7 @@ @Getter @Setter public class GroupContext implements Serializable { + @Serial private static final long serialVersionUID = -7833021868343081645L; private long order; private String name; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/dscontext/ParameterContext.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/dscontext/ParameterContext.java index 8d83c39..abaaee3 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/dscontext/ParameterContext.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/dscontext/ParameterContext.java @@ -16,6 +16,7 @@ package org.qubership.atp.dataset.service.jpa.model.dscontext; +import java.io.Serial; import java.io.Serializable; import java.util.UUID; @@ -29,6 +30,7 @@ @Getter @Setter public class ParameterContext implements Serializable { + @Serial private static final long serialVersionUID = -2995730089590160691L; private UUID attributeId; private UUID parameterId; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/tree/Overlap.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/tree/Overlap.java index a1523b8..72f6616 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/tree/Overlap.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/tree/Overlap.java @@ -16,6 +16,7 @@ package org.qubership.atp.dataset.service.jpa.model.tree; +import java.io.Serial; import java.io.Serializable; import java.util.HashMap; import java.util.Map; @@ -29,6 +30,7 @@ @Getter @Setter public class Overlap implements Serializable { + @Serial private static final long serialVersionUID = 4198235021753958581L; @Getter diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/tree/OverlapNode.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/tree/OverlapNode.java index d8c4518..fca7482 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/tree/OverlapNode.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/tree/OverlapNode.java @@ -16,6 +16,7 @@ package org.qubership.atp.dataset.service.jpa.model.tree; +import java.io.Serial; import java.io.Serializable; import java.util.LinkedList; import java.util.List; @@ -34,6 +35,7 @@ @Getter @Setter public class OverlapNode implements Serializable { + @Serial private static final long serialVersionUID = 2784126984197713421L; private UUID dataSetListId; private UUID id; @@ -114,10 +116,7 @@ public AttributeKey getOverlap(List path, int column, UUID attributeId) { * */ public boolean containsOverlapsInPath(List path, int column) { if (path.isEmpty()) { - if (overlaps[column] != null) { - return true; - } - return false; + return overlaps[column] != null; } else { for (OverlapNode childNode : childNodes) { if (childNode.getId().equals(path.get(0))) { diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/AbstractMacro.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/AbstractMacro.java index c537af7..48d0ca3 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/AbstractMacro.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/AbstractMacro.java @@ -22,8 +22,8 @@ import java.util.List; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.apache.commons.lang3.StringUtils; import org.qubership.atp.dataset.antlr4.TextParameterParser; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/InnMacro.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/InnMacro.java index 3cee098..d34f5cb 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/InnMacro.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/InnMacro.java @@ -17,6 +17,7 @@ package org.qubership.atp.dataset.service.jpa.model.tree.params.macros; import java.util.List; +import java.util.concurrent.ThreadLocalRandom; import org.qubership.atp.dataset.service.jpa.impl.macro.MacroContext; @@ -38,7 +39,7 @@ public String getEvaluatedValue(List arguments) { StringBuilder result = new StringBuilder(); int last = 0; for (int i = 0; i < 9; i++) { - int floor = (int) Math.floor(Math.random() * (10 - 1) + 1); + int floor = (int) Math.floor(ThreadLocalRandom.current().nextDouble() * (10 - 1) + 1); result.append(floor); last += FACTORS[i] * floor; } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/ParameterPositionContext.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/ParameterPositionContext.java index e740113..aeeda89 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/ParameterPositionContext.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/ParameterPositionContext.java @@ -51,8 +51,7 @@ public ParameterPositionContext( @Override public boolean equals(Object obj) { - if (obj instanceof ParameterPositionContext) { - ParameterPositionContext other = (ParameterPositionContext)obj; + if (obj instanceof ParameterPositionContext other) { boolean pathEquals = path.equals(other.getPath()); boolean columnEquals = dataSetColumn == other.getDataSetColumn(); boolean orderEquals = order.equals(other.getOrder()); diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/QueryParamFlag.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/QueryParamFlag.java index faa5db7..e11790a 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/QueryParamFlag.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/QueryParamFlag.java @@ -16,7 +16,7 @@ package org.qubership.atp.dataset.service.rest; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; public class QueryParamFlag { diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/dto/manager/UiManParameter.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/dto/manager/UiManParameter.java index e6bb1e7..c2623da 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/dto/manager/UiManParameter.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/dto/manager/UiManParameter.java @@ -18,7 +18,7 @@ import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.DataSet; import org.qubership.atp.dataset.model.Parameter; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/dto/versioning/ChangeSummary.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/dto/versioning/ChangeSummary.java index 67feb00..49cba3d 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/dto/versioning/ChangeSummary.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/dto/versioning/ChangeSummary.java @@ -28,7 +28,7 @@ public enum ChangeSummary { OVERRIDE_DELETED("Override Removed"), RESTORED("Restored to v. %s"); - private String value; + private final String value; ChangeSummary(String value) { this.value = value; @@ -40,7 +40,7 @@ public String toString() { } public String toString(Object... extraParameters) { - return String.format(value, extraParameters); + return value.formatted(extraParameters); } /** diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/facade/AttachmentControllerFacade.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/facade/AttachmentControllerFacade.java index 17f5a64..11d9778 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/facade/AttachmentControllerFacade.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/facade/AttachmentControllerFacade.java @@ -62,7 +62,7 @@ public ResponseEntity getAttachmentByParameterId(UUID param Optional optional = gridFsService.get(parameterUuid); FileData info = gridFsService.getFileInfo(parameterUuid); - if (!optional.isPresent()) { + if (optional.isEmpty()) { return ResponseEntity.noContent().build(); } InputStreamResource inputStreamResource = new InputStreamResource(optional.get()); diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/AttributeController.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/AttributeController.java index fa201a4..38d1b51 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/AttributeController.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/AttributeController.java @@ -25,7 +25,7 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.DataSetList; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/DataSetController.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/DataSetController.java index 321374c..fc26fe3 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/DataSetController.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/DataSetController.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.UUID; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.json.simple.JSONObject; import org.qubership.atp.dataset.exception.dataset.DataSetContextParseException; @@ -56,7 +56,7 @@ import org.qubership.atp.dataset.service.rest.dto.manager.AbstractEntityResponse; import org.qubership.atp.dataset.service.rest.dto.manager.UiManAttribute; import org.qubership.atp.integration.configuration.configuration.AuditAction; -import org.springdoc.api.annotations.ParameterObject; +import org.springdoc.core.annotations.ParameterObject; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/DataSetListController.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/DataSetListController.java index c3b9bf9..3258464 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/DataSetListController.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/DataSetListController.java @@ -26,8 +26,8 @@ import java.util.Set; import java.util.UUID; -import javax.annotation.Nullable; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Nullable; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.lang3.tuple.Pair; import org.qubership.atp.auth.springbootstarter.entities.UserInfo; @@ -75,7 +75,6 @@ import org.springframework.web.bind.annotation.RestController; import com.fasterxml.jackson.annotation.JsonView; -import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -108,7 +107,6 @@ public class DataSetListController { + "T(org.qubership.atp.dataset.model.UserManagementEntities).DATASET_LIST.getName()," + "#vaId,'CREATE')") @PutMapping("/va/{vaId}") - @ApiOperation(value = "Creates new DSL with name provided.") @Operation(summary = "Creates new DSL with name provided.") public ResponseEntity create(@PathVariable("vaId") UUID vaId, @RequestParam("name") String name, diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/HealthCheckController.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/HealthCheckController.java index 6aad624..49bc528 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/HealthCheckController.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/HealthCheckController.java @@ -20,8 +20,8 @@ import java.util.UUID; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import io.swagger.v3.oas.annotations.Hidden; @@ -34,7 +34,7 @@ public class HealthCheckController { @Autowired protected HealthCheckService healthCheckService; - @RequestMapping(value = "/visibility_areas_list", method = RequestMethod.GET) + @GetMapping("/visibility_areas_list") public List getTestVisibilityAreasList() { return healthCheckService.getCheckVisibilityAreasIdsList(); } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/HistoryController.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/HistoryController.java index 5198b3f..a8b6b73 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/HistoryController.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/HistoryController.java @@ -18,7 +18,7 @@ import java.util.UUID; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.qubership.atp.dataset.service.rest.dto.versioning.HistoryItemResponseDto; import org.qubership.atp.dataset.service.rest.dto.versioning.UiManDataSetListJDto; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/LabelFilterController.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/LabelFilterController.java index cda6b57..e6eadad 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/LabelFilterController.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/LabelFilterController.java @@ -24,7 +24,6 @@ import org.qubership.atp.dataset.model.Filter; import org.qubership.atp.dataset.service.direct.FilterService; import org.qubership.atp.integration.configuration.configuration.AuditAction; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; @@ -44,9 +43,8 @@ @RequestMapping("/filter") public class LabelFilterController { - private FilterService filterService; + private final FilterService filterService; - @Autowired public LabelFilterController(FilterService filterService) { this.filterService = filterService; } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/ParameterController.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/ParameterController.java index 8ceaf53..5ead058 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/ParameterController.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/ParameterController.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.UUID; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.qubership.atp.dataset.exception.dataset.DataSetNotFoundException; import org.qubership.atp.dataset.model.DataSet; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/SagaController.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/SagaController.java index aff5ba2..202c53c 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/SagaController.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/SagaController.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.UUID; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.qubership.atp.dataset.model.api.saga.requests.CopyDataSetListsRequest; import org.qubership.atp.dataset.model.api.saga.requests.RevertRequest; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/TestPlanController.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/TestPlanController.java index 7b53f33..e195bc2 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/TestPlanController.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/TestPlanController.java @@ -20,14 +20,13 @@ import java.util.List; import java.util.UUID; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.qubership.atp.dataset.model.DataSetList; import org.qubership.atp.dataset.model.TestPlan; import org.qubership.atp.dataset.service.direct.TestPlanService; import org.qubership.atp.dataset.service.rest.View; import org.qubership.atp.integration.configuration.configuration.AuditAction; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -56,7 +55,6 @@ public class TestPlanController { /** * test plan service. */ - @Autowired public TestPlanController(TestPlanService testPlanService) { this.testPlanService = testPlanService; } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/UIController.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/UIController.java index f27fcb3..cf6e79c 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/UIController.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/UIController.java @@ -16,7 +16,7 @@ package org.qubership.atp.dataset.service.rest.server; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.qubership.atp.integration.configuration.configuration.AuditAction; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/VersionController.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/VersionController.java index 748a603..13a34da 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/VersionController.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/VersionController.java @@ -18,7 +18,6 @@ import org.qubership.atp.dataset.db.DBConfig; import org.qubership.atp.integration.configuration.configuration.AuditAction; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,9 +27,8 @@ @RestController public class VersionController { - private DBConfig dbConfig; + private final DBConfig dbConfig; - @Autowired public VersionController(DBConfig dbConfig) { this.dbConfig = dbConfig; } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/VisibilityAreaController.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/VisibilityAreaController.java index f1c6859..e2cf64e 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/VisibilityAreaController.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/VisibilityAreaController.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.UUID; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.qubership.atp.dataset.service.jpa.JpaVisibilityAreaService; import org.qubership.atp.dataset.service.jpa.model.VisibilityAreaFlatModel; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/v2/ParameterControllerV2.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/v2/ParameterControllerV2.java index 7373e57..4b67864 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/v2/ParameterControllerV2.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/v2/ParameterControllerV2.java @@ -19,7 +19,7 @@ import java.net.URI; import java.util.UUID; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.qubership.atp.dataset.model.Parameter; import org.qubership.atp.dataset.model.api.ParameterRequest; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/ws/event/EventExecutorImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/ws/event/EventExecutorImpl.java index 43e08c2..16c4d8f 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/ws/event/EventExecutorImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/ws/event/EventExecutorImpl.java @@ -22,8 +22,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.service.ws.entities.Pair; import org.slf4j.LoggerFactory; @@ -76,7 +76,7 @@ private void broadCastEvent(WebSocketSession sourceSocket, @Nonnull Event event) Collection sockets = handler.getWebSockets(event); Stream webSocketStream = sockets.stream().filter(webSocket -> webSocket != sourceSocket && webSocket.isOpen()); - List collect = webSocketStream.collect(Collectors.toList()); + List collect = webSocketStream.toList(); collect.forEach(socket -> sendEvent(event, socket)); } diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/versioning/service/impl/JaversHistoryCacheableService.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/versioning/service/impl/JaversHistoryCacheableService.java index 46a32e1..0d4986e 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/versioning/service/impl/JaversHistoryCacheableService.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/versioning/service/impl/JaversHistoryCacheableService.java @@ -8,7 +8,6 @@ import org.qubership.atp.dataset.versioning.model.domain.DataSetListSnapshot; import org.qubership.atp.dataset.versioning.service.ChangeProcessorsChain; import org.qubership.atp.dataset.versioning.service.changes.DataSetListComparable; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -22,7 +21,6 @@ public class JaversHistoryCacheableService { private final ChangeProcessorsChain changeProcessorsChain; - @Autowired public JaversHistoryCacheableService(Javers javers, ChangeProcessorsChain changeProcessorsChain) { this.javers = javers; this.changeProcessorsChain = changeProcessorsChain; diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/versioning/service/impl/JaversHistoryServiceImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/versioning/service/impl/JaversHistoryServiceImpl.java index e0f256e..5e9451f 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/versioning/service/impl/JaversHistoryServiceImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/versioning/service/impl/JaversHistoryServiceImpl.java @@ -39,7 +39,6 @@ import org.qubership.atp.dataset.service.rest.dto.versioning.PageInfoDto; import org.qubership.atp.dataset.versioning.model.domain.DataSetListSnapshot; import org.qubership.atp.dataset.versioning.service.JaversHistoryService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -54,7 +53,6 @@ public class JaversHistoryServiceImpl implements JaversHistoryService { private static final String DATE_TIME_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"; private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern(DATE_TIME_PATTERN); - @Autowired public JaversHistoryServiceImpl(Javers javers, JaversHistoryCacheableService javersHistoryCacheableService) { this.javers = javers; this.javersHistoryCacheableService = javersHistoryCacheableService; @@ -113,7 +111,7 @@ private HistoryItemDto processTwoShadows( Optional> oldShadow ) { HistoryItemDto historyItem; - boolean isDslCreated = !oldShadow.isPresent(); + boolean isDslCreated = oldShadow.isEmpty(); boolean isDlsDeleted = actualShadow.get().getId() == null; boolean isRestored = actualShadow.getCommitMetadata().getProperties().get(RESTORED_TO_PROPERTY) != null; if (isDslCreated) { diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/versioning/service/impl/RestoreServiceImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/versioning/service/impl/RestoreServiceImpl.java index 7997d18..b8bb1bd 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/versioning/service/impl/RestoreServiceImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/versioning/service/impl/RestoreServiceImpl.java @@ -100,7 +100,7 @@ private void validateDataSetList(DataSetListSnapshot dataSetListSnapshot) { DataSetList dataSetListById = modelsProvider.getDataSetListById(attribute.getDataSetListReference()); if (dataSetListById == null) { violations.add( - String.format("Data Set List reference '%s' not found", attribute.getDataSetListReference()) + "Data Set List reference '%s' not found".formatted(attribute.getDataSetListReference()) ); } else { for (ParameterSnapshot parameter : attribute.getParameters()) { @@ -109,8 +109,7 @@ private void validateDataSetList(DataSetListSnapshot dataSetListSnapshot) { DataSet dataSetById = modelsProvider.getDataSetById(parameterId); if (dataSetById == null) { violations.add( - String.format( - "Data Set List reference '%s' not found", + "Data Set List reference '%s' not found".formatted( attribute.getDataSetListReference() ) ); @@ -123,7 +122,7 @@ private void validateDataSetList(DataSetListSnapshot dataSetListSnapshot) { DataSetList dataSetListById = modelsProvider.getDataSetListById(attribute.getDataSetListReference()); if (dataSetListById == null) { violations.add( - String.format("Data Set List reference '%s' not found", attribute.getDataSetListReference()) + "Data Set List reference '%s' not found".formatted(attribute.getDataSetListReference()) ); } else { for (ParameterSnapshot parameter : attribute.getParameters()) { @@ -132,7 +131,7 @@ private void validateDataSetList(DataSetListSnapshot dataSetListSnapshot) { for (UUID dataSetId : dataSetUuids) { DataSet dataSet = modelsProvider.getDataSetById(dataSetId); if (dataSet == null) { - violations.add(String.format("Data Set reference '%s' not found", dataSetId)); + violations.add("Data Set reference '%s' not found".formatted(dataSetId)); } } } @@ -142,12 +141,12 @@ private void validateDataSetList(DataSetListSnapshot dataSetListSnapshot) { for (AttributeKeySnapshot overlap : dataSetListSnapshot.getOverlaps()) { for (UUID attributeId : overlap.getAttributePath().subList(1, overlap.getAttributePath().size())) { if (modelsProvider.getAttributeById(attributeId) == null) { - violations.add(String.format("Attribute '%s' not found", attributeId)); + violations.add("Attribute '%s' not found".formatted(attributeId)); } } UUID attributeId = overlap.getAttributeId(); if (modelsProvider.getAttributeById(attributeId) == null) { - violations.add(String.format("Attribute '%s' not found", attributeId)); + violations.add("Attribute '%s' not found".formatted(attributeId)); } } if (!violations.isEmpty()) { diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/versioning/service/impl/RevisionDetailsServiceImpl.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/versioning/service/impl/RevisionDetailsServiceImpl.java index 46b830a..8ddf5d7 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/versioning/service/impl/RevisionDetailsServiceImpl.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/versioning/service/impl/RevisionDetailsServiceImpl.java @@ -49,7 +49,7 @@ public UiManDataSetListJDto getRevisionDetails(Integer revision, UUID entityId) log.debug("RevisionDetailsServiceImpl#getRevisionDetails(revision={}, entityId={})", revision, entityId); Optional> entity = getShadow(revision, entityId); Shadow shadow = entity.orElseThrow(() -> new EntityNotFoundException( - String.format("Failed to found shadow with id=%s and revision=%s", entityId, revision))); + "Failed to found shadow with id=%s and revision=%s".formatted(entityId, revision))); UiManDataSetListJDto revisionDetails = buildResponse(shadow); log.debug("Revision details: {}", revisionDetails); return revisionDetails; diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/antlr4/TextParameterParserTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/antlr4/TextParameterParserTest.java index dc5f482..03cc223 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/antlr4/TextParameterParserTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/antlr4/TextParameterParserTest.java @@ -30,8 +30,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.springframework.test.context.junit.jupiter.SpringExtension; - +import org.mockito.junit.jupiter.MockitoExtension; import org.qubership.atp.dataset.db.jpa.entities.DataSetListEntity; import org.qubership.atp.dataset.service.jpa.DataSetServiceException; import org.qubership.atp.dataset.service.jpa.delegates.DataSetList; @@ -43,8 +42,10 @@ import org.qubership.atp.dataset.service.jpa.model.tree.params.AbstractTextParameter; import org.qubership.atp.dataset.service.jpa.model.tree.params.macros.ParameterPositionContext; import org.qubership.atp.dataset.service.jpa.model.tree.params.macros.RefDslMacro; +import org.springframework.test.context.junit.jupiter.SpringExtension; @ExtendWith(SpringExtension.class) +@ExtendWith(MockitoExtension.class) public class TextParameterParserTest { private static MacroContext macroContext; public static String MACRO_RESULT = "MY TEXT"; @@ -63,8 +64,7 @@ public void setUp() { @Override public String getTextParameterByListDataSetAndPath(UUID visibilityAreaId, PathStep dataSetList, PathStep dataSet, List referenceAttributePath, - PathStep parameterAttribute) - throws DataSetServiceException { + PathStep parameterAttribute) { return MACRO_RESULT; } @@ -72,8 +72,7 @@ public String getTextParameterByListDataSetAndPath(UUID visibilityAreaId, PathSt public String getTextParameterByExternalListDataSetAndPath(UUID visibilityAreaId, PathStep dataSetList, PathStep dataSet, List referenceAttributePath, - PathStep parameterAttribute) - throws DataSetServiceException { + PathStep parameterAttribute) { return MACRO_RESULT; } @@ -81,18 +80,17 @@ public String getTextParameterByExternalListDataSetAndPath(UUID visibilityAreaId public String getTextParameterFromCachedContextByNamesPath(UUID visibilityAreaId, PathStep topLevelDataSetList, UUID dataSetId, int dataSetColumn, List macroPosition, - List pathSteps, PathStep attribute) - throws DataSetServiceException { + List pathSteps, PathStep attribute) { return MACRO_RESULT; } @Override - public String getDataSetListName(UUID dataSetListId) throws DataSetServiceException { + public String getDataSetListName(UUID dataSetListId) { return MACRO_RESULT; } @Override - public String getDataSetName(UUID dataSetListId) throws DataSetServiceException { + public String getDataSetName(UUID dataSetListId) { return MACRO_RESULT; } @@ -110,7 +108,7 @@ public DataSetList getDataSetList(UUID visibilityAreaId, PathStep dataSetListPat } @Override - public String getAttributeName(UUID dataSetListId) throws DataSetServiceException { + public String getAttributeName(UUID dataSetListId) { return MACRO_RESULT; } @@ -179,7 +177,7 @@ public void testParseMacroServiceCollectsDataSetsAndDataSetListsId() { for (AbstractTextParameter abstractTextParameter : parseResult) { abstractTextParameter.getValue(); } - Assertions.assertTrue(parseResult.get(1) instanceof RefDslMacro); + Assertions.assertInstanceOf(RefDslMacro.class, parseResult.get(1)); RefDslMacro dslMacro = (RefDslMacro) parseResult.get(1); Assertions.assertEquals(1, dslMacro.getDataSets().size()); Assertions.assertEquals(1, dslMacro.getDataSetLists().size()); diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/config/IntegrationTestConfiguration.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/config/IntegrationTestConfiguration.java index a1a7318..e0482d5 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/config/IntegrationTestConfiguration.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/config/IntegrationTestConfiguration.java @@ -20,6 +20,7 @@ import java.util.Map; import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -48,6 +49,7 @@ public Environment serverEnvironment() { } @Bean + @DependsOnDatabaseInitialization public SQLQueryFactory queryFactory() { return serverContext().getBean(SQLQueryFactory.class); } diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/config/OverrideOriginBeanConfig.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/config/OverrideOriginBeanConfig.java index 40b586f..38005d1 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/config/OverrideOriginBeanConfig.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/config/OverrideOriginBeanConfig.java @@ -19,6 +19,7 @@ import javax.sql.DataSource; import org.mockito.Mockito; +import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -33,6 +34,7 @@ public class OverrideOriginBeanConfig { @Bean + @DependsOnDatabaseInitialization public SQLQueryFactory queryFactory(DataSource dataSource, com.querydsl.sql.Configuration qdslConfig) { return Mockito.spy(new SQLQueryFactory(qdslConfig, new TransactionAwareDataSourceProxy(dataSource))); } diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndCatalogContractTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndCatalogContractTest.java index 4866366..a42927f 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndCatalogContractTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndCatalogContractTest.java @@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.http.HttpStatus; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.test.web.servlet.MockMvc; import au.com.dius.pact.provider.junit5.PactVerificationContext; @@ -84,7 +84,7 @@ ParameterController.class, DataSetListController.class }) -@ContextConfiguration(classes = {DatasetsAndCatalogContractTest.TestApp.class}) +@SpringJUnitConfig(classes = {DatasetsAndCatalogContractTest.TestApp.class}) @EnableAutoConfiguration @Import({JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, @@ -131,7 +131,7 @@ public static class TestApp { @MockBean CompareDatasetServiceImpl compareDs; - public void beforeAll() throws DataSetServiceException { + public void beforeAll() { JSONObject jsonObject = new JSONObject(); List resultListJson = new ArrayList<>(); resultListJson.add(jsonObject); diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndItfExecutorContractTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndItfExecutorContractTest.java index 55c537d..40dbb0a 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndItfExecutorContractTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndItfExecutorContractTest.java @@ -4,7 +4,6 @@ import static org.mockito.Mockito.when; import java.io.ByteArrayInputStream; -import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedList; @@ -15,29 +14,6 @@ import org.junit.jupiter.api.TestTemplate; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.parallel.Isolated; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; -import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import org.springframework.core.io.InputStreamResource; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; - -import au.com.dius.pact.provider.junit5.PactVerificationContext; -import au.com.dius.pact.provider.junit5.PactVerificationInvocationContextProvider; -import au.com.dius.pact.provider.junitsupport.Provider; -import au.com.dius.pact.provider.junitsupport.State; -import au.com.dius.pact.provider.junitsupport.loader.PactUrl; -import au.com.dius.pact.provider.spring.junit5.MockMvcTestTarget; import org.qubership.atp.dataset.db.jpa.entities.AttributeEntity; import org.qubership.atp.dataset.db.jpa.entities.DataSetListEntity; import org.qubership.atp.dataset.db.jpa.entities.VisibilityAreaEntity; @@ -49,7 +25,6 @@ import org.qubership.atp.dataset.model.impl.MixInIdImpl; import org.qubership.atp.dataset.model.impl.TestPlanImpl; import org.qubership.atp.dataset.service.jpa.ContextType; -import org.qubership.atp.dataset.service.jpa.DataSetServiceException; import org.qubership.atp.dataset.service.jpa.delegates.Attribute; import org.qubership.atp.dataset.service.jpa.impl.DataSetParameterProvider; import org.qubership.atp.dataset.service.jpa.impl.macro.MacroContext; @@ -65,6 +40,29 @@ import org.qubership.atp.dataset.service.rest.server.DataSetController; import org.qubership.atp.dataset.service.rest.server.DataSetListController; import org.qubership.atp.dataset.service.rest.server.VisibilityAreaController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; +import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; +import org.springframework.core.io.InputStreamResource; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; + +import au.com.dius.pact.provider.junit5.PactVerificationContext; +import au.com.dius.pact.provider.junit5.PactVerificationInvocationContextProvider; +import au.com.dius.pact.provider.junitsupport.Provider; +import au.com.dius.pact.provider.junitsupport.State; +import au.com.dius.pact.provider.junitsupport.loader.PactUrl; +import au.com.dius.pact.provider.spring.junit5.MockMvcTestTarget; @Isolated @Provider("atp-datasets") @@ -72,7 +70,7 @@ @AutoConfigureMockMvc(addFilters = false, webDriverEnabled = false) @WebMvcTest(controllers = {AttachmentController.class, DataSetController.class, DataSetListController.class, AttributeController.class, VisibilityAreaController.class}) -@ContextConfiguration(classes = {DatasetsAndItfExecutorContractTest.TestApp.class}) +@SpringJUnitConfig(classes = {DatasetsAndItfExecutorContractTest.TestApp.class}) @EnableAutoConfiguration @Import({JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, AttachmentController.class, DataSetController.class, DataSetListController.class, AttributeController.class, @@ -97,7 +95,7 @@ public static class TestApp { @MockBean private VisibilityAreaController visibilityAreaController; - public void beforeAll() throws DataSetServiceException, IOException { + public void beforeAll() { InputStreamResource responseBody1 = new InputStreamResource(new ByteArrayInputStream("test".getBytes())); MultiValueMap headers = new LinkedMultiValueMap<>(); headers.add("Content-Disposition", "attachment; filename=\"name\""); @@ -165,7 +163,7 @@ private DataSetContext getDataSetContext(){ new ArrayList<>(), new ArrayList<>()); AttributeEntity attributeEntity2 = new AttributeEntity(); - attributeEntity2.setAttributeTypeId(2l); + attributeEntity2.setAttributeTypeId(2L); attributeEntity2.setId(UUID.fromString("c2737427-05e4-4c17-8032-455539deaa02")); Attribute attribute2 = new Attribute(attributeEntity2); attribute2.setAttributeType(AttributeTypeName.TEXT); diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndItfStubsContractTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndItfStubsContractTest.java index 0358a0f..f3eac1a 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndItfStubsContractTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndItfStubsContractTest.java @@ -22,7 +22,7 @@ import org.springframework.core.io.InputStreamResource; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.test.web.servlet.MockMvc; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @@ -40,7 +40,7 @@ @PactUrl(urls = {"src/test/resources/pacts/atp-itf-stubs-atp-datasets.json"}) @AutoConfigureMockMvc(addFilters = false, webDriverEnabled = false) @WebMvcTest(controllers = {AttachmentController.class}) -@ContextConfiguration(classes = {DatasetsAndItfStubsContractTest.TestApp.class}) +@SpringJUnitConfig(classes = {DatasetsAndItfStubsContractTest.TestApp.class}) @EnableAutoConfiguration @Import({JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, AttachmentController.class}) diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndOrchestratorContractTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndOrchestratorContractTest.java index 42ccf45..c16137e 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndOrchestratorContractTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndOrchestratorContractTest.java @@ -31,7 +31,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.test.web.servlet.MockMvc; import au.com.dius.pact.provider.junit5.PactVerificationContext; @@ -67,7 +67,7 @@ DataSetListController.class, AttachmentController.class }) -@ContextConfiguration(classes = {DatasetsAndOrchestratorContractTest.TestApp.class}) +@SpringJUnitConfig(classes = {DatasetsAndOrchestratorContractTest.TestApp.class}) @EnableAutoConfiguration @Import({JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndRamContractTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndRamContractTest.java index 58a34a4..8679a7a 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndRamContractTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndRamContractTest.java @@ -20,7 +20,7 @@ import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.test.web.servlet.MockMvc; import au.com.dius.pact.provider.junit5.PactVerificationContext; @@ -54,7 +54,7 @@ @WebMvcTest(controllers = {DataSetController.class, DataSetListController.class }) -@ContextConfiguration(classes = {DatasetsAndRamContractTest.TestApp.class}) +@SpringJUnitConfig(classes = {DatasetsAndRamContractTest.TestApp.class}) @EnableAutoConfiguration @Import({JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, @@ -116,7 +116,7 @@ void pactVerificationTestTemplate(PactVerificationContext context) { } @BeforeEach - void before(PactVerificationContext context) throws Exception { + void before(PactVerificationContext context) { beforeAll(); context.setTarget(new MockMvcTestTarget(mockMvc)); } diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndSagaCoordinatorContractTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndSagaCoordinatorContractTest.java index c0034cc..c0c617d 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndSagaCoordinatorContractTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndSagaCoordinatorContractTest.java @@ -22,7 +22,7 @@ import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.test.web.servlet.MockMvc; import au.com.dius.pact.provider.junit5.PactVerificationContext; @@ -44,7 +44,7 @@ @AutoConfigureMockMvc(addFilters = false, webDriverEnabled = false) @WebMvcTest(controllers = {SagaController.class }) -@ContextConfiguration(classes = {DatasetsAndSagaCoordinatorContractTest.TestApp.class}) +@SpringJUnitConfig(classes = {DatasetsAndSagaCoordinatorContractTest.TestApp.class}) @EnableAutoConfiguration @Import({JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/db/AttributeRepositoryTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/db/AttributeRepositoryTest.java index f5e2058..b308354 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/db/AttributeRepositoryTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/db/AttributeRepositoryTest.java @@ -24,7 +24,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.parallel.Isolated; import org.qubership.atp.dataset.config.TestConfiguration; import org.qubership.atp.dataset.exception.dataset.DataSetExistsException; @@ -38,15 +37,12 @@ import org.qubership.atp.dataset.service.rest.dto.manager.UiManAttribute; import org.qubership.atp.dataset.service.ws.entities.Pair; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit.jupiter.SpringExtension; - +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import lombok.SneakyThrows; @Isolated -@ExtendWith(SpringExtension.class) -@ContextConfiguration(classes = {TestConfiguration.class}) +@SpringJUnitConfig(classes = {TestConfiguration.class}) @TestPropertySource(properties = {"atp-dataset.javers.enabled=false"}) public class AttributeRepositoryTest extends AbstractTest { private static final long DEFAULT_TIME_FOR_CREATE_ATTR = 1576741274989L; diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/db/DataSetListTreeRepositoryTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/db/DataSetListTreeRepositoryTest.java index 9274543..6592a5a 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/db/DataSetListTreeRepositoryTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/db/DataSetListTreeRepositoryTest.java @@ -24,20 +24,9 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.parallel.Isolated; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit.jupiter.SpringExtension; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; import org.qubership.atp.dataset.config.TestConfiguration; import org.qubership.atp.dataset.db.utils.StrongIdentifiedCache; import org.qubership.atp.dataset.model.Attribute; @@ -48,10 +37,17 @@ import org.qubership.atp.dataset.model.VisibilityArea; import org.qubership.atp.dataset.service.AbstractTest; import org.qubership.atp.dataset.service.direct.helper.CreationFacade; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; @Isolated -@ExtendWith(SpringExtension.class) -@ContextConfiguration(classes = {TestConfiguration.class}) +@SpringJUnitConfig(classes = {TestConfiguration.class}) @TestPropertySource(properties = { "atp-dataset.javers.enabled=false" }) @@ -61,22 +57,26 @@ public class DataSetListTreeRepositoryTest extends AbstractTest { DataSetListTreeRepository repo; @Test - public void loadDslTree_WithDsRefOverlap_EachGroupIsLazyLoaded() throws Exception { + public void loadDslTree_WithDsRefOverlap_EachGroupIsLazyLoaded() { TestData d = createTestDataInstance(TestData::new); IdentifiedCache cache = new StrongIdentifiedCache(); DataSetListTreeRepository.ToLoadLater loadLater = new DataSetListTreeRepository.ToLoadLater(repo, cache); DataSetList dsl = repo.getDslTree(d.dslTop.getId(), ImmutableList.of(d.dsTop.getId()), loadLater); Assertions.assertEquals(d.dslTop, dsl); Attribute topIntoMiddle = cache.getIfPresent(Attribute.class, d.topIntoMiddle.getAttribute().getId()); + Assertions.assertNotNull(topIntoMiddle); DataSetList dslMiddle = topIntoMiddle.getDataSetListReference(); Assertions.assertEquals(d.erTop, cache); //will load 2nd level + Assertions.assertNotNull(dslMiddle); dslMiddle.getName(); Assertions.assertEquals(d.dslMiddle, dslMiddle); Parameter middleIntoLowOverlap = cache.getIfPresent(Parameter.class, d.middleIntoLowOverlap.getId()); + Assertions.assertNotNull(middleIntoLowOverlap); DataSet dsLowOverlap = middleIntoLowOverlap.getDataSetReference(); Assertions.assertEquals(d.erMiddle, cache); //will load 3rd level + Assertions.assertNotNull(dsLowOverlap); dsLowOverlap.getName(); Assertions.assertEquals(d.dsLowOverlap, dsLowOverlap); Assertions.assertEquals(d.erLow, cache); diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/db/TransactionInterceptorTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/db/TransactionInterceptorTest.java index cab4e10..cf75005 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/db/TransactionInterceptorTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/db/TransactionInterceptorTest.java @@ -23,12 +23,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit.jupiter.SpringExtension; - +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.qubership.atp.crypt.api.Decryptor; import org.qubership.atp.crypt.api.Encryptor; import org.qubership.atp.dataset.config.TransactionTestConfiguration; @@ -41,8 +38,7 @@ import org.qubership.atp.dataset.service.direct.VisibilityAreaService; @Disabled -@ExtendWith(SpringExtension.class) -@ContextConfiguration(classes = {TransactionTestConfiguration.class}) +@SpringJUnitConfig(classes = {TransactionTestConfiguration.class}) public class TransactionInterceptorTest { private final String dslName = "TransactionInterceptorTestDsl"; diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/DataSetExportExecutorTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/DataSetExportExecutorTest.java index 8c26b15..a07a4a1 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/DataSetExportExecutorTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/DataSetExportExecutorTest.java @@ -16,7 +16,6 @@ package org.qubership.atp.dataset.ei; -import static java.util.Arrays.asList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; @@ -26,7 +25,6 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -49,11 +47,7 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.Spy; -import org.springframework.test.context.junit.jupiter.SpringExtension; -import org.springframework.test.util.ReflectionTestUtils; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.common.collect.Sets; +import org.mockito.junit.jupiter.MockitoExtension; import org.qubership.atp.dataset.db.GridFsRepository; import org.qubership.atp.dataset.db.jpa.entities.AttributeEntity; import org.qubership.atp.dataset.db.jpa.entities.DataSetEntity; @@ -64,7 +58,6 @@ import org.qubership.atp.dataset.db.jpa.repositories.JpaDataSetRepository; import org.qubership.atp.dataset.ei.model.DataSet; import org.qubership.atp.dataset.model.impl.file.FileData; -import org.qubership.atp.dataset.service.jpa.DataSetServiceException; import org.qubership.atp.dataset.service.jpa.JpaDataSetListService; import org.qubership.atp.dataset.service.jpa.impl.DataSetListContextService; import org.qubership.atp.dataset.service.jpa.impl.JpaDataSetServiceImpl; @@ -74,9 +67,15 @@ import org.qubership.atp.ei.node.dto.ExportScope; import org.qubership.atp.ei.node.services.FileService; import org.qubership.atp.ei.node.services.ObjectSaverToDiskService; +import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.test.util.ReflectionTestUtils; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.collect.Sets; @Isolated @ExtendWith(SpringExtension.class) +@ExtendWith(MockitoExtension.class) public class DataSetExportExecutorTest { @Spy @@ -103,31 +102,34 @@ public class DataSetExportExecutorTest { @TempDir private Path tempDir; - private String erDatasetFile = - "{\n" + - " \"id\" : \"8147cd6a-b742-4f63-be42-59c7c1ab5f2f\",\n" + - " \"name\" : \"ds1\",\n" + - " \"ordering\" : null,\n" + - " \"dataSetList\" : \"70030fdd-816a-4455-b117-b2e718f0396c\",\n" + - " \"sourceId\" : null,\n" + - " \"isLocked\" : false\n" + - "}\n"; - - private String serviceName = "dataset-export"; - private String dataSetListName = "dsl"; + private final String erDatasetFile = + """ + { + "id" : "8147cd6a-b742-4f63-be42-59c7c1ab5f2f", + "name" : "ds1", + "ordering" : null, + "dataSetList" : "70030fdd-816a-4455-b117-b2e718f0396c", + "sourceId" : null, + "isLocked" : false + } + """; + + private final String serviceName = "dataset-export"; + private final String dataSetListName = "dsl"; private static final String PROJECT_BODY_DATA_SET_IN_NTT_EXPORT = - "dsName=ds1\n" + - "\n" + - "name=attribute 2; description=; value=./files/dsl/ds1/filename.txt\n" - + - "name=attribute 1; description=; value=123\n"; + """ + dsName=ds1 + + name=attribute 2; description=; value=./files/dsl/ds1/filename.txt + name=attribute 1; description=; value=123 + """; private String dsName; - private UUID dsId = UUID.fromString("8147cd6a-b742-4f63-be42-59c7c1ab5f2f"); - private UUID dslId = UUID.fromString("70030fdd-816a-4455-b117-b2e718f0396c"); + private final UUID dsId = UUID.fromString("8147cd6a-b742-4f63-be42-59c7c1ab5f2f"); + private final UUID dslId = UUID.fromString("70030fdd-816a-4455-b117-b2e718f0396c"); private UUID paramId; private ExportScope atpExportScope; - private DataSetEntity dataSet = new DataSetEntity(); - private DataSetListEntity dataSetList = new DataSetListEntity(); + private final DataSetEntity dataSet = new DataSetEntity(); + private final DataSetListEntity dataSetList = new DataSetListEntity(); @BeforeEach public void setUp() { @@ -252,11 +254,11 @@ public void exportToFolder_convertToNttFormat() throws Exception { } else if (s.startsWith("name=attribute 2;")) { String filePath = s.replace("name=attribute 2; description=; value=", ""); String expectedFilePath = "./files/" + dslId.toString() + "/" + dsId.toString() + "/" + paramId.toString(); - assertEquals(Paths.get(filePath).toString(), Paths.get(expectedFilePath).toString()); + assertEquals(Path.of(filePath).toString(), Path.of(expectedFilePath).toString()); } else if (s.startsWith("name=attribute 1;")) { String value = s.replace("name=attribute 1; description=; value=", ""); String expectedValue = "123"; - assertEquals(value, expectedValue); + assertEquals(expectedValue, value); } }); @@ -268,7 +270,7 @@ public void exportToFolder_convertToNttFormat() throws Exception { } @Test - public void expandExportScope_exportSpecificDsls_DslForDsIsCollected() throws DataSetServiceException { + public void expandExportScope_exportSpecificDsls_DslForDsIsCollected() { ExportImportData exportData = new ExportImportData(UUID.randomUUID(), atpExportScope, ExportFormat.ATP); exportData.getExportScope().getEntities().put(Constants.ENTITY_DATASET_STORAGE, new HashSet<>()); Set idsFromDb = new HashSet<>(); @@ -280,7 +282,7 @@ public void expandExportScope_exportSpecificDsls_DslForDsIsCollected() throws Da } @Test - public void expandExportScope_DsReferencedFromParamIsAndCorrespondingDslIsCollected() throws DataSetServiceException { + public void expandExportScope_DsReferencedFromParamIsAndCorrespondingDslIsCollected() { ExportImportData exportData = new ExportImportData(null, atpExportScope, ExportFormat.ATP); exportData.getExportScope().getEntities().put(Constants.ENTITY_DATASET_STORAGE, new HashSet<>()); @@ -318,7 +320,7 @@ public void expandExportScope_DsReferencedFromParamIsAndCorrespondingDslIsCollec ds2Param.setDataSetReferenceId(referencedDataSetId2); ds2Param.setAttribute(new AttributeEntity()); ds2Param.getAttribute().setId(UUID.randomUUID()); - referencedDataSet.setParameters(asList(ds2Param)); + referencedDataSet.setParameters(List.of(ds2Param)); dataSetExportExecutor.expandExportScope(exportData); @@ -335,7 +337,7 @@ public void expandExportScope_DsReferencedFromParamIsAndCorrespondingDslIsCollec } @Test - public void expandExportScope_specificDsls_circlesShouldBeHandledProperly() throws DataSetServiceException { + public void expandExportScope_specificDsls_circlesShouldBeHandledProperly() { ExportImportData exportData = new ExportImportData(null, atpExportScope, ExportFormat.ATP); exportData.getExportScope().getEntities().put(Constants.ENTITY_DATASET_STORAGE, new HashSet<>()); @@ -360,7 +362,7 @@ public void expandExportScope_specificDsls_circlesShouldBeHandledProperly() thro ds2Param.setDataSetReferenceId(dataSet.getId()); ds2Param.setAttribute(new AttributeEntity()); ds2Param.getAttribute().setId(UUID.randomUUID()); - referencedDataSet.setParameters(asList(ds2Param)); + referencedDataSet.setParameters(List.of(ds2Param)); Set idsFromDb = new HashSet<>(); idsFromDb.add(dslId); @@ -376,7 +378,7 @@ public void expandExportScope_specificDsls_circlesShouldBeHandledProperly() thro } @Test - public void expandExportScope_exportAllDsls_noDslExpansion() throws DataSetServiceException { + public void expandExportScope_exportAllDsls_noDslExpansion() { ExportImportData exportData = new ExportImportData(UUID.randomUUID(), atpExportScope, ExportFormat.ATP); Set dslIds = new HashSet<>(); dslIds.add(dslId); @@ -392,7 +394,7 @@ public void expandExportScope_exportAllDsls_noDslExpansion() throws DataSetServi } @Test - public void expandExportScope_DslReferencedFromAttributesAreCollected() throws DataSetServiceException { + public void expandExportScope_DslReferencedFromAttributesAreCollected() { ExportImportData exportData = new ExportImportData(null, atpExportScope, ExportFormat.ATP); UUID referencedDataSetListId = UUID.randomUUID(); @@ -420,7 +422,7 @@ public void expandExportScope_DslReferencedFromAttributesAreCollected() throws D } @Test - public void expandExportScope_circlesAreHandledProperlyForAttributesDslReference() throws DataSetServiceException { + public void expandExportScope_circlesAreHandledProperlyForAttributesDslReference() { ExportImportData exportData = new ExportImportData(null, atpExportScope, ExportFormat.ATP); UUID referencedDataSetListId = UUID.randomUUID(); diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/DataSetImportExecutorTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/DataSetImportExecutorTest.java index 32b31cf..a02a864 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/DataSetImportExecutorTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/DataSetImportExecutorTest.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.when; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -36,6 +35,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.parallel.Isolated; import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.qubership.atp.dataset.ei.service.DataSetAttributesImporter; @@ -49,6 +49,7 @@ @Isolated @ExtendWith(SpringExtension.class) +@ExtendWith(MockitoExtension.class) public class DataSetImportExecutorTest { private DataSetImportExecutor dataSetImportExecutor; @@ -78,7 +79,7 @@ public void validateData_1() throws Exception { ExportImportData importData = new ExportImportData(UUID.randomUUID(), null, null, false, false, null, new HashMap<>(), new HashMap<>(), ValidationType.VALIDATE, false); - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); ValidationResult result = dataSetImportExecutor.validateData(importData, workDir); @@ -95,10 +96,10 @@ public void validateData_2() throws Exception { ExportImportData importData = new ExportImportData(projectId, null, null, false, false, null, new HashMap<>(), new HashMap<>(), ValidationType.VALIDATE, false); - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); when(dataSetAttributesImporter.validateDataSetAttributes(workDir, Collections.emptyMap(), false)) - .thenReturn(Arrays.asList("There is a problem")); + .thenReturn(List.of("There is a problem")); ValidationResult result = dataSetImportExecutor.validateData(importData, workDir); @@ -111,7 +112,7 @@ public void validateData_2() throws Exception { @Test public void importData() throws Exception { ExportImportData importData = mock(ExportImportData.class); - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); List importedDsl = new ArrayList(); when(dataSetListImporter.importDataSetLists(workDir, importData)).thenReturn(importedDsl); diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetAttributesImporterIntegrationTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetAttributesImporterIntegrationTest.java index f827cf1..8128b94 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetAttributesImporterIntegrationTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetAttributesImporterIntegrationTest.java @@ -21,10 +21,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.HashMap; import java.util.UUID; @@ -33,14 +31,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.parallel.Isolated; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.test.context.jdbc.Sql; -import org.springframework.test.context.junit.jupiter.SpringExtension; - import org.qubership.atp.dataset.db.jpa.repositories.JpaAttributeKeyRepository; import org.qubership.atp.dataset.ei.DataSetImportExecutor; import org.qubership.atp.dataset.service.jpa.JpaAttributeService; @@ -48,9 +39,12 @@ import org.qubership.atp.ei.node.dto.ExportImportData; import org.qubership.atp.ei.node.dto.ValidationResult; import org.qubership.atp.ei.node.dto.validation.ValidationType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.test.context.jdbc.Sql; @Isolated -@ExtendWith(SpringExtension.class) @SpringBootTest public class DataSetAttributesImporterIntegrationTest { @@ -74,7 +68,7 @@ public void setUp() throws Exception { @Test @Sql(scripts = "classpath:test_data/sql/overlap_lost_positive.sql") public void importData_importOverlapIntoDbWithOverlapsWithTheSameParameters_OverlapsInDbShouldBeChangedWithoutDuplication() throws Exception { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206211"); + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206211"); int attributeKeysNumber = attributeKeyRepository.findAll().size(); dataSetImportExecutor.importData(importData, workDir); @@ -91,7 +85,7 @@ public void importData_importOverlapIntoDbWithOverlapsWithTheSameParameters_Over @Test @Sql(scripts = "classpath:test_data/sql/overlap_lost_negative.sql") public void importData_importOverlapIntoDbWithOverlapsWithTheSameParameters_OverlapsInDbShouldBeDuplicated() throws Exception { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206211"); + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206211"); int attributeKeysNumber = attributeKeyRepository.findAll().size(); dataSetImportExecutor.importData(importData, workDir); @@ -119,7 +113,7 @@ public void importData_importOverlapIntoDbWithOverlapsWithTheSameParameters_Over public void handleCreateNewProjectValidation_validateData_returnReplacementMap() throws Exception { ExportImportData importData = new ExportImportData(UUID.randomUUID(), null, null, true, false, null, new HashMap<>(), new HashMap<>(), ValidationType.VALIDATE, false); - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206211"); + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206211"); ValidationResult result = dataSetImportExecutor.validateData(importData, workDir); @@ -133,7 +127,7 @@ public void handleCreateNewProjectValidation_validateData_returnReplacementMap() public void handleInterProjectImportValidation_validateData_returnReplacementMap() throws Exception { ExportImportData importData = new ExportImportData(UUID.randomUUID(), null, null, false, true, null, new HashMap<>(), new HashMap<>(), ValidationType.VALIDATE, false); - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206211"); + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206211"); ValidationResult result = dataSetImportExecutor.validateData(importData, workDir); assertTrue(result.isValid()); @@ -145,9 +139,9 @@ public void handleInterProjectImportValidation_validateData_returnReplacementMap @AfterEach public void clearDb() throws IOException { String pathStr = "src/test/resources/test_data/sql/overlap_lost_clear_tables.sql"; - Path path = Paths.get(pathStr); + Path path = Path.of(pathStr); Files.readAllBytes(path); - String query = new String(Files.readAllBytes(path), StandardCharsets.UTF_8); + String query = Files.readString(path); jdbcTemplate.execute(query); } } diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetAttributesImporterTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetAttributesImporterTest.java index 53e045c..1d248c0 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetAttributesImporterTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetAttributesImporterTest.java @@ -25,7 +25,6 @@ import java.io.IOException; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -39,8 +38,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.parallel.Isolated; import org.mockito.Mock; -import org.springframework.test.context.junit.jupiter.SpringExtension; - +import org.mockito.junit.jupiter.MockitoExtension; import org.qubership.atp.dataset.ei.model.DataSetAttribute; import org.qubership.atp.dataset.ei.model.DataSetList; import org.qubership.atp.dataset.service.jpa.DataSetServiceException; @@ -52,9 +50,11 @@ import org.qubership.atp.ei.node.dto.ExportImportData; import org.qubership.atp.ei.node.dto.validation.ValidationType; import org.qubership.atp.ei.node.services.ObjectLoaderFromDiskService; +import org.springframework.test.context.junit.jupiter.SpringExtension; @Isolated @ExtendWith(SpringExtension.class) +@ExtendWith(MockitoExtension.class) public class DataSetAttributesImporterTest { private ObjectLoaderFromDiskService objectLoaderFromDiskService; @@ -82,7 +82,7 @@ public void setUp() throws Exception { @Test public void validateDataSetAttributes_TypeDataSetListNotFound() { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206209"); + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206209"); when(dslService.getById(any())).thenReturn(null); when(attrService.getById(any())).thenReturn(null); List result = dataSetAttributesImporter.validateDataSetAttributes(workDir, @@ -96,8 +96,8 @@ public void validateDataSetAttributes_TypeDataSetListNotFound() { } @Test - public void importDataSetAttributes_noOneDslImportedDoNothing() throws IOException { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); + public void importDataSetAttributes_noOneDslImportedDoNothing() { + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); List dataSetLists = new ArrayList<>(); dataSetAttributesImporter.importDataSetAttributes(workDir, dataSetLists, importData); verify(attrService, times(0)).remove(any()); @@ -105,8 +105,8 @@ public void importDataSetAttributes_noOneDslImportedDoNothing() throws IOExcepti } @Test - public void importDataSetAttributes_1() throws DataSetServiceException, IOException { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); + public void importDataSetAttributes_1() throws DataSetServiceException { + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); Map dataSetListsMap = objectLoaderFromDiskService.getListOfObjects(workDir, DataSetList.class); List dataSetLists = new ArrayList<>(); @@ -126,8 +126,8 @@ public void importDataSetAttributes_1() throws DataSetServiceException, IOExcept } @Test - public void importDataSetAttributes_2() throws DataSetServiceException, IOException { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); + public void importDataSetAttributes_2() throws DataSetServiceException { + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); Map dataSetListsMap = objectLoaderFromDiskService.getListOfObjects(workDir, DataSetList.class); List dataSetLists = new ArrayList<>(); @@ -142,8 +142,8 @@ public void importDataSetAttributes_2() throws DataSetServiceException, IOExcept } @Test - public void importDataSetAttributes_21() throws DataSetServiceException, IOException { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); + public void importDataSetAttributes_21() throws DataSetServiceException { + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); Map dataSetListsMap = objectLoaderFromDiskService.getListOfObjects(workDir, DataSetList.class); List dataSetLists = new ArrayList<>(); @@ -170,8 +170,8 @@ public void importDataSetAttributes_21() throws DataSetServiceException, IOExcep } @Test - public void importDataSetAttributeKeys_1() throws DataSetServiceException, IOException { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); + public void importDataSetAttributeKeys_1() throws DataSetServiceException { + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); when(attrService.getById(any())).thenReturn(null); dataSetAttributesImporter.importDataSetAttributeKeys(workDir, importData); @@ -185,8 +185,8 @@ public void importDataSetAttributeKeys_1() throws DataSetServiceException, IOExc } @Test - public void importDataSetAttributeKeys_2() throws DataSetServiceException, IOException { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); + public void importDataSetAttributeKeys_2() throws DataSetServiceException { + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); when(attrService.getById(UUID.fromString("4400c445-d685-48ce-9817-d6dcebd927d9"))) .thenReturn(null); dataSetAttributesImporter.importDataSetAttributeKeys(workDir, importData); @@ -201,8 +201,8 @@ public void importDataSetAttributeKeys_2() throws DataSetServiceException, IOExc } @Test - public void importDataSetAttributeKeys_3() throws DataSetServiceException, IOException { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); + public void importDataSetAttributeKeys_3() throws DataSetServiceException { + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); when(attrService.getById(UUID.fromString("4400c445-d685-48ce-9817-d6dcebd927d9"))) .thenReturn(mock(Attribute.class)); dataSetAttributesImporter.importDataSetAttributeKeys(workDir, importData); @@ -217,8 +217,8 @@ public void importDataSetAttributeKeys_3() throws DataSetServiceException, IOExc } @Test - public void importDataSetAttributeKeys_4() throws DataSetServiceException, IOException { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); + public void importDataSetAttributeKeys_4() throws DataSetServiceException { + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); when(attrService.getById(UUID.fromString("4400c445-d685-48ce-9817-d6dcebd927d9"))) .thenReturn(mock(Attribute.class)); dataSetAttributesImporter.importDataSetAttributeKeys(workDir, importData); @@ -235,7 +235,7 @@ public void importDataSetAttributeKeys_4() throws DataSetServiceException, IOExc @Test public void importDataSetAttributeKeys_importOverlapIntoDbWithOverlapWithTheSameParameters_OverlapsInDbShouldBeChangedWithoutDuplication() throws IOException { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); when(attrService.getById(UUID.fromString("4400c445-d685-48ce-9817-d6dcebd927d9"))) .thenReturn(mock(Attribute.class)); AttributeKey attrKey = mock(AttributeKey.class); @@ -260,7 +260,7 @@ public void checkAndCorrectName_noDuplicateInBase() { dataSetAttributesImporter.checkAndCorrectName(object); - Assertions.assertEquals(object.getName(), name); + Assertions.assertEquals(name, object.getName()); } @@ -282,7 +282,7 @@ public void checkAndCorrectName_theSameObject() { dataSetAttributesImporter.checkAndCorrectName(object); - Assertions.assertEquals(object.getName(), name); + Assertions.assertEquals(name, object.getName()); } @Test @@ -303,7 +303,7 @@ public void checkAndCorrectName_theSameButWithOtherNameObject() { dataSetAttributesImporter.checkAndCorrectName(object); - Assertions.assertEquals(object.getName(), name); + Assertions.assertEquals(name, object.getName()); } @Test @@ -336,6 +336,6 @@ public void checkAndCorrectName_twoDuplicateInBase() { dataSetAttributesImporter.checkAndCorrectName(object); - Assertions.assertEquals(object.getName(), name + " Copy _2"); + Assertions.assertEquals(name + " Copy _2", object.getName()); } } diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetExportExecutorPostman.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetExportExecutorPostman.java index 81d4f98..752cf51 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetExportExecutorPostman.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetExportExecutorPostman.java @@ -20,27 +20,17 @@ import java.io.File; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.Collections; +import java.util.Objects; import java.util.UUID; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.parallel.Isolated; import org.mockito.Mockito; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.jdbc.Sql; -import org.springframework.test.context.junit.jupiter.SpringExtension; - import org.qubership.atp.dataset.config.TestConfiguration; import org.qubership.atp.dataset.ei.Constants; import org.qubership.atp.dataset.ei.DataSetExportExecutor; @@ -48,24 +38,28 @@ import org.qubership.atp.ei.node.dto.ExportFormat; import org.qubership.atp.ei.node.dto.ExportImportData; import org.qubership.atp.ei.node.dto.ExportScope; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.jdbc.Sql; @Isolated @SpringBootTest @ContextConfiguration(classes = {TestConfiguration.class}) -@ExtendWith(SpringExtension.class) public class DataSetExportExecutorPostman extends AbstractJpaTest { @Autowired DataSetExportExecutor dataSetExportExecutor; - @Test @Sql(scripts = {"classpath:test_data/sql/postman.export/clear_postman_export.sql", "classpath:test_data/sql/postman.export/postman_dsl.sql"}) public void exportToFolder_PostmanFormat_successfulExport() throws Exception { String path = "src/test/resources/ei/postman"; - Path workDir = Paths.get(path); + Path workDir = Path.of(path); Files.createDirectories(workDir); UUID visibilityAreaId = UUID.fromString("46094b3a-dc76-46f6-9a38-e3af2a8cc9fb"); ExportImportData exportData = new ExportImportData(visibilityAreaId, new ExportScope(), ExportFormat.POSTMAN); @@ -84,7 +78,7 @@ public void exportToFolder_PostmanFormat_successfulExport() throws Exception { String actualFileValue2 = getFileValue( "src/test/resources/ei/postman/dataset/postman_test_dsl.postman_ds2.dataset.json"); File folder = new File(path + "/dataset"); - int count = folder.list().length; + int count = Objects.requireNonNull(folder.list()).length; Assertions.assertEquals(2, count); Assertions.assertEquals(expectedFile1, actualFileValue1); @@ -93,9 +87,8 @@ public void exportToFolder_PostmanFormat_successfulExport() throws Exception { FileUtils.deleteDirectory(new File(path)); } - - public String getFileValue (String stringPath) throws IOException { - Path path = Paths.get(stringPath); - return new String(Files.readAllBytes(path), StandardCharsets.UTF_8); + public String getFileValue(String stringPath) throws IOException { + Path path = Path.of(stringPath); + return Files.readString(path); } } diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetFileImporterTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetFileImporterTest.java index ad71939..c9c800b 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetFileImporterTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetFileImporterTest.java @@ -22,7 +22,6 @@ import java.io.IOException; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.HashMap; import org.junit.jupiter.api.BeforeEach; @@ -30,6 +29,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.parallel.Isolated; import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.qubership.atp.dataset.db.GridFsRepository; @@ -39,6 +39,7 @@ @Isolated @ExtendWith(SpringExtension.class) +@ExtendWith(MockitoExtension.class) public class DataSetFileImporterTest { private ObjectLoaderFromDiskService objectLoaderFromDiskService; @@ -56,7 +57,7 @@ public void setUp() throws Exception { @Test public void importFiles() throws IOException { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206210"); ExportImportData exportImportData = new ExportImportData(null, null, null, false, false, null, new HashMap<>(), new HashMap<>(), ValidationType.VALIDATE, false); diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetListImporterTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetListImporterTest.java index d9bca93..8b921a2 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetListImporterTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetListImporterTest.java @@ -25,7 +25,6 @@ import java.io.IOException; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.HashMap; import java.util.List; import java.util.UUID; @@ -36,6 +35,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.parallel.Isolated; import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; import org.qubership.atp.dataset.service.jpa.delegates.DataSetList; import org.springframework.test.context.junit.jupiter.SpringExtension; @@ -49,6 +49,7 @@ @Isolated @ExtendWith(SpringExtension.class) +@ExtendWith(MockitoExtension.class) public class DataSetListImporterTest { private ObjectLoaderFromDiskService objectLoaderFromDiskService; @@ -75,8 +76,8 @@ public void setUp() throws Exception { } @Test - public void importDataSetLists_createNewVa() throws DataSetServiceException, IOException { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206208"); + public void importDataSetLists_createNewVa() throws DataSetServiceException { + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206208"); when(vaService.getById(any())).thenReturn(null); List result = dataSetListImporter.importDataSetLists(workDir, importData); @@ -93,8 +94,8 @@ public void importDataSetLists_createNewVa() throws DataSetServiceException, IOE } @Test - public void importDataSetLists_vaExistsDoNotCreateIt() throws DataSetServiceException, IOException { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206208"); + public void importDataSetLists_vaExistsDoNotCreateIt() throws DataSetServiceException { + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206208"); when(vaService.getById(any())).thenReturn(mock(VisibilityArea.class)); List result = dataSetListImporter.importDataSetLists(workDir, importData); Assertions.assertTrue(result.contains(UUID.fromString("cb6fc56b-392c-456a-82d6-46fc38836a75"))); @@ -109,8 +110,8 @@ public void importDataSetLists_vaExistsDoNotCreateIt() throws DataSetServiceExce } @Test - public void importDataSetLists_1() throws DataSetServiceException, IOException { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206208"); + public void importDataSetLists_1() throws DataSetServiceException { + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206208"); when(vaService.getById(any())).thenReturn(mock(VisibilityArea.class)); when(dslService.getById(any())) .thenReturn(mock(DataSetList.class)); @@ -137,7 +138,7 @@ public void checkAndCorrectName_noDuplicateInBase() { dataSetListImporter.checkAndCorrectName(object); - Assertions.assertEquals(object.getName(), name); + Assertions.assertEquals(name, object.getName()); } @Test @@ -159,7 +160,7 @@ public void checkAndCorrectName_theSameObject() { dataSetListImporter.checkAndCorrectName(object); - Assertions.assertEquals(object.getName(), name); + Assertions.assertEquals(name, object.getName()); } @Test @@ -180,7 +181,7 @@ public void checkAndCorrectName_theSameButWithOtherNameObject() { dataSetListImporter.checkAndCorrectName(object); - Assertions.assertEquals(object.getName(), name); + Assertions.assertEquals(name, object.getName()); } @Test @@ -210,6 +211,6 @@ public void checkAndCorrectName_twoDuplicateInBase() { dataSetListImporter.checkAndCorrectName(object); - Assertions.assertEquals(object.getName(), name + " Copy _2"); + Assertions.assertEquals(name + " Copy _2", object.getName()); } } diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetParametersImporterTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetParametersImporterTest.java index 8ba616f..6a81b74 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetParametersImporterTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetParametersImporterTest.java @@ -24,7 +24,6 @@ import java.io.IOException; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -36,6 +35,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.parallel.Isolated; import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.qubership.atp.dataset.service.direct.ClearCacheService; @@ -53,6 +53,7 @@ @Isolated @ExtendWith(SpringExtension.class) +@ExtendWith(MockitoExtension.class) public class DataSetParametersImporterTest { private ObjectLoaderFromDiskService objectLoaderFromDiskService; @@ -81,7 +82,7 @@ public void setUp() throws Exception { @Test public void validateDataSetParameters() { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206209"); + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206209"); when(dsService.getById(any())).thenReturn(null); List result = dataSetParametersImporter.validateDataSetParameters(workDir, Collections.emptyMap(), false); @@ -93,8 +94,8 @@ public void validateDataSetParameters() { } @Test - public void importDataSetParameters_1() throws DataSetServiceException, IOException { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206209"); + public void importDataSetParameters_1() throws DataSetServiceException { + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206209"); when(attrService.getById(any())).thenReturn(null); when(attrService.getAttributeKeyById(any())).thenReturn(null); dataSetParametersImporter.importDataSetParameters(workDir, importData); @@ -102,8 +103,8 @@ public void importDataSetParameters_1() throws DataSetServiceException, IOExcept } @Test - public void importDataSetParameters_2() throws DataSetServiceException, IOException { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206209"); + public void importDataSetParameters_2() throws DataSetServiceException { + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206209"); when(attrService.getById(any())).thenReturn(mock(Attribute.class)); when(paramService.replicate(any(), any(), any(), any())).thenReturn(mock(Parameter.class)); dataSetParametersImporter.importDataSetParameters(workDir, importData); @@ -111,8 +112,8 @@ public void importDataSetParameters_2() throws DataSetServiceException, IOExcept } @Test - public void importDataSetParameters_21() throws DataSetServiceException, IOException { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206209"); + public void importDataSetParameters_21() throws DataSetServiceException { + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206209"); when(attrService.getById(any())).thenReturn(null); when(attrService.getAttributeKeyById(any())).thenReturn(mock(AttributeKey.class)); when(paramService.replicate(any(), any(), any(), any())).thenReturn(mock(Parameter.class)); @@ -122,8 +123,8 @@ public void importDataSetParameters_21() throws DataSetServiceException, IOExcep } @Test - public void importDataSetParameters_22() throws DataSetServiceException, IOException { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206209"); + public void importDataSetParameters_22() throws DataSetServiceException { + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206209"); when(attrService.getById(any())).thenReturn(mock(Attribute.class)); UUID absentAttributeId = UUID.fromString("1c80d1bd-614e-4b01-9def-9fb9b9e79518"); when(attrService.getById(absentAttributeId)).thenReturn(null); @@ -135,8 +136,8 @@ public void importDataSetParameters_22() throws DataSetServiceException, IOExcep } @Test - public void importDataSetParameters_3() throws DataSetServiceException, IOException { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206209"); + public void importDataSetParameters_3() throws DataSetServiceException { + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206209"); when(attrService.getById(any())).thenReturn(mock(Attribute.class)); Parameter parameter = mock(Parameter.class); when(paramService.replicate(any(), any(), any(), any())).thenReturn(parameter); @@ -151,8 +152,8 @@ public void importDataSetParameters_3() throws DataSetServiceException, IOExcept } @Test - public void importDataSetParameters_4() throws DataSetServiceException, IOException { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206209"); + public void importDataSetParameters_4() throws DataSetServiceException { + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206209"); when(attrService.getById(any())).thenReturn(mock(Attribute.class)); Parameter existingParameter = mock(Parameter.class); diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetsImporterTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetsImporterTest.java index 227c4c0..3ccc210 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetsImporterTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetsImporterTest.java @@ -22,9 +22,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.io.IOException; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.HashMap; import java.util.UUID; @@ -34,21 +32,23 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.parallel.Isolated; import org.mockito.Mock; -import org.qubership.atp.dataset.service.jpa.delegates.DataSetList; -import org.springframework.test.context.junit.jupiter.SpringExtension; - +import org.mockito.junit.jupiter.MockitoExtension; import org.qubership.atp.dataset.service.direct.ClearCacheService; import org.qubership.atp.dataset.service.jpa.DataSetServiceException; import org.qubership.atp.dataset.service.jpa.JpaDataSetListService; import org.qubership.atp.dataset.service.jpa.JpaDataSetService; import org.qubership.atp.dataset.service.jpa.delegates.DataSet; +import org.qubership.atp.dataset.service.jpa.delegates.DataSetList; import org.qubership.atp.ei.node.dto.ExportImportData; import org.qubership.atp.ei.node.dto.validation.ValidationType; import org.qubership.atp.ei.node.services.ObjectLoaderFromDiskService; +import org.springframework.test.context.junit.jupiter.SpringExtension; + import lombok.extern.slf4j.Slf4j; @Isolated @ExtendWith(SpringExtension.class) +@ExtendWith(MockitoExtension.class) @Slf4j public class DataSetsImporterTest { @@ -84,8 +84,8 @@ public void setUp() { } @Test - public void importDataSets() throws DataSetServiceException, IOException { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206209"); + public void importDataSets() throws DataSetServiceException { + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206209"); dataSetsImporter.importDataSets(workDir, importData); @@ -93,8 +93,8 @@ public void importDataSets() throws DataSetServiceException, IOException { } @Test - public void importDataSets_2() throws DataSetServiceException, IOException { - Path workDir = Paths.get("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206209"); + public void importDataSets_2() throws DataSetServiceException { + Path workDir = Path.of("src/test/resources/ei/import/1d554fe3-4a15-4e1c-964a-1585e3206209"); when(dsService.getById(any())).thenReturn(mock(DataSet.class)); dataSetsImporter.importDataSets(workDir, importData); @@ -112,7 +112,7 @@ public void checkAndCorrectName_noDuplicateInBase() { dataSetsImporter.checkAndCorrectName(object); - Assertions.assertEquals(object.getName(), name); + Assertions.assertEquals(name, object.getName()); } @Test @@ -133,7 +133,7 @@ public void checkAndCorrectName_theSameObject() { dataSetsImporter.checkAndCorrectName(object); - Assertions.assertEquals(object.getName(), name); + Assertions.assertEquals(name, object.getName()); } @Test @@ -154,7 +154,7 @@ public void checkAndCorrectName_theSameButWithOtherNameObject() { dataSetsImporter.checkAndCorrectName(object); - Assertions.assertEquals(object.getName(), name); + Assertions.assertEquals(name, object.getName()); } @Test @@ -186,6 +186,6 @@ public void checkAndCorrectName_twoDuplicateInBase() { dataSetsImporter.checkAndCorrectName(object); - Assertions.assertEquals(object.getName(), name + " Copy _2"); + Assertions.assertEquals(name + " Copy _2", object.getName()); } } diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DuplicateNameCheckerTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DuplicateNameCheckerTest.java index 78d91b6..b807a9b 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DuplicateNameCheckerTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DuplicateNameCheckerTest.java @@ -20,11 +20,13 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.parallel.Isolated; import org.mockito.Spy; - +import org.mockito.junit.jupiter.MockitoExtension; import org.qubership.atp.dataset.ei.model.IdEntity; +@ExtendWith(MockitoExtension.class) @Isolated public class DuplicateNameCheckerTest { diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/impl/LookupMacrosTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/impl/LookupMacrosTest.java index 08a8a1b..686fe54 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/impl/LookupMacrosTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/impl/LookupMacrosTest.java @@ -188,7 +188,7 @@ public void refThisToRefThis_ChildRefIsOverlapped_ContextOfDefaultIsUsed() throw @Test public void vLookup_RefDslUsingRefThis_ResolvedProperly() throws Exception { PhoneCallTestData data = createTestDataInstance(PhoneCallTestData::new); - String vlookupMacro = String.format("#REF_DSL(%s.#REF_THIS(%s.%s).#REF_THIS(%s.%s))", + String vlookupMacro = "#REF_DSL(%s.#REF_THIS(%s.%s).#REF_THIS(%s.%s))".formatted( data.internationalRateCost.getName(), data.voiceCallIntoOriginCountryRef.getAttribute().getName(), data.countryZone.getName(), @@ -207,7 +207,7 @@ public void vLookup_RefToDslWithOverlap_ResolvedProperly() throws Exception { .VoiceCaseRefToDslWithOverlap::new); //#REF_DSL(International Voice Rates.#REF_THIS(Subscription.TariffName).#REF_THIS(UsageType).#REF_THIS // (DestinationCountry.IntenationalZone)) - String vlookupMacro = String.format("#REF_DSL(%s.#REF_THIS(%s.%s).#REF_THIS(%s).#REF_THIS(%s.%s))", + String vlookupMacro = "#REF_DSL(%s.#REF_THIS(%s.%s).#REF_THIS(%s).#REF_THIS(%s.%s))".formatted( data.internationalVoiceRates.getName(), data.belToUsaIntoSubscriptionRef.getAttribute().getName(), data.tariffName.getAttribute().getName(), diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/impl/RefToRefTestData.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/impl/RefToRefTestData.java index 936dd3a..25d3f47 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/impl/RefToRefTestData.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/impl/RefToRefTestData.java @@ -162,7 +162,7 @@ public VoiceCaseRefToRefWithOverlap(CreationFacade create) { b2bRatesIntoBelgiumRoamingZoneRef = create.refParam(b2bRates, "Belgium", belgiumRoamingZone); //#REF_DSL(International Voice Rates.#REF_THIS(Subscription.TariffName).#REF_THIS(UsageType).#REF_THIS // (DestinationCountry.IntenationalZone)) //Bel - magreb - String vlookupMacro = String.format("#REF_DSL(%s.#REF_THIS(%s.%s).#REF_THIS(%s).#REF_THIS(%s.%s))", + String vlookupMacro = "#REF_DSL(%s.#REF_THIS(%s.%s).#REF_THIS(%s).#REF_THIS(%s.%s))".formatted( internationalVoiceRates.getName(), belToEgyptIntoSubscriptionRef.getAttribute().getName(), tariffName.getAttribute().getName(), @@ -173,7 +173,7 @@ public VoiceCaseRefToRefWithOverlap(CreationFacade create) { null, b2bRatesIntoBelgiumRoamingZoneRef.getAttribute()); //#REF_DSL(Roaming SMS Rates.#REF_THIS(Account.AccountType).#REF_THIS(OriginCountry.Zone).#REF_THIS // (DestinationCountry.Zone)) bel - egy - String vlookupMacro2 = String.format("#REF_DSL(%s.#REF_THIS(%s.%s).#REF_THIS(%s.%s).#REF_THIS(%s.%s))", + String vlookupMacro2 = "#REF_DSL(%s.#REF_THIS(%s.%s).#REF_THIS(%s.%s).#REF_THIS(%s.%s))".formatted( roamingSmsRates.getName(), belToEgyptIntoAccountRef.getAttribute().getName(), b2bAccType.getAttribute().getName(), diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/parser/ParsingStateTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/parser/ParsingStateTest.java index 6609b37..32005e6 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/parser/ParsingStateTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/parser/ParsingStateTest.java @@ -26,7 +26,7 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.commons.lang3.tuple.ImmutablePair; import org.junit.jupiter.api.Assertions; diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/processor/AbstractMacroProcessorTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/processor/AbstractMacroProcessorTest.java index 802504c..4cef517 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/processor/AbstractMacroProcessorTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/processor/AbstractMacroProcessorTest.java @@ -26,7 +26,7 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.junit.jupiter.api.Test; @@ -186,7 +186,7 @@ protected TestMacroContext createChildContext(@Nonnull TestMacroContext parent, public final class TestMacroContext extends MacroContextBase { private StringBuilder args; - private StringBuilder text = new StringBuilder(); + private final StringBuilder text = new StringBuilder(); private String macro; public TestMacroContext() { diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/processor/EvalContextImplTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/processor/EvalContextImplTest.java index ad490c0..9bd0058 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/processor/EvalContextImplTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/processor/EvalContextImplTest.java @@ -21,21 +21,15 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Isolated; import org.mockito.Mockito; - -import com.google.common.collect.Lists; import org.qubership.atp.dataset.macros.EvalContextImpl; import org.qubership.atp.dataset.macros.MacroRegistry; import org.qubership.atp.dataset.macros.cache.MacroCacheKey; import org.qubership.atp.dataset.macros.cache.NoCache; -import org.qubership.atp.dataset.macros.exception.CtxEvalException; import org.qubership.atp.dataset.macros.impl.RefToRefTestData; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.DataSet; @@ -48,6 +42,10 @@ import org.qubership.atp.dataset.service.direct.helper.SimpleCreationFacade; import org.qubership.atp.dataset.service.direct.macros.EvaluateDsParamStrategyImpl; +import com.google.common.collect.Lists; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; + @Isolated public class EvalContextImplTest { private static final CreationFacade FACADE = SimpleCreationFacade.INSTANCE; @@ -101,7 +99,7 @@ public void reset() { @Test - public void refDslToRefThis_ChildRefPointsToUninitializedParameter_GotEmptyString() throws Exception { + public void refDslToRefThis_ChildRefPointsToUninitializedParameter_GotEmptyString() { RefToRefTestData.RefDslChildRefTargetParamIsUninitialized data = new RefToRefTestData.RefDslChildRefTargetParamIsUninitialized(FACADE); OverlapItem.Reachable nextParam; TestEvalContext curCtx; @@ -121,7 +119,7 @@ public void refDslToRefThis_ChildRefPointsToUninitializedParameter_GotEmptyStrin } @Test - public void refDslToRefThis_ChildRefPointsToUnreachableAttribute_FoundInParentRefContext() throws Exception { + public void refDslToRefThis_ChildRefPointsToUnreachableAttribute_FoundInParentRefContext() { RefToRefTestData.RefDslChildRefTargetAttrIsUnreachable data = new RefToRefTestData.RefDslChildRefTargetAttrIsUnreachable(FACADE); OverlapItem.Reachable nextParam; TestEvalContext curCtx; @@ -145,7 +143,7 @@ public void refDslToRefThis_ChildRefPointsToUnreachableAttribute_FoundInParentRe } @Test - public void refDslToRefThis_ChildRefPointsToInitializedParameter_GotTwoStrictContexts() throws Exception { + public void refDslToRefThis_ChildRefPointsToInitializedParameter_GotTwoStrictContexts() { RefToRefTestData.RefDslChildRefTargetParamIsInitialized data = new RefToRefTestData.RefDslChildRefTargetParamIsInitialized(FACADE); OverlapItem.Reachable nextParam; TestEvalContext curCtx; @@ -169,7 +167,7 @@ public void refDslToRefThis_ChildRefPointsToInitializedParameter_GotTwoStrictCon } @Test - public void refThisToRefThis_ChildRefPointsToUnreachableAttribute_FoundInParentRefContext() throws Exception { + public void refThisToRefThis_ChildRefPointsToUnreachableAttribute_FoundInParentRefContext() { RefToRefTestData.RefThisChildRefTargetAttrIsUnreachable data = new RefToRefTestData.RefThisChildRefTargetAttrIsUnreachable(FACADE); OverlapItem.Reachable nextParam; TestEvalContext curCtx; @@ -193,7 +191,7 @@ public void refThisToRefThis_ChildRefPointsToUnreachableAttribute_FoundInParentR } @Test - public void refThisToRefThis_ChildRefPointsToUninitializedParameter_GotEmptyString() throws Exception { + public void refThisToRefThis_ChildRefPointsToUninitializedParameter_GotEmptyString() { RefToRefTestData.RefThisChildRefTargetParamIsUninitialized data = new RefToRefTestData.RefThisChildRefTargetParamIsUninitialized(FACADE); OverlapItem.Reachable nextParam; TestEvalContext curCtx; @@ -217,7 +215,7 @@ public void refThisToRefThis_ChildRefPointsToUninitializedParameter_GotEmptyStri } @Test - public void refThisToRefThis_ChildRefIsOverlapped_ContextOfDefaultIsUsed() throws Exception { + public void refThisToRefThis_ChildRefIsOverlapped_ContextOfDefaultIsUsed() { RefToRefTestData.ChildRefIsOverlapped data = new RefToRefTestData.ChildRefIsOverlapped(FACADE); OverlapItem.Reachable nextParam; @@ -242,7 +240,7 @@ public void refThisToRefThis_ChildRefIsOverlapped_ContextOfDefaultIsUsed() throw } @Test - public void refThisToRefThis_ChildRefPointsToInitializedParameter_GotThreeStrictContexts() throws Exception { + public void refThisToRefThis_ChildRefPointsToInitializedParameter_GotThreeStrictContexts() { RefToRefTestData.RefThisChildRefTargetParamIsInitialized data = new RefToRefTestData.RefThisChildRefTargetParamIsInitialized(FACADE); OverlapItem.Reachable nextParam; TestEvalContext curCtx; @@ -266,7 +264,7 @@ public void refThisToRefThis_ChildRefPointsToInitializedParameter_GotThreeStrict } @Test - public void refThis_RefTargetIsOverlapped_ContextOfOverlapIsUsed() throws Exception { + public void refThis_RefTargetIsOverlapped_ContextOfOverlapIsUsed() { RefToRefTestData.RefTargetParamIsOverlapped data = new RefToRefTestData.RefTargetParamIsOverlapped(FACADE); OverlapItem.Reachable nextParam; TestEvalContext curCtx; @@ -286,7 +284,7 @@ public void refThis_RefTargetIsOverlapped_ContextOfOverlapIsUsed() throws Except } @Test - public void refThisToRefThis_RefTargetIsOverlapped_ContextOfOverlapIsUsed() throws Exception { + public void refThisToRefThis_RefTargetIsOverlapped_ContextOfOverlapIsUsed() { RefToRefTestData.ChildRefTargetParamIsOverlapped data = new RefToRefTestData.ChildRefTargetParamIsOverlapped(FACADE); OverlapItem.Reachable nextParam; TestEvalContext curCtx; @@ -368,7 +366,7 @@ protected EvalContextImpl createChild(@Nonnull DataSetList dsl, @Nonnull @Override - protected String evaluate(@Nonnull String inputText, @Nonnull MacroCacheKey cacheKey) throws CtxEvalException { + protected String evaluate(@Nonnull String inputText, @Nonnull MacroCacheKey cacheKey) { leaf = this; return inputText; } diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/processor/MacrosEvaluator.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/processor/MacrosEvaluator.java index 861bba5..2660d08 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/processor/MacrosEvaluator.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/processor/MacrosEvaluator.java @@ -18,8 +18,6 @@ import java.util.Collections; -import org.springframework.beans.factory.annotation.Autowired; - import org.qubership.atp.dataset.macros.EvalContextImpl; import org.qubership.atp.dataset.macros.MacroRegistry; import org.qubership.atp.dataset.macros.cache.NoCache; @@ -33,7 +31,6 @@ public class MacrosEvaluator implements Evaluator { private final MacroRegistry registry; private final AliasWrapperService wrapperService; - @Autowired public MacrosEvaluator(MacroRegistry registry, AliasWrapperService wrapperService) { this.registry = registry; this.wrapperService = wrapperService; diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/processor/RefAliasProcessorTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/processor/RefAliasProcessorTest.java index d8c1414..6096283 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/processor/RefAliasProcessorTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/macros/processor/RefAliasProcessorTest.java @@ -27,7 +27,7 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -65,7 +65,7 @@ public Macros getMacros(@Nonnull String key) { return new Macros(key.toUpperCase()) { @Override - public Object evaluate(Stream input, EvaluationContext context) throws Exception { + public Object evaluate(Stream input, EvaluationContext context) { throw new UnsupportedOperationException("Mock method"); } @@ -73,7 +73,7 @@ public Object evaluate(Stream input, EvaluationContext context) throws Exception public ArgsParser createArgsParser() { return new DotSeparatedArgsParser(new MacroArgsFactory()) { @Override - protected SignatureArg createArg(int index, @Nonnull MacroArgFactory args) throws Exception { + protected SignatureArg createArg(int index, @Nonnull MacroArgFactory args) { return args.text(); } }; diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/EvaluatorMock.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/EvaluatorMock.java index c6f8024..683bbab 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/EvaluatorMock.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/EvaluatorMock.java @@ -19,8 +19,8 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.qubership.atp.dataset.model.DataSet; import org.qubership.atp.dataset.model.DataSetList; diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/ItfMultiplyTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/ItfMultiplyTest.java index 80b3707..90dca7b 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/ItfMultiplyTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/ItfMultiplyTest.java @@ -41,10 +41,10 @@ public void dataSetWithMixins_serializeInItfWay_shouldContainMixinData() throws MultiplyTestData d = new MultiplyTestData(SimpleCreationFacade.INSTANCE); String expectedJson = "{\n" + " \"Account\": " - + String.format("\"MULTIPLY %s %s\"", d.resCA.getId(), d.b2bCA.getId()) + + "\"MULTIPLY %s %s\"".formatted(d.resCA.getId(), d.b2bCA.getId()) + " ,\n" + " \"Subscription\": " - + String.format("\"MULTIPLY %s %s %s\"", d.baseCheck.getId(), d.proStart.getId(), d.base.getId()) + + "\"MULTIPLY %s %s %s\"".formatted(d.baseCheck.getId(), d.proStart.getId(), d.base.getId()) + " }\n" + "}"; ObjectNode actual = Utils.serializeInItfWay(d.mix, MAPPER, EvaluatorMock.INSTANCE); diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/MultiplyTestData.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/MultiplyTestData.java index 8237125..a5d7f59 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/MultiplyTestData.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/MultiplyTestData.java @@ -141,7 +141,7 @@ public MultiplyTestData(CreationFacade create) { + " \"parameters\": [{" + " \"dataSet\": \"" + mix.getId() + "\"," + " \"value\": " - + String.format(" \"MULTIPLY %s %s\"", resCA.getId(), b2bCA.getId()) + + " \"MULTIPLY %s %s\"".formatted(resCA.getId(), b2bCA.getId()) + " ," + " \"overlap\": false" + " }" @@ -154,7 +154,7 @@ public MultiplyTestData(CreationFacade create) { + " \"parameters\": [{" + " \"dataSet\": \"" + mix.getId() + "\"," + " \"value\": " - + String.format(" \"MULTIPLY %s %s %s\"", baseCheck.getId(), proStart.getId(), base.getId()) + + " \"MULTIPLY %s %s %s\"".formatted(baseCheck.getId(), proStart.getId(), base.getId()) + " ," + " \"overlap\": false" + " }" diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/PhoneCallTestData.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/PhoneCallTestData.java index 847fbc3..15e0e5d 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/PhoneCallTestData.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/PhoneCallTestData.java @@ -18,7 +18,7 @@ import java.util.function.Supplier; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.DataSet; diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/UiSerializationTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/UiSerializationTest.java index 52e4ef6..fcf2757 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/UiSerializationTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/UiSerializationTest.java @@ -24,17 +24,10 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.annotation.Nonnull; - import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.springframework.test.context.junit.jupiter.SpringExtension; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.common.collect.Lists; import org.qubership.atp.dataset.JsonMatcher; import org.qubership.atp.dataset.model.Attribute; import org.qubership.atp.dataset.model.DataSet; @@ -48,6 +41,12 @@ import org.qubership.atp.dataset.service.direct.helper.SimpleCreationFacade; import org.qubership.atp.dataset.service.rest.dto.manager.UiManAttribute; import org.qubership.atp.dataset.service.rest.dto.manager.UiManDataSetList; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.collect.Lists; +import jakarta.annotation.Nonnull; @ExtendWith(SpringExtension.class) public class UiSerializationTest { @@ -174,26 +173,20 @@ private static String replaceIds(Identified source, String jsonTarget) { Identified next = items.next(); String id = next.getId().toString(); String name; - if (next instanceof Named) { - name = ((Named) next).getName(); + if (next instanceof Named named) { + name = named.getName(); } else { name = "not_supported"; } - String type; - if (next instanceof DataSetList) { - type = "dsl"; - } else if (next instanceof Attribute) { - type = "attr"; - } else if (next instanceof DataSet) { - type = "ds"; - } else if (next instanceof Parameter) { - type = "param"; - } else if (next instanceof ListValue) { - type = "lv"; - } else { - type = next.getClass().getSimpleName(); - } - jsonTarget = jsonTarget.replaceAll(id, String.format("\\$\\{%s: %s\\}", type, name)); + String type = switch (next) { + case DataSetList dataSetList -> "dsl"; + case Attribute attribute -> "attr"; + case DataSet dataSet -> "ds"; + case Parameter parameter -> "param"; + case ListValue listValue -> "lv"; + default -> next.getClass().getSimpleName(); + }; + jsonTarget = jsonTarget.replaceAll(id, "\\$\\{%s: %s\\}".formatted(type, name)); } return jsonTarget; } diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/tree/LeafsWalkerTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/tree/LeafsWalkerTest.java index 058bddf..13438f3 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/tree/LeafsWalkerTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/tree/LeafsWalkerTest.java @@ -25,8 +25,8 @@ import java.util.List; import java.util.stream.IntStream; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -39,8 +39,8 @@ public class LeafsWalkerTest extends TestData { private static final Logger LOG = LoggerFactory.getLogger(LeafsWalkerTest.class); LinkedList path = new LinkedList(); - private StringToInt stringToInt = new StringToInt(); - private IntToString intToString = new IntToString(); + private final StringToInt stringToInt = new StringToInt(); + private final IntToString intToString = new IntToString(); @Test public void IterateOverTree_OneRoot_TraverseHandlerMethodsInvocationOrderIsCorrect() throws Exception { diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/tree/Position.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/tree/Position.java index ca2fe0a..54b8c15 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/tree/Position.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/tree/Position.java @@ -27,8 +27,8 @@ import java.util.function.Consumer; import java.util.function.Function; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.junit.jupiter.api.Assertions; import org.mockito.InOrder; @@ -53,7 +53,7 @@ public static Position ofLeafsDetector(Function> public static Position ofLeafsDetector(Function> childrenSup, Iterator data) { TraverseHandlerToMock h = Mockito.spy(new TraverseHandlerToMock<>(childrenSup)); - LeafsDetector detector = new LeafsDetector(data, h, null) { + LeafsDetector detector = new LeafsDetector<>(data, h, null) { @Nullable @Override protected Iterator getChildren(@Nonnull T parent) { diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/tree/TraverseHandlerToMock.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/tree/TraverseHandlerToMock.java index f14ae76..eea18bb 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/tree/TraverseHandlerToMock.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/tree/TraverseHandlerToMock.java @@ -20,8 +20,8 @@ import java.util.LinkedList; import java.util.function.Function; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; class TraverseHandlerToMock implements TraverseAndLeafsHandler { diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/tree/TreeNode.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/tree/TreeNode.java index 497f00e..b4927a2 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/tree/TreeNode.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/model/utils/tree/TreeNode.java @@ -24,8 +24,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.google.common.collect.Iterators; diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/AbstractTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/AbstractTest.java index f26bcb7..35b7e01 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/AbstractTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/AbstractTest.java @@ -25,7 +25,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.json.JSONArray; import org.json.JSONException; diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/GridFsServiceTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/GridFsServiceTest.java index c2262b8..4f5a6d0 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/GridFsServiceTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/GridFsServiceTest.java @@ -31,21 +31,17 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.io.TempDir; import org.junit.jupiter.api.parallel.Isolated; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit.jupiter.SpringExtension; - +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.qubership.atp.dataset.config.TestConfiguration; import org.qubership.atp.dataset.db.GridFsRepository; import org.qubership.atp.dataset.model.impl.file.FileData; import org.qubership.atp.dataset.service.AbstractTest; @Isolated -@ExtendWith(SpringExtension.class) -@ContextConfiguration(classes = {TestConfiguration.class}) +@SpringJUnitConfig(classes = {TestConfiguration.class}) public class GridFsServiceTest extends AbstractTest { @Autowired diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/impl/CompareDsTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/impl/CompareDsTest.java index a8576f8..46122c1 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/impl/CompareDsTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/impl/CompareDsTest.java @@ -18,17 +18,9 @@ import java.util.UUID; -import javax.transaction.Transactional; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Isolated; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.mock.mockito.SpyBean; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.jdbc.Sql; - import org.qubership.atp.dataset.config.TestConfiguration; import org.qubership.atp.dataset.db.jpa.ModelsProvider; import org.qubership.atp.dataset.model.api.DetailedComparisonDsRequest; @@ -39,6 +31,13 @@ import org.qubership.atp.dataset.service.direct.EncryptionService; import org.qubership.atp.dataset.service.direct.GridFsService; import org.qubership.atp.dataset.service.jpa.model.AttributeTypeName; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.mock.mockito.SpyBean; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.jdbc.Sql; + +import jakarta.transaction.Transactional; @Isolated @ContextConfiguration(classes = {TestConfiguration.class}) @@ -58,16 +57,17 @@ public class CompareDsTest extends DataSetBuilder { @SpyBean EncryptionService encryptionService; - private UUID leftDs = UUID.fromString("527b9023-b6a8-4a64-99c1-af80b94449d2"); - private UUID identicalDs = UUID.fromString("1919170b-5733-4a9a-b67d-80a6ca027d7d"); - private UUID oneParamDs = UUID.fromString("d450e596-1910-4ad4-8c94-61c576296e4d"); - private UUID diffAttrTypeDs = UUID.fromString("23be800d-dd13-4ead-ae82-883a4a228a92"); - private UUID diffAttrNameDs = UUID.fromString("e8fe4a2b-815c-46ba-b32f-13a63204eb8a"); - private UUID diffStringValueDs = UUID.fromString("fa11fd87-4461-4908-9069-f0c2f4a2d058"); - private UUID diffDslValueDs = UUID.fromString("1ff48d2c-1819-4682-afc1-a1092a198929"); - private UUID diffListValueDs = UUID.fromString("6ab9a777-3b0d-478c-8340-4b12843342e7"); - private UUID leftDsNoParameters = UUID.fromString("3e2d9226-453a-452d-999e-f060627f8c6c"); - private UUID rightDsNoParameters = UUID.fromString("9b3d09e7-2ddf-4381-a711-187174d7ad73"); + private final UUID leftDs = UUID.fromString("527b9023-b6a8-4a64-99c1-af80b94449d2"); + private final UUID identicalDs = UUID.fromString("1919170b-5733-4a9a-b67d-80a6ca027d7d"); + private final UUID oneParamDs = UUID.fromString("d450e596-1910-4ad4-8c94-61c576296e4d"); + private final UUID diffAttrTypeDs = UUID.fromString("23be800d-dd13-4ead-ae82-883a4a228a92"); + private final UUID diffAttrNameDs = UUID.fromString("e8fe4a2b-815c-46ba-b32f-13a63204eb8a"); + private final UUID diffStringValueDs = UUID.fromString("fa11fd87-4461-4908-9069-f0c2f4a2d058"); + private final UUID diffDslValueDs = UUID.fromString("1ff48d2c-1819-4682-afc1-a1092a198929"); + private final UUID diffListValueDs = UUID.fromString("6ab9a777-3b0d-478c-8340-4b12843342e7"); + private final UUID leftDsNoParameters = UUID.fromString("3e2d9226-453a-452d-999e-f060627f8c6c"); + private final UUID rightDsNoParameters = UUID.fromString("9b3d09e7-2ddf-4381-a711-187174d7ad73"); + @Test @Transactional public void compare_IdenticalDs_statusOk() { diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/impl/DataSetListServiceImplTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/impl/DataSetListServiceImplTest.java index 2890404..d9e9f83 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/impl/DataSetListServiceImplTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/impl/DataSetListServiceImplTest.java @@ -17,7 +17,6 @@ package org.qubership.atp.dataset.service.direct.impl; import static java.util.Arrays.asList; -import static junit.framework.TestCase.assertNull; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; @@ -28,6 +27,8 @@ import static org.hamcrest.Matchers.hasSize; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doThrow; @@ -45,22 +46,13 @@ import org.apache.commons.lang3.tuple.Pair; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.parallel.Isolated; import org.mockito.Mock; import org.mockito.Mockito; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.data.domain.PageImpl; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.TestPropertySource; -import org.springframework.test.util.ReflectionTestUtils; - -import com.google.common.collect.ImmutableList; +import org.mockito.junit.jupiter.MockitoExtension; import org.qubership.atp.dataset.config.TestConfiguration; import org.qubership.atp.dataset.db.jpa.ModelsProvider; import org.qubership.atp.dataset.db.jpa.entities.AttributeEntity; @@ -76,16 +68,26 @@ import org.qubership.atp.dataset.model.VisibilityArea; import org.qubership.atp.dataset.model.impl.TableResponse; import org.qubership.atp.dataset.model.utils.DatasetResponse; -import org.qubership.atp.dataset.service.direct.DuplicateKeyException; import org.qubership.atp.dataset.service.rest.dto.manager.AffectedDataSetList; import org.qubership.atp.dataset.service.rest.dto.manager.UiManDataSetList; import org.qubership.atp.dataset.versioning.service.DataSetListSnapshotService; -import org.qubership.atp.macros.core.clients.api.dto.macros.MacrosDto; import org.qubership.atp.macros.core.calculator.MacrosCalculator; import org.qubership.atp.macros.core.client.MacrosFeignClient; +import org.qubership.atp.macros.core.clients.api.dto.macros.MacrosDto; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.data.domain.PageImpl; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.util.ReflectionTestUtils; + +import com.google.common.collect.ImmutableList; @Isolated -@ContextConfiguration(classes = {TestConfiguration.class}) +@SpringJUnitConfig(classes = {TestConfiguration.class}) +@ExtendWith(MockitoExtension.class) @TestPropertySource(properties = { "feign.atp.macros.url=", "feign.atp.macros.route=", @@ -170,17 +172,17 @@ public void clearTestPlanInDataSetList_testPlanWasDeleted() { } @Test - public void testDeleteDataSetListCascade() throws DuplicateKeyException { + public void testDeleteDataSetListCascade() { DataSetList dsl = dataSetListService.create(vaId, "MustBeRemoved", null); DataSet dataSet = dataSetService.create(dsl.getId(), "MustBeRemoved"); Attribute attribute = attributeService .create(dsl.getId(), 0, "MustBeRemoved", AttributeType.TEXT, null, null); Parameter parameter = parameterService.create(dataSet.getId(), attribute.getId(), "Text", null, null); dataSetListService.delete(dsl.getId()); - Assertions.assertNull(dataSetListService.get(dsl.getId())); - Assertions.assertNull(dataSetService.get(dataSet.getId())); - Assertions.assertNull(attributeService.get(attribute.getId())); - Assertions.assertNull(parameterService.get(parameter.getId())); + assertNull(dataSetListService.get(dsl.getId())); + assertNull(dataSetService.get(dataSet.getId())); + assertNull(attributeService.get(attribute.getId())); + assertNull(parameterService.get(parameter.getId())); List all = visibilityAreaService.getAll(); VisibilityArea area = all.stream().filter(va -> va.getId().equals(vaId)) .findFirst().orElseThrow(() -> new AssertionError("VisibilityArea not found")); @@ -233,23 +235,23 @@ public void testCopyDsl_withTextAndDslRefAndOverlapAttrs_dslWasCopiedWithOrWitho assertEquals(1, withData.getDataSets().size()); List attrs = withoutData.getAttributes(); - assertEquals(attrs.get(0).getName(), "textAttr"); - assertEquals(attrs.get(0).getType(), AttributeType.TEXT); - assertEquals(attrs.get(1).getName(), "PostalCodeRef2"); - assertEquals(attrs.get(1).getType(), AttributeType.DSL); + assertEquals("textAttr", attrs.get(0).getName()); + assertEquals(AttributeType.TEXT, attrs.get(0).getType()); + assertEquals("PostalCodeRef2", attrs.get(1).getName()); + assertEquals(AttributeType.DSL, attrs.get(1).getType()); List attrsWD = withData.getAttributes(); - assertEquals(attrsWD.get(0).getName(), "textAttr"); - assertEquals(attrsWD.get(0).getType(), AttributeType.TEXT); - assertEquals(attrsWD.get(1).getName(), "PostalCodeRef2"); - assertEquals(attrsWD.get(1).getType(), AttributeType.DSL); + assertEquals("textAttr", attrsWD.get(0).getName()); + assertEquals(AttributeType.TEXT, attrsWD.get(0).getType()); + assertEquals("PostalCodeRef2", attrsWD.get(1).getName()); + assertEquals(AttributeType.DSL, attrsWD.get(1).getType()); - assertEquals(withData.getTestPlan().getName(), "TP"); - assertEquals(withoutData.getTestPlan().getName(), "TP"); + assertEquals("TP", withData.getTestPlan().getName()); + assertEquals("TP", withoutData.getTestPlan().getName()); } @Test - public void getDatasetsIdsWithItsNameAndDatasetList_correct_StructureWereReturned() throws DuplicateKeyException { + public void getDatasetsIdsWithItsNameAndDatasetList_correct_StructureWereReturned() { DataSetList dslWithTwoDatasets = dataSetListService.create(vaId, "dslWith2ds", null); DataSet ds1InsideDslWith2ds = dataSetService.create(dslWithTwoDatasets.getId(), "ds1InsideDslWith2ds"); DataSet ds2InsideDslWith2ds = dataSetService.create(dslWithTwoDatasets.getId(), "ds2InsideDslWith2ds"); @@ -289,7 +291,7 @@ public void getDatasetsIdsWithItsNameAndDatasetList_correct_StructureWereReturne } @Test - public void getDatasetsIdsWithItsNameAndDatasetList_correct_StructureWereReturnedWithSkippedNotFoundDsl() throws DuplicateKeyException { + public void getDatasetsIdsWithItsNameAndDatasetList_correct_StructureWereReturnedWithSkippedNotFoundDsl() { DataSetList dsl = dataSetListService.create(vaId, "dslist", null); DataSet dataSet1 = dataSetService.create(dsl.getId(), "ds1"); @@ -305,7 +307,7 @@ public void getDatasetsIdsWithItsNameAndDatasetList_correct_StructureWereReturne } @Test - public void getFilteredDatasets_datasetsWereFilteredById() throws DuplicateKeyException { + public void getFilteredDatasets_datasetsWereFilteredById() { DataSetList dsl = dataSetListService.create(vaId, "dsl", null); DataSet dataSet1 = dataSetService.create(dsl.getId(), "ds1"); DataSet dataSet2 = dataSetService.create(dsl.getId(), "ds2"); @@ -324,7 +326,7 @@ public void getFilteredDatasets_datasetsWereFilteredById() throws DuplicateKeyEx } @Test - public void getFilteredDatasets_datasetsWereFilteredByAttributes() throws DuplicateKeyException { + public void getFilteredDatasets_datasetsWereFilteredByAttributes() { DataSetList dsl = dataSetListService.create(vaId, "dsl", null); DataSet dataSet1 = dataSetService.create(dsl.getId(), "ds1"); Attribute attribute1 = attributeService @@ -358,7 +360,7 @@ public void getFilteredDatasets_datasetsWereFilteredByAttributes() throws Duplic } @Test - public void getFilteredDatasets_datasetsWereFilteredByIdAndAttributes() throws DuplicateKeyException { + public void getFilteredDatasets_datasetsWereFilteredByIdAndAttributes() { DataSetList dsl = dataSetListService.create(vaId, "dsl", null); DataSet dataSet1 = dataSetService.create(dsl.getId(), "ds1"); @@ -471,7 +473,7 @@ public void testGetAffectedDataSetLists_shouldReturnsEmptyList_whenDataSetListIs @Test public void testGetAffectedDataSetLists_shouldThrowAnException_whenLimitIsNegative() { DataSetList toDelete = dataSetListService.create(vaId, "dsl", null); - Assertions.assertThrows(IllegalArgumentException.class, ()-> { + assertThrows(IllegalArgumentException.class, ()-> { dataSetListService.getAffectedDataSetLists(toDelete.getId(), -1, 0); }); } @@ -479,13 +481,13 @@ public void testGetAffectedDataSetLists_shouldThrowAnException_whenLimitIsNegati @Test public void testGetAffectedDataSetLists_shouldThrowAnException_whenOffsetIsNegative() { DataSetList toDelete = dataSetListService.create(vaId, "dsl", null); - Assertions.assertThrows(IllegalArgumentException.class, ()-> { + assertThrows(IllegalArgumentException.class, ()-> { dataSetListService.getAffectedDataSetLists(toDelete.getId(), 1, -1); }); } @Test - public void testCopyDslWithDatasets_dslWasCopiedWithoutTestPlan() throws Exception { + public void testCopyDslWithDatasets_dslWasCopiedWithoutTestPlan() { UUID postalCode = dataSetListService.create(vaId, "PostalCode", null).getId(); DataSet pc1 = dataSetService.create(postalCode, "PC#1"); @@ -545,7 +547,7 @@ public void testCopyDslWithDatasets_dslWasCopiedWithoutTestPlan() throws Excepti assertEquals("PostalCodeRef2", attrs.get(1).getName()); assertEquals( AttributeType.DSL, attrs.get(1).getType()); - Assertions.assertNull(resultDsl1.getTestPlan()); + assertNull(resultDsl1.getTestPlan()); } @Test @@ -566,7 +568,7 @@ public void testExistsById_shouldReturnsTrue_whenDataSetListIsExists() { @Test public void testExistsById_shouldThrowAnException_whenDataSetListIdIsNull() { - Assertions.assertThrows(IllegalArgumentException.class, ()-> { + assertThrows(IllegalArgumentException.class, ()-> { dataSetListService.existsById(null); }); } @@ -592,7 +594,7 @@ public void testGetDataSetListModifiedWhen_shouldReturnsNull_whenDataSetListModi @Test public void testGetDataSetListModifiedWhen_shouldThrowAnException_whenDataSetListIdIsNull() { - Assertions.assertThrows(IllegalArgumentException.class, ()-> { + assertThrows(IllegalArgumentException.class, ()-> { dataSetListService.getModifiedWhen(null); }); @@ -608,7 +610,7 @@ public void testDelete_shouldRollbackTransaction_whenExceptionIsOccured() { } @Test - public void test_UiManDataSetList_whenMacrosAtpIs() throws DuplicateKeyException { + public void test_UiManDataSetList_whenMacrosAtpIs() { ReflectionTestUtils.setField(dataSetListService, "macroFeignUrl", "testUrl"); VisibilityArea area = visibilityAreaService.create("TestVA"); DataSetList dsl = dataSetListService.create(area.getId(), "dsl", null); @@ -647,7 +649,7 @@ public void test_UiManDataSetList_whenMacrosAtpIs() throws DuplicateKeyException } @Test - public void test_UiManDataSetList_emptyNonTechnicalMacrosList() throws DuplicateKeyException { + public void test_UiManDataSetList_emptyNonTechnicalMacrosList() { ReflectionTestUtils.setField(dataSetListService, "macroFeignUrl", "testUrl"); VisibilityArea area = visibilityAreaService.create("TestVA"); DataSetList dsl = dataSetListService.create(area.getId(), "dsl", null); @@ -685,7 +687,7 @@ public void test_UiManDataSetList_emptyNonTechnicalMacrosList() throws Duplicate } @Test - public void getAsTree_runEvaluateMacros_macrosParameterEvaluated() throws DuplicateKeyException { + public void getAsTree_runEvaluateMacros_macrosParameterEvaluated() { String str = "35#RANDOMBETWEEN(31,31)"; DataSetList dsl = dataSetListService.create(vaId, "dsl", null); DataSet dataSet = dataSetService.create(dsl.getId(), "ds1"); diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/impl/ReferenceResolveServiceImplTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/impl/ReferenceResolveServiceImplTest.java index a1b4abb..440b32d 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/impl/ReferenceResolveServiceImplTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/impl/ReferenceResolveServiceImplTest.java @@ -112,7 +112,7 @@ public void testNestedMacro_withUnion() { UUID dslRef = data.dsl.getId(); UUID dsRef = data.ds.getId(); UUID attrRef = data.attr.getId(); - String expected = String.format("dasdasd #REF_DSL(%s.#REF(%s.%s).#REF_THIS(%s)) 123 #REF_DSL(%s.%s.%s)", + String expected = "dasdasd #REF_DSL(%s.#REF(%s.%s).#REF_THIS(%s)) 123 #REF_DSL(%s.%s.%s)".formatted( dslRef, dsRef, attrRef, attrRef, dslRef, dsRef, attrRef); Assertions.assertEquals(expected, wrapped); String unwrapped = wrapperService.unWrapAlias(wrapped); @@ -126,7 +126,7 @@ public void testNestedMacro_withAdditionalArgs() { UUID dslRef = data.dsl.getId(); UUID dsRef = data.ds.getId(); UUID attrRef = data.attr.getId(); - String expected = String.format("dasdasd #REF_DSL(%s.#REF(%s.%s).ATTR) 123 #REF_DSL(%s.%s.%s)", + String expected = "dasdasd #REF_DSL(%s.#REF(%s.%s).ATTR) 123 #REF_DSL(%s.%s.%s)".formatted( dslRef, dsRef, attrRef, dslRef, dsRef, attrRef); Assertions.assertEquals(expected, wrapped); String unwrapped = wrapperService.unWrapAlias(wrapped); diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/importexport/service/DatasetListImportServiceTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/importexport/service/DatasetListImportServiceTest.java index 4ed49c8..f536158 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/importexport/service/DatasetListImportServiceTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/importexport/service/DatasetListImportServiceTest.java @@ -38,7 +38,6 @@ import java.io.File; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -52,7 +51,7 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.openxml4j.opc.OPCPackage; @@ -66,6 +65,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.InjectMocks; import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; import org.qubership.atp.dataset.db.jpa.ModelsProvider; import org.qubership.atp.dataset.db.jpa.Wrapper; import org.qubership.atp.dataset.db.jpa.entities.AttributeEntity; @@ -171,6 +171,7 @@ @Isolated @ExtendWith(SpringExtension.class) +@ExtendWith(MockitoExtension.class) @TestPropertySource(properties = {"atp-dataset.javers.enabled=false"}) public class DatasetListImportServiceTest { @@ -439,7 +440,7 @@ public void importDataSetList_ImportExcelFileWhenLockedDataSet_Exception() throw when(dataSetListService.getById(targetDslId)).thenReturn(dsl1); try { - Path path = Paths.get("src/test/resources/excel/import/valid_import_file.xlsx"); + Path path = Path.of("src/test/resources/excel/import/valid_import_file.xlsx"); importService.importDataSetList(targetProjectId, targetDslId, Files.newInputStream(path), false); } catch (ImportFailedException e) { Assertions.assertTrue(e.getMessage().contains("Failed to import DataSetList")); @@ -448,7 +449,7 @@ public void importDataSetList_ImportExcelFileWhenLockedDataSet_Exception() throw @Test public void importDataSetList() throws Exception { - File file = Paths.get("src/test/resources/excel/import/valid_import_file.xlsx").toFile(); + File file = Path.of("src/test/resources/excel/import/valid_import_file.xlsx").toFile(); importService.importDataSetList(targetProjectId, targetDslId, Files.newInputStream(file.toPath()), false); final UUID ds1Id = ds1.getId(); @@ -559,7 +560,7 @@ public void importDataSetList() throws Exception { @Test public void importDataSetList_ThereAreDuplicateDslNames_ErrorWhileImportDataSetList() { doThrow( new RuntimeException("There are duplicate DSL names : []")).when(dataSetListService).checkDslNames(targetProjectId); - File file = Paths.get("src/test/resources/excel/import/valid_import_file.xlsx").toFile(); + File file = Path.of("src/test/resources/excel/import/valid_import_file.xlsx").toFile(); assertThrows(Exception.class, () -> importService.importDataSetList(targetProjectId, targetDslId, Files.newInputStream(file.toPath()), false)); @@ -729,10 +730,10 @@ public void allNeededEntitiesAreLoadedFromDb_prepareImportContext_expectCorrectC final String datasetName = dataset.getName(); final UUID datasetId = dataset.getId(); - final String datasetsMapErrorMsg = String.format("Dataset map should contain dataset: %s", datasetName); + final String datasetsMapErrorMsg = "Dataset map should contain dataset: %s".formatted(datasetName); assertThat(datasetsMapErrorMsg, datasetsMap, IsMapContaining.hasEntry(datasetId, dataset)); - final String datasetsNameIdMapErrorMsg = String.format("Dataset name to id map should contain dataset: %s", + final String datasetsNameIdMapErrorMsg = "Dataset name to id map should contain dataset: %s".formatted( datasetName); assertThat(datasetsNameIdMapErrorMsg, datasetsNameIdMap, IsMapContaining.hasEntry(datasetName, datasetId)); }); @@ -744,8 +745,7 @@ public void allNeededEntitiesAreLoadedFromDb_prepareImportContext_expectCorrectC final UUID datasetId = refDataset.getId(); final String datasetKey = ImportUtils.getDatasetKey(refDataset); - final String refDatasetsNameIdMapErrorMsg = String.format( - "Ref dataset name to id map should contain dataset with key: %s", datasetKey); + final String refDatasetsNameIdMapErrorMsg = "Ref dataset name to id map should contain dataset with key: %s".formatted(datasetKey); assertThat(refDatasetsNameIdMapErrorMsg, refDatasetsNameIdMap, IsMapContaining.hasEntry(datasetKey, datasetId)); }); @@ -755,14 +755,13 @@ public void allNeededEntitiesAreLoadedFromDb_prepareImportContext_expectCorrectC refDatasetLists.forEach(refDatasetList -> { final String refDatasetListName = refDatasetList.getName(); - final String refDslDatasetsErrorMsg = String.format("Ref DSL datasets map should contain DSL with key: %s", + final String refDslDatasetsErrorMsg = "Ref DSL datasets map should contain DSL with key: %s".formatted( refDatasetListName); assertThat(refDslDatasetsErrorMsg, refDslDatasetsMap, IsMapContaining.hasKey(refDatasetListName)); final Set dslDatasetIds = refDslDatasetsMap.get(refDatasetListName); dslDatasetIds.forEach(dslDatasetId -> { - final String refDslDatasetsIdErrorMsg = String.format( - "Ref DSL datasets map DSL '%s' should contain dataset with id: %s", refDatasetListName, + final String refDslDatasetsIdErrorMsg = "Ref DSL datasets map DSL '%s' should contain dataset with id: %s".formatted(refDatasetListName, dslDatasetId); Assertions.assertTrue(refDslDatasetIds.contains(dslDatasetId), refDslDatasetsIdErrorMsg); }); @@ -831,7 +830,7 @@ private Map getFileHeadingRow(String filePath) { private ListIterator> getFileRowIterator(String filePath) { String locationPrefix = "src/test/resources/excel/import/"; - Path path = Paths.get(locationPrefix + filePath); + Path path = Path.of(locationPrefix + filePath); List> sheetConvertList = new ArrayList<>(); try { diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/TestUtils.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/TestUtils.java index aebcc99..6646165 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/TestUtils.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/TestUtils.java @@ -33,26 +33,32 @@ public class TestUtils { public static Macros getUuidMacros() { return getMacros("UUID", - "function main() {\n" - + " var result = java.util.UUID.randomUUID();\n" - + " return result.toString();\n" - + "}"); + """ + function main() { + var result = java.util.UUID.randomUUID(); + return result.toString(); + }\ + """); } public static Macros getCustomMacros() { return getMacros("CUSTOM_VALUE", - "function main() {\n" - + " return 'CUSTOM_VALUE';\n" - + "}"); + """ + function main() { + return 'CUSTOM_VALUE'; + }\ + """); } public static Macros getContextMacros() { Macros context = getMacros("CONTEXT", - "function main(variableName) {\n" - + " return (contextMap != null && contextMap.get(variableName) != null) \n" - + " ? contextMap.get(variableName) \n" - + " : 'Unknown ' + variableName;\n" - + "}"); + """ + function main(variableName) { + return (contextMap != null && contextMap.get(variableName) != null)\s + ? contextMap.get(variableName)\s + : 'Unknown ' + variableName; + }\ + """); context.setParameters(of( getMacrosParameter("variableName", null)) ); @@ -61,42 +67,48 @@ public static Macros getContextMacros() { public static Macros getInnMacros() { return getMacros("INN", - "function main() {\n" - + " var factors = [2, 4, 10, 3, 5, 9, 4, 6, 8];\n" - + " var result = '';\n" - + " var last = 0;\n" - + " for (var i = 0; i < 9; i++) {\n" - + " var floor = Math.floor(Math.random() * (10 - 1) + 1);\n" - + " result += floor;\n" - + " last += factors[i] * floor;\n" - + " }\n" - + " last = last % 11 % 10;\n" - + " result += last;\n" - + " return result;\n" - + "}"); + """ + function main() { + var factors = [2, 4, 10, 3, 5, 9, 4, 6, 8]; + var result = ''; + var last = 0; + for (var i = 0; i < 9; i++) { + var floor = Math.floor(Math.random() * (10 - 1) + 1); + result += floor; + last += factors[i] * floor; + } + last = last % 11 % 10; + result += last; + return result; + }\ + """); } public static Macros getUuidUpperCaseMacros() { return getMacros("UUID_UPPERCASE", - "function main() {\n" - + " var result = java.util.UUID.randomUUID();\n" - + " return result.toString().toUpperCase();\n" - + "}"); + """ + function main() { + var result = java.util.UUID.randomUUID(); + return result.toString().toUpperCase(); + }\ + """); } public static Macros getRandomBetweenMacros() { Macros macros = getMacros("RANDOMBETWEEN", - "function main(min, max) {\n" - + " min = parseInt(min);\n" - + " max = parseInt(max);\n" - + " if (max < min) {\n" - + " var temp = max;\n" - + " max = min;\n" - + " min = temp;\n" - + " }\n" - + " var result = Math.floor(Math.random() * (max - min + 1)) + min;\n" - + " return result.toString();\n" - + "}"); + """ + function main(min, max) { + min = parseInt(min); + max = parseInt(max); + if (max < min) { + var temp = max; + max = min; + min = temp; + } + var result = Math.floor(Math.random() * (max - min + 1)) + min; + return result.toString(); + }\ + """); macros.setParameters(unmodifiableList(asList( getMacrosParameter("min", "1"), getMacrosParameter("max", "100")))); @@ -105,18 +117,20 @@ public static Macros getRandomBetweenMacros() { public static Macros getDateMacros() { Macros macros = getMacros("DATE", - "function main(format, timeZone) {\n" - + " var date = new Packages.java.util.Date();\n" - + " if (format.equals('millis')) {\n" - + " return date.getTime().toString();\n" - + " }\n" - + " var print = new Packages.java.text.SimpleDateFormat(format);\n" - + " if (timeZone != null) {\n" - + " var timezone = Packages.java.util.TimeZone.getTimeZone(timeZone);\n" - + " print.setTimeZone(timezone);\n" - + " }\n" - + " return print.format(date);\n" - + "}"); + """ + function main(format, timeZone) { + var date = new Packages.java.util.Date(); + if (format.equals('millis')) { + return date.getTime().toString(); + } + var print = new Packages.java.text.SimpleDateFormat(format); + if (timeZone != null) { + var timezone = Packages.java.util.TimeZone.getTimeZone(timeZone); + print.setTimeZone(timezone); + } + return print.format(date); + }\ + """); macros.setParameters(unmodifiableList(asList( getMacrosParameter("format", "dd.MM.yyyy hh:mm:ss"), getMacrosParameter("timeZone", null)))); @@ -125,15 +139,17 @@ public static Macros getDateMacros() { public static Macros getCharsMacros() { Macros macros = getMacros("CHARS", - "function main(count) {\n" - + " var result = '';\n" - + " var characters = 'abcdefghijklmnopqrstuvwxyz';\n" - + " var length = characters.length;\n" - + " for (var i = 0; i < count; i++) {\n" - + " result += characters.charAt(Math.floor(Math.random() * length));\n" - + " }\n" - + " return result;\n" - + "}"); + """ + function main(count) { + var result = ''; + var characters = 'abcdefghijklmnopqrstuvwxyz'; + var length = characters.length; + for (var i = 0; i < count; i++) { + result += characters.charAt(Math.floor(Math.random() * length)); + } + return result; + }\ + """); macros.setParameters(of( getMacrosParameter("count", null))); return macros; @@ -141,15 +157,17 @@ public static Macros getCharsMacros() { public static Macros getCharsUpperCaseMacros() { Macros macros = getMacros("CHARS_UPPERCASE", - "function main(count) {\n" - + " var result = '';\n" - + " var characters = 'abcdefghijklmnopqrstuvwxyz';\n" - + " var length = characters.length;\n" - + " for (var i = 0; i < count; i++) {\n" - + " result += characters.charAt(Math.floor(Math.random() * length));\n" - + " }\n" - + " return result.toUpperCase();\n" - + "}"); + """ + function main(count) { + var result = ''; + var characters = 'abcdefghijklmnopqrstuvwxyz'; + var length = characters.length; + for (var i = 0; i < count; i++) { + result += characters.charAt(Math.floor(Math.random() * length)); + } + return result.toUpperCase(); + }\ + """); macros.setParameters(of( getMacrosParameter("count", null))); return macros; @@ -157,9 +175,11 @@ public static Macros getCharsUpperCaseMacros() { public static Macros getSumMacros() { Macros macros = getMacros("SUM", - "function main(first, second) {\n" - + " return parseInt(first) + parseInt(second);\n" - + "}"); + """ + function main(first, second) { + return parseInt(first) + parseInt(second); + }\ + """); macros.setParameters(unmodifiableList(asList( getMacrosParameter("first", null), getMacrosParameter("second", null)))); @@ -168,24 +188,26 @@ public static Macros getSumMacros() { public static Macros getShiftDayMacros() { Macros macros = getMacros("SHIFT_DAY", - "function main(value, date, format) {\n" - + " var calendar = Packages.java.util.Calendar.getInstance();\n" - + " if (format.equals('millis')) {\n" - + " calendar.setTimeInMillis(Packages.java.lang.Long.parseLong(date));\n" - + " var newDay = calendar.get(Packages.java.util.Calendar.DAY_OF_MONTH) + Packages" - + ".java.lang.Integer.parseInt(value);\n" - + " calendar.set(Packages.java.util.Calendar.DAY_OF_MONTH, newDay);\n" - + " return calendar.getTimeInMillis();\n" - + " } else {\n" - + " var sdf = new Packages.java.text.SimpleDateFormat(format);\n" - + " var date1 = sdf.parse(date);\n" - + " calendar.setTimeInMillis(date1.getTime());\n" - + " var newDay = calendar.get(Packages.java.util.Calendar.DAY_OF_MONTH) + Packages" - + ".java.lang.Integer.parseInt(value);\n" - + " calendar.set(Packages.java.util.Calendar.DAY_OF_MONTH, newDay);\n" - + " return sdf.format(calendar.getTime());\n" - + " }\n" - + "}"); + """ + function main(value, date, format) { + var calendar = Packages.java.util.Calendar.getInstance(); + if (format.equals('millis')) { + calendar.setTimeInMillis(Packages.java.lang.Long.parseLong(date)); + var newDay = calendar.get(Packages.java.util.Calendar.DAY_OF_MONTH) + Packages\ + .java.lang.Integer.parseInt(value); + calendar.set(Packages.java.util.Calendar.DAY_OF_MONTH, newDay); + return calendar.getTimeInMillis(); + } else { + var sdf = new Packages.java.text.SimpleDateFormat(format); + var date1 = sdf.parse(date); + calendar.setTimeInMillis(date1.getTime()); + var newDay = calendar.get(Packages.java.util.Calendar.DAY_OF_MONTH) + Packages\ + .java.lang.Integer.parseInt(value); + calendar.set(Packages.java.util.Calendar.DAY_OF_MONTH, newDay); + return sdf.format(calendar.getTime()); + } + }\ + """); macros.setParameters(unmodifiableList(asList( getMacrosParameter("value", null), getMacrosParameter("date", null), @@ -195,13 +217,15 @@ public static Macros getShiftDayMacros() { public static Macros getRandMacros() { Macros macros = getMacros("RAND", - "function main(digit) {\n" - + " digit = Math.abs(parseInt(digit));\n" - + " min = Math.pow(10, digit - 1);\n" - + " max = Math.pow(10, digit) - 1;\n" - + " var result = Math.floor(Math.random() * (max - min + 1)) + min;\n" - + " return result.toString();\n" - + "}"); + """ + function main(digit) { + digit = Math.abs(parseInt(digit)); + min = Math.pow(10, digit - 1); + max = Math.pow(10, digit) - 1; + var result = Math.floor(Math.random() * (max - min + 1)) + min; + return result.toString(); + }\ + """); macros.setParameters(of( getMacrosParameter("digit", "1"))); return macros; @@ -209,10 +233,12 @@ public static Macros getRandMacros() { public static Macros getTrNameMacros() { Macros macros = getMacros("TEST_CASE_SHORT_NAME", - "function main() { \n" - + "\treturn (contextMap != null && contextMap.get('TEST_CASE_SHORT_NAME') != null) \n" - + "\t\t? contextMap.get('TEST_CASE_SHORT_NAME') : 'Unknown TEST_CASE_SHORT_NAME';\n" - + "}"); + """ + function main() { \s + return (contextMap != null && contextMap.get('TEST_CASE_SHORT_NAME') != null)\s + ? contextMap.get('TEST_CASE_SHORT_NAME') : 'Unknown TEST_CASE_SHORT_NAME'; + }\ + """); return macros; } diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/matcher/MatcherFactory.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/matcher/MatcherFactory.java index 2836985..e50078d 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/matcher/MatcherFactory.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/matcher/MatcherFactory.java @@ -87,12 +87,12 @@ public static Matcher isDate() { // Example: frowvtswvlelibsqlmdn public static Matcher isChars(int count) { - return new RegexMatcher(String.format("[a-z]{%d}", count)); + return new RegexMatcher("[a-z]{%d}".formatted(count)); } // Example: LENVTCOJPDZZBRCNNJWK public static Matcher isCharsUpperCase(int count) { - return new RegexMatcher(String.format("[A-Z]{%d}", count)); + return new RegexMatcher("[A-Z]{%d}".formatted(count)); } // Example: NaN diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/matcher/RegexMatcher.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/matcher/RegexMatcher.java index d996a8f..cdf9e88 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/matcher/RegexMatcher.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/model/tree/params/macros/matcher/RegexMatcher.java @@ -34,6 +34,6 @@ protected boolean matchesSafely(String s) { @Override public void describeTo(Description description) { - description.appendText(String.format("should matches regular expression: %s", regex)); + description.appendText("should matches regular expression: %s".formatted(regex)); } } diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/service/JpaDataSetListServiceImplTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/service/JpaDataSetListServiceImplTest.java index fa20ba4..51ba49c 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/service/JpaDataSetListServiceImplTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/service/JpaDataSetListServiceImplTest.java @@ -30,7 +30,6 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.extension.ExtendWith; import org.qubership.atp.dataset.config.TestConfiguration; import org.qubership.atp.dataset.service.jpa.delegates.DataSetList; import org.qubership.atp.dataset.service.jpa.model.dsllazyload.referencedcontext.RefDataSetListFlat; @@ -40,7 +39,6 @@ import org.springframework.data.domain.Pageable; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.jdbc.Sql; -import org.springframework.test.context.junit.jupiter.SpringExtension; import lombok.AllArgsConstructor; import lombok.Data; @@ -49,7 +47,6 @@ @Disabled @SpringBootTest @ContextConfiguration(classes = {TestConfiguration.class}) -@ExtendWith(SpringExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) class JpaDataSetListServiceImplTest extends AbstractJpaTest { diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/service/JpaIntegrationTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/service/JpaIntegrationTest.java index 44bda4c..1cf2092 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/service/JpaIntegrationTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/service/JpaIntegrationTest.java @@ -28,14 +28,13 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.jdbc.Sql; -import org.springframework.test.context.junit.jupiter.SpringExtension; - +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import com.fasterxml.jackson.databind.ObjectMapper; import org.qubership.atp.dataset.config.TestConfiguration; import org.qubership.atp.dataset.service.jpa.ContextType; @@ -49,16 +48,16 @@ import org.qubership.atp.macros.core.clients.api.dto.macros.MacrosDto; @Disabled +@ExtendWith(MockitoExtension.class) @SpringBootTest -@ContextConfiguration(classes = {TestConfiguration.class}) -@ExtendWith(SpringExtension.class) +@SpringJUnitConfig(classes = {TestConfiguration.class}) @TestPropertySource(properties = {"atp-dataset.javers.enabled=false"}) public class JpaIntegrationTest extends AbstractJpaTest { @Mock MacrosDto macrosDto; - private String EXPECTED_ATP_EVALUATED_CONTEXT = + private final String EXPECTED_ATP_EVALUATED_CONTEXT = "{\"parameters\":{\"Attr 1\":{\"type\":\"TEXT\"},\"Attr 2\":{\"type\":\"TEXT\"," + "\"value\":\"32OK_MACRO_VALUE\"},\"Attr list 1\":{\"type\":\"LIST\",\"value\":\"Value 2\"}}," + "\"groups\":{\"DSL reference\":{\"type\":\"DSL\",\"value\":\"Test DataSet2 2\",\"dsl\":\"Test " @@ -69,7 +68,7 @@ public class JpaIntegrationTest extends AbstractJpaTest { + "\"parameters\":{\"Attr3 1\":{\"type\":\"TEXT\"},\"Attr3 2\":{\"type\":\"TEXT\"," + "\"value\":\"Some value3 4\"}},\"dataSetId\":\"b893b683-0b17-4f76-a96f-c997af88f7b2\"}}," + "\"dataSetId\":\"96ba075a-1436-488a-90a0-30b3d58584f9\"}}}"; - private String EXPECTED_ATP_UNEVALUATED_CONTEXT = + private final String EXPECTED_ATP_UNEVALUATED_CONTEXT = "{\"parameters\":{\"Attr 1\":{\"type\":\"TEXT\"},\"Attr 2\":{\"type\":\"TEXT\"," + "\"value\":\"32OK_MACRO_VALUE\"},\"Attr list 1\":{\"type\":\"LIST\"," + "\"value\":\"Value 2\"}},\"groups\":{\"DSL reference\":{\"type\":\"DSL\",\"value\":\"Test " @@ -80,49 +79,49 @@ public class JpaIntegrationTest extends AbstractJpaTest { + "\"parameters\":{\"Attr3 1\":{\"type\":\"TEXT\"},\"Attr3 2\":{\"type\":\"TEXT\"," + "\"value\":\"Some value3 4\"}},\"dataSetId\":\"b893b683-0b17-4f76-a96f-c997af88f7b2\"}}," + "\"dataSetId\":\"96ba075a-1436-488a-90a0-30b3d58584f9\"}}}"; - private String EXPECTED_ITF_CONTEXT = + private final String EXPECTED_ITF_CONTEXT = "{\"Attr 1\":\"\",\"Attr 2\":\"32OK_MACRO_VALUE\",\"Attr list 1\":\"Value 2\",\"DSL reference\":{\"Attr2 " + " 1\":\"32OK_MACRO_VALUE\",\"Attr2 2\":\"Some overlap value\",\"Attr2 list 1\":\"Value2 2\"," + "\"DSL reference 2\":{\"Attr3 1\":\"\",\"Attr3 2\":\"Some value3 4\"}}}"; - private String FULL_ATP_EXPECTED_RESULT = + private final String FULL_ATP_EXPECTED_RESULT = "{\"parameters\":{\"Some text 1\":{\"type\":\"TEXT\",\"value\":\"32OK_MACRO_VALUE\"},\"Some text " + "2\":{\"type\":\"TEXT\",\"value\":\"Val2\"}},\"groups\":{\"DSL reference\":{\"type\":\"DSL\"," + "\"dsl\":\"Child DSL\",\"parameters\":{\"Some var 1\":{\"type\":\"TEXT\"},\"Some var " + "2\":{\"type\":\"TEXT\",\"value\":\"Some overlap value\"}}}}}"; - private String OBJECT_ATP_EXPECTED_RESULT = + private final String OBJECT_ATP_EXPECTED_RESULT = "{\"parameters\":{\"Some text 1\":{\"type\":\"TEXT\",\"value\":\"32OK_MACRO_VALUE\"},\"Some text " + "2\":{\"type\":\"TEXT\",\"value\":\"Val2\"}},\"groups\":{\"DSL reference\":{\"type\":\"DSL\"," + "\"dsl\":\"Child DSL\"}}}"; - private String OPTIMIZED_ATP_EXPECTED_RESULT = + private final String OPTIMIZED_ATP_EXPECTED_RESULT = "{\"parameters\":{\"Some text 1\":{\"type\":\"TEXT\",\"value\":\"32OK_MACRO_VALUE\"},\"Some text " + "2\":{\"type\":\"TEXT\",\"value\":\"Val2\"}},\"groups\":{\"DSL reference\":{\"type\":\"DSL\"," + "\"dsl\":\"Child DSL\",\"parameters\":{\"Some var 2\":{\"type\":\"TEXT\",\"value\":\"Some " + "overlap value\"}}}}}"; - private String OBJECT_EXTENDED_ATP_EXPECTED_RESULT = + private final String OBJECT_EXTENDED_ATP_EXPECTED_RESULT = "{\"parameters\":{\"Some text 1\":{\"type\":\"TEXT\",\"value\":\"32OK_MACRO_VALUE\"},\"Some text " + "2\":{\"type\":\"TEXT\",\"value\":\"Val2\"}},\"groups\":{\"DSL reference\":{\"type\":\"DSL\"," + "\"dsl\":\"Child DSL\",\"parameters\":{\"Some var 2\":{\"type\":\"TEXT\",\"value\":\"Some " + "overlap value\"}}}}}"; - private static UUID dataSetToCheck = UUID.fromString("f05b4368-a1ff-41f6-bf8f-9c7f0f139e1c"); - private static UUID sourceAttributeEncNoParameterId = UUID.fromString("89520827-8daf-4f3a-ba05-d1369b63e636"); - - private UUID visibilityAreaId = UUID.fromString("f261ed65-a491-44b0-af38-f0d97a46008c"); - private UUID sourceDsId = UUID.fromString("336e0cc9-dee2-458c-887e-bcdc406ae4be"); - private UUID sourceAttributeTextId = UUID.fromString("2e70a5cf-815a-40ee-b258-90a1b05f709b"); - private UUID sourceAttributeListId = UUID.fromString("36f8ff3d-3291-4274-bbee-5a468db5f7d2"); - private UUID sourceAttributeDslId = UUID.fromString("9923d9ec-81b8-4dca-b762-f663ed24595b"); - private UUID sourceAttributeChangeId = UUID.fromString("4079aab2-3d5e-4d86-9217-f66524808ec3"); - private UUID sourceAttributeEncId = UUID.fromString("81a84637-62a4-4d8b-8159-a6aeb20e52f5"); - private UUID sourceAttributeTextNoParameterId = UUID.fromString("6871e447-2f61-4fd7-ae4c-dc26aebdc607"); - private UUID sourceAttributeListNoParameterId = UUID.fromString("575e88a0-f83d-48d6-bf3a-adfda05d00f4"); - private UUID sourceAttributeDslNoParameterId = UUID.fromString("132eadd7-4f7e-4fe3-91b8-e36a5e36b672"); - private UUID sourceAttributeChangeNoParameterId = UUID.fromString("062276b4-29a6-48a5-8348-af3a1165fcd8"); - private UUID dataSetToCheckContextTypes = UUID.fromString("fe703972-1b4b-41d5-837b-ab3824de5269"); + private static final UUID dataSetToCheck = UUID.fromString("f05b4368-a1ff-41f6-bf8f-9c7f0f139e1c"); + private static final UUID sourceAttributeEncNoParameterId = UUID.fromString("89520827-8daf-4f3a-ba05-d1369b63e636"); + + private final UUID visibilityAreaId = UUID.fromString("f261ed65-a491-44b0-af38-f0d97a46008c"); + private final UUID sourceDsId = UUID.fromString("336e0cc9-dee2-458c-887e-bcdc406ae4be"); + private final UUID sourceAttributeTextId = UUID.fromString("2e70a5cf-815a-40ee-b258-90a1b05f709b"); + private final UUID sourceAttributeListId = UUID.fromString("36f8ff3d-3291-4274-bbee-5a468db5f7d2"); + private final UUID sourceAttributeDslId = UUID.fromString("9923d9ec-81b8-4dca-b762-f663ed24595b"); + private final UUID sourceAttributeChangeId = UUID.fromString("4079aab2-3d5e-4d86-9217-f66524808ec3"); + private final UUID sourceAttributeEncId = UUID.fromString("81a84637-62a4-4d8b-8159-a6aeb20e52f5"); + private final UUID sourceAttributeTextNoParameterId = UUID.fromString("6871e447-2f61-4fd7-ae4c-dc26aebdc607"); + private final UUID sourceAttributeListNoParameterId = UUID.fromString("575e88a0-f83d-48d6-bf3a-adfda05d00f4"); + private final UUID sourceAttributeDslNoParameterId = UUID.fromString("132eadd7-4f7e-4fe3-91b8-e36a5e36b672"); + private final UUID sourceAttributeChangeNoParameterId = UUID.fromString("062276b4-29a6-48a5-8348-af3a1165fcd8"); + private final UUID dataSetToCheckContextTypes = UUID.fromString("fe703972-1b4b-41d5-837b-ab3824de5269"); @BeforeEach - public void generateData() throws Exception { + public void generateData() { when(scriptMacrosCalculator.calculate(any(), any(), any())).thenReturn("OK_MACRO_VALUE"); when(macrosFeignClient.findAllByProject(any(UUID.class))) .thenReturn(new ResponseEntity<>(Collections.singletonList(macrosDto), HttpStatus.OK)); @@ -171,7 +170,7 @@ public void checkAtpContextUnevaluated_resultMatches() throws Exception { @Test @Sql(scripts = "classpath:test_data/sql/jpa_integration_test/JpaIntegrationTest.sql") - public void checkItfContextEvaluated_resultMatches() throws Exception { + public void checkItfContextEvaluated_resultMatches() { String result = dataSetService.getDataSetTreeInItfFormat(dataSetToCheck); Assertions.assertEquals(EXPECTED_ITF_CONTEXT, result); } @@ -261,7 +260,7 @@ public void copyDsAttributeValue_withAllValues() throws Exception { @Test @Sql(scripts = "classpath:test_data/sql/jpa_integration_test/JpaIntegrationTest.sql") - public void copyDsAttributeValue_withAllValuesDiffTypes() throws Exception { + public void copyDsAttributeValue_withAllValuesDiffTypes() { // given DataSetList targetDslAllParametersDiffTypes = dataSetListService.create("TargetDsl2", visibilityAreaId); UUID targetDslId = targetDslAllParametersDiffTypes.getId(); @@ -358,7 +357,7 @@ public void copyDsAttributeValue_withAllValuesDiffTypes() throws Exception { @Test @Sql(scripts = "classpath:test_data/sql/jpa_integration_test/JpaIntegrationTest.sql") - public void copyDsAttributeValue_noTargetParameters_parametersShouldBeCreated() throws Exception { + public void copyDsAttributeValue_noTargetParameters_parametersShouldBeCreated() { // given DataSetList targetDslOnlyAttributes = dataSetListService.create("TargetDsl3", visibilityAreaId); UUID targetDslId = targetDslOnlyAttributes.getId(); @@ -422,7 +421,7 @@ public void copyDsAttributeValue_noTargetParameters_parametersShouldBeCreated() @Test @Sql(scripts = "classpath:test_data/sql/jpa_integration_test/JpaIntegrationTest.sql") - public void copyDsAttributeValue_noTargetAttributes() throws Exception { + public void copyDsAttributeValue_noTargetAttributes() { // given DataSetList targetDslNoAttributes = dataSetListService.create("TargetDsl4", visibilityAreaId); UUID targetDslId = targetDslNoAttributes.getId(); diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/service/JpaParameterServiceImplTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/service/JpaParameterServiceImplTest.java index 6f880ba..777f39c 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/service/JpaParameterServiceImplTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/service/JpaParameterServiceImplTest.java @@ -27,41 +27,36 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; +import org.qubership.atp.dataset.config.TestConfiguration; +import org.qubership.atp.dataset.service.direct.impl.ClearCacheServiceImpl; +import org.qubership.atp.dataset.service.jpa.delegates.Parameter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.jdbc.Sql; -import org.springframework.test.context.junit.jupiter.SpringExtension; - -import org.qubership.atp.dataset.config.TestConfiguration; -import org.qubership.atp.dataset.service.direct.impl.ClearCacheServiceImpl; -import org.qubership.atp.dataset.service.jpa.DataSetServiceException; -import org.qubership.atp.dataset.service.jpa.delegates.Parameter; //@Isolated @Disabled @SpringBootTest @ContextConfiguration(classes = {TestConfiguration.class}) -@ExtendWith(SpringExtension.class) @TestPropertySource(properties = {"atp-dataset.javers.enabled=false"}) public class JpaParameterServiceImplTest extends AbstractJpaTest { @Autowired ClearCacheServiceImpl clearCacheService; - private UUID visibilityAreaId = UUID.fromString("c904edfc-310d-4b01-8af2-5cc4f1d86fcd"); - private UUID dataSetList1 = UUID.fromString("b8444ae9-bb06-47b6-a895-eedd5f2f4f60"); - private UUID dataSet11 = UUID.fromString("2f27efc6-bfa0-4a00-9064-f20cb2afb3b8"); - private UUID dataSet12 = UUID.fromString("18a8b8db-4c8b-41a8-af5e-ca366dc99f91"); - private UUID attribute11 = UUID.fromString("beb2484b-fb54-44dd-84fd-d759329c163b"); - private UUID attribute12 = UUID.fromString("08582328-90b8-49c7-9ab8-e676e8b896f8"); - private UUID parameter1ds1 = UUID.fromString("4cfd2426-ad08-4d02-8501-dbcb83ce6825"); - private UUID parameter2ds2 = UUID.fromString("ccedbecc-deb6-456e-9b30-ae77ddfde157"); + private final UUID visibilityAreaId = UUID.fromString("c904edfc-310d-4b01-8af2-5cc4f1d86fcd"); + private final UUID dataSetList1 = UUID.fromString("b8444ae9-bb06-47b6-a895-eedd5f2f4f60"); + private final UUID dataSet11 = UUID.fromString("2f27efc6-bfa0-4a00-9064-f20cb2afb3b8"); + private final UUID dataSet12 = UUID.fromString("18a8b8db-4c8b-41a8-af5e-ca366dc99f91"); + private final UUID attribute11 = UUID.fromString("beb2484b-fb54-44dd-84fd-d759329c163b"); + private final UUID attribute12 = UUID.fromString("08582328-90b8-49c7-9ab8-e676e8b896f8"); + private final UUID parameter1ds1 = UUID.fromString("4cfd2426-ad08-4d02-8501-dbcb83ce6825"); + private final UUID parameter2ds2 = UUID.fromString("ccedbecc-deb6-456e-9b30-ae77ddfde157"); @BeforeEach - public void clearCache() throws InterruptedException { + public void clearCache() { List parameters = Arrays.asList(UUID.fromString("4cfd2426-ad08-4d02-8501-dbcb83ce6825"), UUID.fromString("57a9e15e-0cdb-4b85-ba17-d70812b0b1df"), UUID.fromString("210fb6ac-08dc-4e47-bfd7-2ae980bcf586"), @@ -73,7 +68,7 @@ public void clearCache() throws InterruptedException { @Test() @Sql(scripts = "classpath:test_data/sql/jpa_parameter_service_impl_test/JpaParameterServceImplTest.sql") - public void bulkUpdateValues_datasetLockedTrue_NotUpdateValuesThrowException() throws DataSetServiceException { + public void bulkUpdateValues_datasetLockedTrue_NotUpdateValuesThrowException() { dataSetService.lock(dataSetList1, Collections.singletonList(dataSet11), true); String updateValue = "txtUpdateValue"; @@ -88,7 +83,7 @@ public void bulkUpdateValues_datasetLockedTrue_NotUpdateValuesThrowException() t @Test() @Sql(scripts = "classpath:test_data/sql/jpa_parameter_service_impl_test/JpaParameterServceImplTest.sql") - public void bulkUpdateValues_datasetLockFalse_UpdateValuesSuccessfully() throws DataSetServiceException { + public void bulkUpdateValues_datasetLockFalse_UpdateValuesSuccessfully() { String updateValue = "txtUpdateValue"; Assertions.assertDoesNotThrow(() -> @@ -101,7 +96,7 @@ public void bulkUpdateValues_datasetLockFalse_UpdateValuesSuccessfully() throws @Test() @Sql(scripts = "classpath:test_data/sql/jpa_parameter_service_impl_test/JpaParameterServceImplTest.sql") - public void createParameter_datasetLockedTrue_NotCreatParameterThrowException() throws DataSetServiceException { + public void createParameter_datasetLockedTrue_NotCreatParameterThrowException() { dataSetService.lock(dataSetList1, Collections.singletonList(dataSet12), true); String newValue = "New text value"; @@ -115,7 +110,7 @@ public void createParameter_datasetLockedTrue_NotCreatParameterThrowException() @Test() @Sql(scripts = "classpath:test_data/sql/jpa_parameter_service_impl_test/JpaParameterServceImplTest.sql") - public void createParameter_datasetLockedFalse_CreatTextParameterSuccessfully() throws DataSetServiceException { + public void createParameter_datasetLockedFalse_CreatTextParameterSuccessfully() { String newValue = "New text value"; Parameter parameter = parameterService.createParameter(dataSet12, attribute12, diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/service/JpaVisibilityAreaServiceTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/service/JpaVisibilityAreaServiceTest.java index 9a291f4..83e1ef0 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/service/JpaVisibilityAreaServiceTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/service/JpaVisibilityAreaServiceTest.java @@ -22,20 +22,16 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit.jupiter.SpringExtension; - import org.qubership.atp.dataset.config.TestConfiguration; import org.qubership.atp.dataset.exception.visibilityarea.VisibilityAreaNameException; import org.qubership.atp.dataset.service.jpa.model.VisibilityAreaFlatModel; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ContextConfiguration; //@Isolated @Disabled @SpringBootTest @ContextConfiguration(classes = {TestConfiguration.class}) -@ExtendWith(SpringExtension.class) public class JpaVisibilityAreaServiceTest extends AbstractJpaTest { @Test @@ -53,16 +49,16 @@ public void getAllAreas_notNullNotEmpty() { } @Test - public void createWithName_correctName_uuidNotNull() throws Exception { + public void createWithName_correctName_uuidNotNull() { String testName = "test name"; UUID withName = visibilityAreaService.getOrCreateWithName(testName); Assertions.assertNotNull(withName); VisibilityAreaFlatModel visibilityArea = visibilityAreaService.getFlatById(withName); - Assertions.assertEquals(visibilityArea.getName(), testName); + Assertions.assertEquals(testName, visibilityArea.getName()); } @Test - public void createWithName_twiceSameName_returnsExisting() throws Exception { + public void createWithName_twiceSameName_returnsExisting() { String testName = "test name"; UUID firstTry = visibilityAreaService.getOrCreateWithName(testName); UUID secondTry = visibilityAreaService.getOrCreateWithName(testName); @@ -71,49 +67,41 @@ public void createWithName_twiceSameName_returnsExisting() throws Exception { @Test public void createWithName_null_throwsException() { - Assertions.assertThrows(VisibilityAreaNameException.class, ()-> { - visibilityAreaService.getOrCreateWithName(null); - }); + Assertions.assertThrows(VisibilityAreaNameException.class, ()-> visibilityAreaService.getOrCreateWithName(null)); } @Test - public void createWithName_empty_throwsException() throws Exception { - Assertions.assertThrows(VisibilityAreaNameException.class, ()-> { - visibilityAreaService.getOrCreateWithName(""); - }); + public void createWithName_empty_throwsException() { + Assertions.assertThrows(VisibilityAreaNameException.class, ()-> visibilityAreaService.getOrCreateWithName("")); } @Test - public void setName_correct_nameSet() throws Exception { + public void setName_correct_nameSet() { UUID visibilityAreaId = visibilityAreaService.getOrCreateWithName("test1 correct"); String newName = "new name correct"; visibilityAreaService.setName(visibilityAreaId, newName); VisibilityAreaFlatModel visibilityArea = visibilityAreaService.getFlatById(visibilityAreaId); - Assertions.assertEquals(visibilityArea.getName(), newName); + Assertions.assertEquals(newName, visibilityArea.getName()); } @Test - public void setName_null_throwsException() throws Exception { + public void setName_null_throwsException() { UUID visibilityAreaId = visibilityAreaService.getOrCreateWithName("test2 name"); - Assertions.assertThrows(VisibilityAreaNameException.class, ()-> { - visibilityAreaService.setName(visibilityAreaId,null); - }); + Assertions.assertThrows(VisibilityAreaNameException.class, ()-> visibilityAreaService.setName(visibilityAreaId,null)); } @Test - public void setName_empty_throwsException() throws Exception { + public void setName_empty_throwsException() { UUID visibilityAreaId = visibilityAreaService.getOrCreateWithName("test3 removed"); - Assertions.assertThrows(VisibilityAreaNameException.class, ()-> { - visibilityAreaService.setName(visibilityAreaId,""); - }); + Assertions.assertThrows(VisibilityAreaNameException.class, ()-> visibilityAreaService.setName(visibilityAreaId,"")); } @Test - public void delete_returnNullWhenSelectByIdAfterDelete() throws Exception { + public void delete_returnNullWhenSelectByIdAfterDelete() { VisibilityAreaFlatModel result = visibilityAreaService.getFlatById(UUID.randomUUID()); Assertions.assertNull(result); } diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/service/versioning/VersioningRestoreTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/service/versioning/VersioningRestoreTest.java index fce3cc0..030f1a1 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/service/versioning/VersioningRestoreTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/jpa/service/versioning/VersioningRestoreTest.java @@ -26,13 +26,11 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.parallel.Isolated; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.jdbc.Sql; -import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.transaction.annotation.Transactional; import com.fasterxml.jackson.core.JsonProcessingException; @@ -52,7 +50,6 @@ @Isolated @SpringBootTest @ContextConfiguration(classes = {TestConfiguration.class}) -@ExtendWith(SpringExtension.class) public class VersioningRestoreTest extends AbstractJpaTest { @Autowired protected DataSetListService queryDslDataSetListService; @@ -75,7 +72,7 @@ public class VersioningRestoreTest extends AbstractJpaTest { @Test @Sql(scripts = "classpath:test_data/sql/version_restore_test/versionRestorTest.sql") - public void createHistoryItem_lockDataSet_newFilledRowInHistory() throws Exception { + public void createHistoryItem_lockDataSet_newFilledRowInHistory() { int initialRevision = getCurrentRevision(rootDataSetListId); // Lock DataSet @@ -95,7 +92,7 @@ public void createHistoryItem_lockDataSet_newFilledRowInHistory() throws Excepti @Test @Sql(scripts = "classpath:test_data/sql/version_restore_test/versionRestorTest.sql") - public void restore_RestoreWithLockedDataSet_Exception() throws Exception { + public void restore_RestoreWithLockedDataSet_Exception() { //Original data int initialRevision = getCurrentRevision(rootDataSetListId); // Lock DataSet @@ -116,7 +113,7 @@ public void restore_RestoreWithLockedDataSet_Exception() throws Exception { @Test @Sql(scripts = "classpath:test_data/sql/version_restore_test/versionRestorTest.sql") - public void rename_createHistoryItem_newFilledRowInHistory() throws Exception { + public void rename_createHistoryItem_newFilledRowInHistory() { //Original data int initialRevision = getCurrentRevision(rootDataSetListId); String dataSetNewName = "Data Set 1 new name"; @@ -131,8 +128,8 @@ public void rename_createHistoryItem_newFilledRowInHistory() throws Exception { HistoryItemResponseDto allHistory = historyService.getAllHistory(rootDataSetListId, 0, 50); HistoryItemDto item = allHistory.getHistoryItems().get(0); - Assertions.assertEquals(item.getOldValue(), "Data Set 1"); - Assertions.assertEquals(item.getNewValue(), dataSetNewName); + Assertions.assertEquals("Data Set 1", item.getOldValue()); + Assertions.assertEquals(dataSetNewName, item.getNewValue()); restore(initialRevision); } diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/rest/server/v2/ParameterControllerV2Test.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/rest/server/v2/ParameterControllerV2Test.java index d11b412..67f21c6 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/rest/server/v2/ParameterControllerV2Test.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/rest/server/v2/ParameterControllerV2Test.java @@ -16,7 +16,7 @@ package org.qubership.atp.dataset.service.rest.server.v2; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; import static org.qubership.atp.dataset.RegexpMatcher.matchesToRegExp; @@ -31,7 +31,6 @@ import org.hamcrest.core.StringContains; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.parallel.Isolated; import org.qubership.atp.dataset.config.TestConfiguration; import org.qubership.atp.dataset.model.api.ParameterRequest; @@ -43,7 +42,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.jdbc.Sql; -import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; import org.springframework.transaction.annotation.Transactional; @@ -53,7 +51,6 @@ @Isolated @SpringBootTest @ContextConfiguration(classes = {TestConfiguration.class}) -@ExtendWith(SpringExtension.class) @AutoConfigureMockMvc(addFilters = false) @TestPropertySource(properties = {"atp-dataset.javers.enabled=false"}) class ParameterControllerV2Test extends AbstractJpaTest { diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/ws/WebSocketHandlerTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/ws/WebSocketHandlerTest.java index be2802b..9897832 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/ws/WebSocketHandlerTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/ws/WebSocketHandlerTest.java @@ -24,7 +24,7 @@ import java.util.Collection; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -41,8 +41,8 @@ public class WebSocketHandlerTest { private EventHandler handler; private WebSocketSession webSocket; - private String sessionId = "sessionId"; - private String dslId = "dslId"; + private final String sessionId = "sessionId"; + private final String dslId = "dslId"; private Event event; @BeforeEach diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/AbstractIntegrationCase.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/AbstractIntegrationCase.java index e45de75..525946b 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/AbstractIntegrationCase.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/AbstractIntegrationCase.java @@ -21,19 +21,15 @@ import java.util.Properties; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.env.Environment; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit.jupiter.SpringExtension; - +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.qubership.atp.dataset.config.IntegrationTestConfiguration; import org.qubership.atp.dataset.config.MockJaversCommitEntityServiceConfiguration; import org.qubership.atp.dataset.service.AbstractTest; -@ExtendWith(SpringExtension.class) -@ContextConfiguration(classes = {IntegrationTestConfiguration.class, MockJaversCommitEntityServiceConfiguration.class}) +@SpringJUnitConfig(classes = {IntegrationTestConfiguration.class, MockJaversCommitEntityServiceConfiguration.class}) public class AbstractIntegrationCase extends AbstractTest { protected static String serverBaseUrl; diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/AbstractApiIntegrationCase.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/AbstractApiIntegrationCase.java index 668fc5c..d14a2ef 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/AbstractApiIntegrationCase.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/AbstractApiIntegrationCase.java @@ -21,9 +21,9 @@ import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; import org.glassfish.jersey.client.ClientProperties; import org.junit.jupiter.api.BeforeAll; diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/AttributeITCase.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/AttributeITCase.java index 54170fb..f50003a 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/AttributeITCase.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/AttributeITCase.java @@ -26,8 +26,8 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.MediaType; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Isolated; @@ -57,7 +57,7 @@ public void getEagerByParentId_getAttributeListByDslId_VerifyThatOnlyOneSqlSelec List attributesActual = baseUrl.path("/attribute/dsl").path(testData.ds.getDataSetList().getId().toString()) .request(MediaType.APPLICATION_JSON_TYPE) - .get(new GenericType>() { + .get(new GenericType<>() { }); Mockito.verify(queryFactory).select((Expression[]) any()); } @@ -69,7 +69,7 @@ public void getEagerByParentId_getAttributeListByDslId_CheckThatAttributesHasExp List attributesActual = baseUrl.path("/attribute/dsl").path(testData.ds.getDataSetList().getId().toString()) .request(MediaType.APPLICATION_JSON_TYPE) - .get(new GenericType>() { + .get(new GenericType<>() { }); List attributesExpected = getAttributePojosWithSortedListValues(testData); assertEquals(attributesExpected, attributesActual); diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/CopyDslITCase.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/CopyDslITCase.java index 278862f..06fa86c 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/CopyDslITCase.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/CopyDslITCase.java @@ -21,8 +21,8 @@ import java.util.UUID; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/CreateDslITCase.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/CreateDslITCase.java index 470c0d9..cfa66b8 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/CreateDslITCase.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/CreateDslITCase.java @@ -21,8 +21,8 @@ import java.util.UUID; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/GetByLabelITCase.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/GetByLabelITCase.java index d35c7fa..a023ed5 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/GetByLabelITCase.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/GetByLabelITCase.java @@ -23,9 +23,9 @@ import java.util.List; import java.util.function.Supplier; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Isolated; diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/JsonViewITCase.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/JsonViewITCase.java index 7a5578b..034e817 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/JsonViewITCase.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/JsonViewITCase.java @@ -24,9 +24,9 @@ import java.util.List; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.json.JSONException; import org.junit.jupiter.api.BeforeEach; diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/ListValuePojo.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/ListValuePojo.java index df347fe..5c007f5 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/ListValuePojo.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/ListValuePojo.java @@ -20,7 +20,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.qubership.atp.dataset.model.Identified; import org.qubership.atp.dataset.model.ListValue; diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/RestClientConfig.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/RestClientConfig.java index 5fa9096..d14d1ec 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/RestClientConfig.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ui/api/RestClientConfig.java @@ -21,16 +21,15 @@ import java.security.NoSuchAlgorithmException; import javax.net.ssl.SSLContext; - -import org.apache.http.config.Registry; -import org.apache.http.config.RegistryBuilder; -import org.apache.http.conn.socket.ConnectionSocketFactory; -import org.apache.http.conn.socket.PlainConnectionSocketFactory; -import org.apache.http.conn.ssl.NoopHostnameVerifier; -import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.conn.ssl.TrustSelfSignedStrategy; -import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; -import org.apache.http.ssl.SSLContexts; +import org.apache.hc.client5.http.ssl.NoopHostnameVerifier; +import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory; +import org.apache.hc.client5.http.ssl.TrustSelfSignedStrategy; +import org.apache.hc.core5.http.config.Registry; +import org.apache.hc.core5.http.config.RegistryBuilder; +import org.apache.hc.client5.http.socket.ConnectionSocketFactory; +import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory; +import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; +import org.apache.hc.core5.ssl.SSLContexts; import org.glassfish.jersey.apache.connector.ApacheClientProperties; import org.glassfish.jersey.apache.connector.ApacheConnectorProvider; import org.glassfish.jersey.client.ClientConfig; diff --git a/deployments/charts/atp-datasets/templates/_helpers.tpl b/deployments/charts/atp-datasets/templates/_helpers.tpl index 703bc78..a36f817 100644 --- a/deployments/charts/atp-datasets/templates/_helpers.tpl +++ b/deployments/charts/atp-datasets/templates/_helpers.tpl @@ -135,7 +135,7 @@ REMOTE_DUMP_PORT: "{{ .Values.REMOTE_DUMP_PORT }}" SERVICE_ENTITIES_MIGRATION_ENABLED: "{{ .Values.SERVICE_ENTITIES_MIGRATION_ENABLED }}" SERVICE_NAME: "{{ .Values.SERVICE_NAME }}" SERVICE_REGISTRY_URL: "{{ .Values.SERVICE_REGISTRY_URL }}" -SPRING_PROFILES: "{{ .Values.SPRING_PROFILES }}" +ACTIVE_PROFILES_SPRING: "{{ .Values.ACTIVE_PROFILES_SPRING }}" SWAGGER_ENABLED: "{{ .Values.SWAGGER_ENABLED }}" VAULT_ENABLE: "{{ .Values.VAULT_ENABLE}}" VAULT_NAMESPACE: "{{ .Values.VAULT_NAMESPACE}}" diff --git a/deployments/charts/atp-datasets/values.yaml b/deployments/charts/atp-datasets/values.yaml index 6c3047c..5031c7e 100644 --- a/deployments/charts/atp-datasets/values.yaml +++ b/deployments/charts/atp-datasets/values.yaml @@ -130,7 +130,7 @@ SERVICE_REGISTRY_URL: "http://atp-registry-service:8761/eureka" # Set to ATP2 to enable Prometheus scrapping SERVICE_TYPE: "ATP2" # Spring profile for security -SPRING_PROFILES: "disable-security" +ACTIVE_PROFILES_SPRING: "disable-security" # Vault service URL, required when ENCRYPT = vault # Variable "VAULT_URL" was never used ZIPKIN_ENABLE: "false" diff --git a/parent/parent-dependencies/pom.xml b/parent/parent-dependencies/pom.xml index bbfb733..bee6108 100644 --- a/parent/parent-dependencies/pom.xml +++ b/parent/parent-dependencies/pom.xml @@ -14,17 +14,17 @@ pom - 2.7.18 - 2021.0.8 + 3.3.13 + 2023.0.6 6.8.2 - 1.2.80 + 2.0.1-SNAPSHOT 0.2.46 1.0.33 - 0.0.47 - 0.0.24 - 0.2.42 + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT 0.0.9 5.0.0 @@ -33,12 +33,12 @@ 1.0.0_modified.2 4.1.0 4.14.0 - 2.34 + 3.1.11 2.15.2 4.2.6 1.5.5.Final - 1.18.30 - 2.2.39.Final + 1.18.42 + 2.3.21.Final @@ -88,22 +88,22 @@ org.springframework.security spring-security-web - 5.7.13 + 6.3.10 org.springframework.security spring-security-core - 5.7.13 + 6.3.10 org.springframework.kafka spring-kafka - 2.9.11 + 3.0.17 org.springframework spring-web - 5.3.34 + 6.1.21 @@ -181,6 +181,22 @@ error_prone_annotations com.google.errorprone + + org.bouncycastle + bcprov-jdk15to18 + + + org.bouncycastle + bcpkix-jdk15to18 + + + org.bouncycastle + bcprov-jdk18on + + + org.bouncycastle + bcpkix-jdk18on + @@ -232,6 +248,22 @@ error_prone_annotations com.google.errorprone + + org.bouncycastle + bcprov-jdk15to18 + + + org.bouncycastle + bcpkix-jdk15to18 + + + org.bouncycastle + bcprov-jdk18on + + + org.bouncycastle + bcpkix-jdk18on + @@ -248,7 +280,7 @@ org.mockito mockito-core - 3.12.4 + 5.22.0 test @@ -364,11 +396,6 @@ joda-time 2.9.9 - - org.liquibase - liquibase-core - ${liquibase.version} - org.postgresql postgresql @@ -377,7 +404,7 @@ org.springframework spring-test - 5.3.8 + 6.1.21 test @@ -430,7 +457,7 @@ org.glassfish.jersey.core jersey-client - 2.34 + 3.1.11 test @@ -456,12 +483,12 @@ jakarta.xml.bind jakarta.xml.bind-api - 2.3.3 + 3.0.1 jakarta.ws.rs jakarta.ws.rs-api - 2.1.6 + 3.1.0 com.thoughtworks.xstream @@ -489,19 +516,9 @@ 1.21 - commons-fileupload - commons-fileupload - 1.6.0 - - - ch.qos.logback - logback-core - 1.2.13 - - - ch.qos.logback - logback-classic - 1.2.13 + org.apache.commons + commons-fileupload2-jakarta-servlet5 + 2.0.0-M4 io.netty @@ -553,11 +570,6 @@ undertow-websockets-jsr ${undertow.version} - - org.apache.maven - maven-compat - 3.8.1 - io.netty netty-handler diff --git a/parent/parent-java/pom.xml b/parent/parent-java/pom.xml index c163a79..b49a574 100644 --- a/parent/parent-java/pom.xml +++ b/parent/parent-java/pom.xml @@ -26,11 +26,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.13.0 + 3.15.0 - ${targetJdk} - ${targetJdk} ${project.build.sourceEncoding} + ${java.version} @@ -86,7 +85,7 @@ maven-surefire-plugin - 2.22.0 + 3.1.2 -Dfile.encoding=${project.build.sourceEncoding} diff --git a/pom.xml b/pom.xml index ac15700..2ac6ad3 100644 --- a/pom.xml +++ b/pom.xml @@ -260,11 +260,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.13.0 + 3.15.0 - ${targetJdk} - ${targetJdk} ${project.build.sourceEncoding} + ${java.version} From 5d6fbe0badfa6c6d38bbfd43242d80453b8bc818 Mon Sep 17 00:00:00 2001 From: kagw95 Date: Thu, 5 Mar 2026 14:39:29 +0400 Subject: [PATCH 02/29] fix: Migration module is fixed: WebApplicationType.NONE type is set for the application, dependencies to spring-boot-starter-web and spring-boot-starter-undertow are removed. --- atp-dataset-migration/pom.xml | 36 ++----------------- .../atp/dataset/db/migration/Main.java | 10 +++--- 2 files changed, 9 insertions(+), 37 deletions(-) diff --git a/atp-dataset-migration/pom.xml b/atp-dataset-migration/pom.xml index 752c232..c221953 100644 --- a/atp-dataset-migration/pom.xml +++ b/atp-dataset-migration/pom.xml @@ -57,32 +57,6 @@ - - org.springframework.boot - spring-boot-starter-web - - - org.hibernate.validator - hibernate-validator - - - org.springframework.boot - spring-boot-starter-tomcat - - - tomcat-embed-core - org.apache.tomcat.embed - - - tomcat-embed-websocket - org.apache.tomcat.embed - - - - - org.springframework.boot - spring-boot-starter-undertow - org.springframework.boot spring-boot-starter @@ -304,11 +278,8 @@ maven-surefire-plugin - ${basedir}/target/test-basedir/config/ - - - ${basedir}/src/test/resources/test-data/atp-dataset-q-classes-generation-pg.jar - + ${basedir}/target/test-basedir/config/ + ${basedir}/src/test/resources/test-data/atp-dataset-q-classes-generation-pg.jar ${tests.argLine} @@ -321,8 +292,7 @@ DS DB Migration - ${project.version}-${svn.revision} - + ${project.version}-${svn.revision} diff --git a/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/Main.java b/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/Main.java index 1332112..b5002a8 100644 --- a/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/Main.java +++ b/atp-dataset-migration/src/main/java/org/qubership/atp/dataset/db/migration/Main.java @@ -1,5 +1,5 @@ /* - * # Copyright 2024-2025 NetCracker Technology Corporation + * # Copyright 2024-2026 NetCracker Technology Corporation * # * # Licensed under the Apache License, Version 2.0 (the "License"); * # you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import org.qubership.atp.dataset.db.migration.config.DbConfiguration; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration; +import org.springframework.boot.WebApplicationType; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -29,7 +29,7 @@ import liquibase.exception.LiquibaseException; import lombok.extern.slf4j.Slf4j; -@Import({DbConfiguration.class, ServletWebServerFactoryAutoConfiguration.class}) +@Import({DbConfiguration.class}) @Configuration @ComponentScan("org.qubership.atp.dataset.db.migration") @Slf4j @@ -42,7 +42,9 @@ public class Main { */ public static void main(String[] args) throws SQLException, LiquibaseException { log.info("Started migration runner in Main Migration module"); - ConfigurableApplicationContext configurableApplicationContext = SpringApplication.run(Main.class, args); + SpringApplication application = new SpringApplication(Main.class); + application.setWebApplicationType(WebApplicationType.NONE); + ConfigurableApplicationContext configurableApplicationContext = application.run(args); MigrationRunner migrationRunner = configurableApplicationContext.getBean(MigrationRunner.class); migrationRunner.runMigration(); } From 94c920dff820c4e2047a0a4df167573e881c74a9 Mon Sep 17 00:00:00 2001 From: kagw95 Date: Thu, 5 Mar 2026 15:43:55 +0400 Subject: [PATCH 03/29] fix: Java version is set to 21 in Maven and plugins configurations. org.openclover:clover-maven-plugin version is changed to 4.5.0. pom.xml files are cleansed. --- atp-dataset-benchmarks/pom.xml | 38 +++++----- atp-dataset-common/pom.xml | 10 +-- atp-dataset-distribution/pom.xml | 16 ++--- atp-dataset-import/pom.xml | 25 +++---- atp-dataset-migration/pom.xml | 33 +++++---- atp-dataset-q-classes-generation/pom.xml | 7 +- atp-dataset/pom.xml | 88 +++++++++++------------- parent/parent-dependencies/pom.xml | 68 +++++++++--------- parent/parent-java/pom.xml | 3 +- pom.xml | 5 +- 10 files changed, 137 insertions(+), 156 deletions(-) diff --git a/atp-dataset-benchmarks/pom.xml b/atp-dataset-benchmarks/pom.xml index e815ca4..cba6d12 100644 --- a/atp-dataset-benchmarks/pom.xml +++ b/atp-dataset-benchmarks/pom.xml @@ -26,7 +26,7 @@ - 1.8 + 21 com.hazelcast @@ -328,12 +323,12 @@ json-path test - - jakarta.ws.rs - jakarta.ws.rs-api - compile - 3.1.0 - + + jakarta.ws.rs + jakarta.ws.rs-api + compile + 3.1.0 + org.antlr antlr4-runtime @@ -346,12 +341,12 @@ org.qubership.atp atp-crypt - - - junit - junit - - + + + junit + junit + + org.springframework.cloud @@ -364,7 +359,7 @@ io.micrometer micrometer-tracing-bridge-brave - 1.0.12 + 1.0.12 org.javers @@ -406,15 +401,15 @@ swagger-annotations-jakarta 2.2.22 - - jakarta.inject - jakarta.inject-api - 2.0.1 - - - jakarta.servlet - jakarta.servlet-api - + + jakarta.inject + jakarta.inject-api + 2.0.1 + + + jakarta.servlet + jakarta.servlet-api + org.springframework.cloud spring-cloud-starter-vault-config @@ -458,11 +453,11 @@ json-smart test - - org.apache.httpcomponents.client5 - httpclient5 - test - + + org.apache.httpcomponents.client5 + httpclient5 + test + au.com.dius.pact.provider junit5 @@ -619,7 +614,7 @@ 0.2.0 - ${java.version} + ${java.version} @@ -629,8 +624,6 @@ compile - ${maven.compiler.source} - ${maven.compiler.target} ${project.build.directory}\generated-sources\antlr4 ${project.build.directory}\classes\ @@ -714,8 +707,7 @@ - - ${project.build.directory}/clover/classes + ${project.build.directory}/clover/classes true @@ -734,8 +726,7 @@ - - ${project.build.directory}/classes + ${project.build.directory}/classes true @@ -753,8 +744,7 @@ DS Service - ${project.version}-${svn.revision} - + ${project.version}-${svn.revision} @@ -787,10 +777,8 @@ maven-surefire-plugin - ${basedir}/target/test-basedir/config/ - - ${basedir}/src/test/resources/ - + ${basedir}/target/test-basedir/config/ + ${basedir}/src/test/resources/ ${tests.argLine} @@ -984,12 +972,15 @@ org.openclover clover-maven-plugin - 4.2.0 + 4.5.0 + 21 + 21 + 21 ${project.build.directory}/clover true true - true + false 47% @@ -1039,8 +1030,7 @@ - ${basedir}/target/test-basedir/config/ - + ${basedir}/target/test-basedir/config/ ${tests.argLine} diff --git a/parent/parent-dependencies/pom.xml b/parent/parent-dependencies/pom.xml index bee6108..eee1fbe 100644 --- a/parent/parent-dependencies/pom.xml +++ b/parent/parent-dependencies/pom.xml @@ -181,22 +181,22 @@ error_prone_annotations com.google.errorprone - - org.bouncycastle - bcprov-jdk15to18 - - - org.bouncycastle - bcpkix-jdk15to18 - - - org.bouncycastle - bcprov-jdk18on - - - org.bouncycastle - bcpkix-jdk18on - + + org.bouncycastle + bcprov-jdk15to18 + + + org.bouncycastle + bcpkix-jdk15to18 + + + org.bouncycastle + bcprov-jdk18on + + + org.bouncycastle + bcpkix-jdk18on + @@ -248,22 +248,22 @@ error_prone_annotations com.google.errorprone - - org.bouncycastle - bcprov-jdk15to18 - - - org.bouncycastle - bcpkix-jdk15to18 - - - org.bouncycastle - bcprov-jdk18on - - - org.bouncycastle - bcpkix-jdk18on - + + org.bouncycastle + bcprov-jdk15to18 + + + org.bouncycastle + bcpkix-jdk15to18 + + + org.bouncycastle + bcprov-jdk18on + + + org.bouncycastle + bcpkix-jdk18on + @@ -533,7 +533,7 @@ io.netty netty-codec-http2 - 4.1.124.Final + 4.1.125.Final org.yaml @@ -573,7 +573,7 @@ io.netty netty-handler - 4.1.118.Final + 4.1.125.Final org.apache.maven.shared diff --git a/parent/parent-java/pom.xml b/parent/parent-java/pom.xml index b49a574..42ada4f 100644 --- a/parent/parent-java/pom.xml +++ b/parent/parent-java/pom.xml @@ -16,7 +16,6 @@ UTF-8 UTF-8 UTF-8 - 1.8 local_build @@ -29,7 +28,7 @@ 3.15.0 ${project.build.sourceEncoding} - ${java.version} + ${java.version} diff --git a/pom.xml b/pom.xml index 2ac6ad3..3a30229 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,6 @@ 21 - 1.8 true UTF-8 @@ -49,7 +48,7 @@ scm:git:https//github.com/Netcracker/qubership-testing-platform-datasets.git scm:git:https://github.com/Netcracker/qubership-testing-platform-datasets.git - scm:git:https://github.com/Netcracker/qubership-testing-platform-datasets/tree/main + scm:git:https://github.com/Netcracker/qubership-testing-platform-datasets.git HEAD @@ -263,7 +262,7 @@ 3.15.0 ${project.build.sourceEncoding} - ${java.version} + ${java.version} From 47c7e151c28c6dc8e48303d711289a614ae452ac Mon Sep 17 00:00:00 2001 From: kagw95 Date: Thu, 5 Mar 2026 16:57:21 +0400 Subject: [PATCH 04/29] fix: Path to config files is fixed. --- README.md | 4 ++-- atp-dataset-migration/pom.xml | 2 +- atp-dataset/pom.xml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f22a50a..4a6323d 100644 --- a/README.md +++ b/README.md @@ -86,8 +86,8 @@ Datasets Service is used to store and manage test case data. 3. Main class: org.qubership.atp.dataset.Main 4. VM options: ````properties - -Dspring.config.location=target/config/application.properties - -Dspring.cloud.bootstrap.location=target/config/bootstrap.properties + -Dspring.config.location=file:./target/config/application.properties + -Dspring.cloud.bootstrap.location=file:./target/config/bootstrap.properties -Dlogging.level.org.qubership.atp.common.logging.interceptor.RestTemplateLogInterceptor=debug -Dlogging.level.org.qubership.atp.catalogue.service.client.feign.DatasetFeignClient=debug -Dds.logger.level=DEBUG diff --git a/atp-dataset-migration/pom.xml b/atp-dataset-migration/pom.xml index 3da2b94..10d2717 100644 --- a/atp-dataset-migration/pom.xml +++ b/atp-dataset-migration/pom.xml @@ -389,7 +389,7 @@ --add-opens=java.base/java.util=ALL-UNNAMED -classpath - -Dspring.config.location="target/config/application.properties" + -Dspring.config.location=file:./target/config/application.properties org.qubership.atp.dataset.db.migration.Main diff --git a/atp-dataset/pom.xml b/atp-dataset/pom.xml index 356afea..831d198 100644 --- a/atp-dataset/pom.xml +++ b/atp-dataset/pom.xml @@ -9,12 +9,12 @@ org.qubership.atp.dataset.db.generated - -Djavax.net.ssl.keyStore="target/test-basedir/config/keystore.p12" - -Djavax.net.ssl.keyStorePassword="123456" -Dgridfs.database=dsgridfs + -Djavax.net.ssl.keyStore=file:./target/test-basedir/config/keystore.p12 + -Djavax.net.ssl.keyStorePassword=123456 -Dgridfs.database=dsgridfs -Dgridfs.host=localhost -Dgridfs.port=27017 -Dgridfs.user=dsuser -Dgridfs.password=dspass - -Dspring.config.location="target/config/application.properties" - -Dspring.cloud.bootstrap.location="target/config/bootstrap.properties" + -Dspring.config.location=file:./target/config/application.properties + -Dspring.cloud.bootstrap.location=file:./target/config/bootstrap.properties -Djdbc.Url=${pg.jdbc.Url} -Djdbc.Driver=${pg.jdbc.Driver} -Djdbc.User=${pg.jdbc.User} From 6201a63de5d28ed903d744bc3f03683a4e44d8f0 Mon Sep 17 00:00:00 2001 From: kagw95 Date: Thu, 5 Mar 2026 17:01:06 +0400 Subject: [PATCH 05/29] fix: @MockitoSettings(strictness = Strictness.LENIENT) annotation is added to avoid mockito UnnecessaryStubbingException. --- .../atp/dataset/antlr4/TextParameterParserTest.java | 7 ++++--- .../atp/dataset/ei/DataSetExportExecutorTest.java | 9 ++++++--- .../atp/dataset/ei/service/DataSetsImporterTest.java | 3 +++ .../service/DatasetListImportServiceTest.java | 6 ++++-- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/antlr4/TextParameterParserTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/antlr4/TextParameterParserTest.java index 03cc223..a1640c6 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/antlr4/TextParameterParserTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/antlr4/TextParameterParserTest.java @@ -31,8 +31,9 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.qubership.atp.dataset.db.jpa.entities.DataSetListEntity; -import org.qubership.atp.dataset.service.jpa.DataSetServiceException; import org.qubership.atp.dataset.service.jpa.delegates.DataSetList; import org.qubership.atp.dataset.service.jpa.impl.macro.CachedDslMacroResultContainer; import org.qubership.atp.dataset.service.jpa.impl.macro.MacroContext; @@ -46,6 +47,7 @@ @ExtendWith(SpringExtension.class) @ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class TextParameterParserTest { private static MacroContext macroContext; public static String MACRO_RESULT = "MY TEXT"; @@ -100,8 +102,7 @@ public UUID getDataSetUuid(String dataSetName, UUID dataSetListId) { } @Override - public DataSetList getDataSetList(UUID visibilityAreaId, PathStep dataSetListPathStep) - throws DataSetServiceException { + public DataSetList getDataSetList(UUID visibilityAreaId, PathStep dataSetListPathStep) { DataSetListEntity dataSetListEntity = new DataSetListEntity(); dataSetListEntity.setId(DATA_SET_LIST_ID); return new DataSetList(dataSetListEntity); diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/DataSetExportExecutorTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/DataSetExportExecutorTest.java index a07a4a1..e1eec2a 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/DataSetExportExecutorTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/DataSetExportExecutorTest.java @@ -48,6 +48,8 @@ import org.mockito.Mockito; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.qubership.atp.dataset.db.GridFsRepository; import org.qubership.atp.dataset.db.jpa.entities.AttributeEntity; import org.qubership.atp.dataset.db.jpa.entities.DataSetEntity; @@ -76,6 +78,7 @@ @Isolated @ExtendWith(SpringExtension.class) @ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class DataSetExportExecutorTest { @Spy @@ -253,7 +256,7 @@ public void exportToFolder_convertToNttFormat() throws Exception { assertEquals(dsName, _dsName); } else if (s.startsWith("name=attribute 2;")) { String filePath = s.replace("name=attribute 2; description=; value=", ""); - String expectedFilePath = "./files/" + dslId.toString() + "/" + dsId.toString() + "/" + paramId.toString(); + String expectedFilePath = "./files/" + dslId + "/" + dsId + "/" + paramId.toString(); assertEquals(Path.of(filePath).toString(), Path.of(expectedFilePath).toString()); } else if (s.startsWith("name=attribute 1;")) { String value = s.replace("name=attribute 1; description=; value=", ""); @@ -312,7 +315,7 @@ public void expandExportScope_DsReferencedFromParamIsAndCorrespondingDslIsCollec Mockito.when(jpaDataSetRepository.findById(referencedDataSetId)).thenReturn(Optional.of(referencedDataSet)); Mockito.when(jpaDataSetRepository.findById(referencedDataSetId2)).thenReturn(Optional.of(referencedDataSet2)); - ParameterEntity parameterEntity = dataSet.getParameters().get(0); + ParameterEntity parameterEntity = dataSet.getParameters().getFirst(); parameterEntity.setDataSetReferenceId(referencedDataSetId); ParameterEntity ds2Param = new ParameterEntity(); @@ -354,7 +357,7 @@ public void expandExportScope_specificDsls_circlesShouldBeHandledProperly() { referencedDataSet.setName("ds2"); referencedDataSet.setParameters(new ArrayList<>()); - ParameterEntity parameterEntity = dataSet.getParameters().get(0); + ParameterEntity parameterEntity = dataSet.getParameters().getFirst(); parameterEntity.setDataSetReferenceId(referencedDataSetId); ParameterEntity ds2Param = new ParameterEntity(); diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetsImporterTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetsImporterTest.java index 3ccc210..6b0f223 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetsImporterTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetsImporterTest.java @@ -33,6 +33,8 @@ import org.junit.jupiter.api.parallel.Isolated; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.qubership.atp.dataset.service.direct.ClearCacheService; import org.qubership.atp.dataset.service.jpa.DataSetServiceException; import org.qubership.atp.dataset.service.jpa.JpaDataSetListService; @@ -49,6 +51,7 @@ @Isolated @ExtendWith(SpringExtension.class) @ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) @Slf4j public class DataSetsImporterTest { diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/importexport/service/DatasetListImportServiceTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/importexport/service/DatasetListImportServiceTest.java index f536158..9300fc7 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/importexport/service/DatasetListImportServiceTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/importexport/service/DatasetListImportServiceTest.java @@ -51,8 +51,6 @@ import java.util.UUID; import java.util.stream.Collectors; -import jakarta.persistence.EntityManager; - import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.openxml4j.opc.PackageAccess; @@ -66,6 +64,8 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.qubership.atp.dataset.db.jpa.ModelsProvider; import org.qubership.atp.dataset.db.jpa.Wrapper; import org.qubership.atp.dataset.db.jpa.entities.AttributeEntity; @@ -109,6 +109,7 @@ import org.springframework.test.util.ReflectionTestUtils; import com.google.common.collect.ImmutableMap; +import jakarta.persistence.EntityManager; /* DSL 2 DSL 3 DSL 4 * ------------------------------------------------------------------------------ @@ -172,6 +173,7 @@ @Isolated @ExtendWith(SpringExtension.class) @ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) @TestPropertySource(properties = {"atp-dataset.javers.enabled=false"}) public class DatasetListImportServiceTest { From f033e382b80abd6dd7e005b60efc357a831cec01 Mon Sep 17 00:00:00 2001 From: kagw95 Date: Tue, 10 Mar 2026 11:55:54 +0400 Subject: [PATCH 06/29] fix: antlr4-runtime and antlr4 plugin versions are set to 4.13.2, au.com.dius.pact.provider artifacts to 4.6.15, javers version to 7.9.0, kotlin to 1.9.25, jackson to 2.17.3, httpclient5 to 5.4.1, httpcore5 to 5.3.3, hibernate-core to 6.5.3.Final. Hibernate dialect is set to org.hibernate.dialect.PostgreSQLDialect. --- atp-dataset/pom.xml | 12 ++-- .../src/main/config/application.properties | 3 + .../dataset/config/ServiceConfiguration.java | 2 +- parent/parent-db-properties/pom.xml | 4 -- parent/parent-dependencies/pom.xml | 58 ++++++++++++++++--- 5 files changed, 60 insertions(+), 19 deletions(-) diff --git a/atp-dataset/pom.xml b/atp-dataset/pom.xml index 831d198..bc24083 100644 --- a/atp-dataset/pom.xml +++ b/atp-dataset/pom.xml @@ -332,7 +332,6 @@ org.antlr antlr4-runtime - 4.7 org.qubership.atp @@ -456,12 +455,15 @@ org.apache.httpcomponents.client5 httpclient5 - test + + + org.apache.httpcomponents.core5 + httpcore5 au.com.dius.pact.provider junit5 - 4.1.0 + 4.6.15 commons-io @@ -496,7 +498,7 @@ au.com.dius.pact.provider junit5spring - 4.1.0 + 4.6.15 org.hibernate.validator @@ -571,7 +573,7 @@ org.antlr antlr4-maven-plugin - 4.7 + 4.13.2 -package diff --git a/atp-dataset/src/main/config/application.properties b/atp-dataset/src/main/config/application.properties index 53bb777..0c5ad9d 100644 --- a/atp-dataset/src/main/config/application.properties +++ b/atp-dataset/src/main/config/application.properties @@ -163,3 +163,6 @@ spring.cache.hazelcast.client.enable=${HAZELCAST_ENABLE:false} spring.cache.hazelcast.server.enable=${HAZELCAST_SERVER_ENABLED:false} spring.cache.hazelcast.server.port=${HAZELCAST_SERVER_PORT:5701} spring.cache.hazelcast.server.address=${HAZELCAST_SERVER_ADDRESS:127.0.0.1} + +spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/config/ServiceConfiguration.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/config/ServiceConfiguration.java index 4385cb9..3cb166b 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/config/ServiceConfiguration.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/config/ServiceConfiguration.java @@ -134,7 +134,7 @@ public Validator localValidatorFactoryBean() { Properties additionalProperties() { Properties properties = new Properties(); properties.setProperty("hibernate.hbm2ddl.auto", "none"); - properties.setProperty("hibernate.dialect", "org.hibernate.dialect.PostgreSQL94Dialect"); + properties.setProperty("hibernate.dialect", "org.hibernate.dialect.PostgreSQLDialect"); properties.setProperty("hibernate.jdbc.lob.non_contextual_creation", "true"); properties.setProperty("hibernate.show_sql", "false"); //Set as 'true' to enable verbose query logging properties.setProperty("hibernate.format_sql", "false"); //Set as 'true' to enable pretty format diff --git a/parent/parent-db-properties/pom.xml b/parent/parent-db-properties/pom.xml index 42b3266..3a73daa 100644 --- a/parent/parent-db-properties/pom.xml +++ b/parent/parent-db-properties/pom.xml @@ -34,9 +34,5 @@ org.postgresql postgresql - - org.antlr - antlr4-runtime - diff --git a/parent/parent-dependencies/pom.xml b/parent/parent-dependencies/pom.xml index eee1fbe..67fb7c6 100644 --- a/parent/parent-dependencies/pom.xml +++ b/parent/parent-dependencies/pom.xml @@ -16,11 +16,12 @@ 3.3.13 2023.0.6 - 6.8.2 + 7.9.0 + 1.9.25 - 2.0.1-SNAPSHOT + 2.0.2-SNAPSHOT 0.2.46 - 1.0.33 + 2.0.0-SNAPSHOT 1.0.0-SNAPSHOT 1.0.0-SNAPSHOT @@ -34,7 +35,7 @@ 4.1.0 4.14.0 3.1.11 - 2.15.2 + 2.17.3 4.2.6 1.5.5.Final 1.18.42 @@ -43,6 +44,29 @@ + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + + + org.apache.httpcomponents.client5 + httpclient5 + 5.4.1 + + + org.apache.httpcomponents.core5 + httpcore5 + 5.3.3 + + + org.hibernate + hibernate-core + 6.5.3.Final + + org.assertj assertj-core @@ -52,7 +76,7 @@ org.jetbrains.kotlin kotlin-stdlib - 1.6.0 + ${kotlin.version} @@ -425,7 +449,17 @@ org.antlr antlr4-runtime - 4.7 + 4.13.2 + + + org.antlr + antlr4 + 4.13.2 + + + org.antlr + antlr-runtime + 3.5.3 net.javacrumbs.shedlock @@ -464,21 +498,27 @@ org.openapitools jackson-databind-nullable 0.2.6 + + + com.fasterxml.jackson.core + jackson-databind + + com.fasterxml.jackson.core jackson-databind - ${jackson.core.version} + ${jackson.version} com.fasterxml.jackson.core jackson-core - ${jackson.core.version} + ${jackson.version} com.fasterxml.jackson.core jackson-annotations - ${jackson.core.version} + ${jackson.version} jakarta.xml.bind From 29753cf60e243acbf0a4b906a42dc81f37511079 Mon Sep 17 00:00:00 2001 From: kagw95 Date: Tue, 10 Mar 2026 12:38:39 +0400 Subject: [PATCH 07/29] fix: Pact tests are fixed. Code is cleansed. --- .../rest/server/AttachmentController.java | 8 +- .../api/DatasetsAndCatalogContractTest.java | 43 +++++----- .../DatasetsAndItfExecutorContractTest.java | 46 ++++++---- .../api/DatasetsAndItfStubsContractTest.java | 35 +++++--- .../DatasetsAndOrchestratorContractTest.java | 50 ++++++----- .../api/DatasetsAndRamContractTest.java | 2 +- ...atasetsAndSagaCoordinatorContractTest.java | 2 +- ...aSetAttributesImporterIntegrationTest.java | 2 + .../DataSetParametersImporterTest.java | 7 +- .../impl/DataSetListServiceImplTest.java | 86 ++++++++++--------- .../pacts/atp-itf-executor-atp-datasets.json | 15 +++- .../pacts/atp-itf-stubs-atp-datasets.json | 15 +++- .../pacts/atp-orchestrator-atp-datasets.json | 15 +++- 13 files changed, 198 insertions(+), 128 deletions(-) diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/AttachmentController.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/AttachmentController.java index b94be2a..35ba111 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/AttachmentController.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/rest/server/AttachmentController.java @@ -16,7 +16,6 @@ package org.qubership.atp.dataset.service.rest.server; -import java.io.IOException; import java.io.InputStream; import java.util.List; import java.util.UUID; @@ -26,6 +25,7 @@ import org.qubership.atp.dataset.service.rest.facade.AttachmentControllerFacade; import org.qubership.atp.integration.configuration.configuration.AuditAction; import org.springframework.core.io.InputStreamResource; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; @@ -57,7 +57,7 @@ public class AttachmentController /*extends AttachmentControllerApi*/ { + "@parameterServiceImpl.get(#parameterUuid).getDataSet().getDataSetList().getVisibilityArea().getId()," + "'READ')") @AuditAction(auditAction = "Get file by parameter: {{#parameterUuid}}") - @GetMapping("/{parameterUuid}") + @GetMapping(value = "/{parameterUuid}", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) public ResponseEntity getAttachmentByParameterId( @PathVariable("parameterUuid") UUID parameterUuid) { return attachmentControllerFacade.getAttachmentByParameterId(parameterUuid); @@ -69,7 +69,7 @@ public ResponseEntity getAttachmentByParameterId( @PreAuthorize("@entityAccess.checkAccess(" + "@dataSetServiceImpl.get(#datasetId).getDataSetList().getVisibilityArea().getId(),'READ')") @AuditAction(auditAction = "Get file by attribute: {{#attributeId}} and dataset: {{#datasetId}}") - @GetMapping("/attributeId/{attributeId}/dataset/{datasetId}") + @GetMapping(value = "/attributeId/{attributeId}/dataset/{datasetId}", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) public ResponseEntity getAttachmentByAttributeIdAndDatasetId( @PathVariable("attributeId") UUID attributeId, @PathVariable("datasetId") UUID datasetId) { @@ -93,7 +93,7 @@ public ResponseEntity getAttachmentByAttributeIdAndDatasetI public FileData uploadByParameterId(@PathVariable("parameterUuid") UUID parameterUuid, @RequestParam("type") String contentType, @RequestParam("fileName") String fileName, - InputStream file) throws IOException { + InputStream file) { return attachmentControllerFacade.uploadByParameterId(parameterUuid, contentType, fileName, file); } diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndCatalogContractTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndCatalogContractTest.java index a42927f..7de0649 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndCatalogContractTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndCatalogContractTest.java @@ -19,25 +19,6 @@ import org.junit.jupiter.api.TestTemplate; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.parallel.Isolated; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; -import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import org.springframework.http.HttpStatus; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import org.springframework.test.web.servlet.MockMvc; - -import au.com.dius.pact.provider.junit5.PactVerificationContext; -import au.com.dius.pact.provider.junit5.PactVerificationInvocationContextProvider; -import au.com.dius.pact.provider.junitsupport.Provider; -import au.com.dius.pact.provider.junitsupport.State; -import au.com.dius.pact.provider.junitsupport.loader.PactUrl; -import au.com.dius.pact.provider.spring.junit5.MockMvcTestTarget; import org.qubership.atp.auth.springbootstarter.entities.UserInfo; import org.qubership.atp.dataset.model.DataSet; import org.qubership.atp.dataset.model.DataSetList; @@ -62,7 +43,6 @@ import org.qubership.atp.dataset.service.direct.importexport.service.DatasetListExportService; import org.qubership.atp.dataset.service.direct.importexport.service.DatasetListImportService; import org.qubership.atp.dataset.service.jpa.ContextType; -import org.qubership.atp.dataset.service.jpa.DataSetServiceException; import org.qubership.atp.dataset.service.jpa.JpaDataSetListService; import org.qubership.atp.dataset.service.jpa.JpaDataSetService; import org.qubership.atp.dataset.service.jpa.JpaParameterService; @@ -73,11 +53,30 @@ import org.qubership.atp.dataset.service.rest.server.DataSetController; import org.qubership.atp.dataset.service.rest.server.DataSetListController; import org.qubership.atp.dataset.service.rest.server.ParameterController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; +import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; +import org.springframework.http.HttpStatus; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.web.servlet.MockMvc; + +import au.com.dius.pact.provider.junit5.PactVerificationContext; +import au.com.dius.pact.provider.junit5.PactVerificationInvocationContextProvider; +import au.com.dius.pact.provider.junitsupport.Provider; +import au.com.dius.pact.provider.junitsupport.State; +import au.com.dius.pact.provider.junitsupport.loader.PactUrl; +import au.com.dius.pact.provider.spring.junit5.MockMvcTestTarget; import lombok.extern.slf4j.Slf4j; @Isolated @Provider("atp-datasets") -@PactUrl(urls = {"src/test/resources/pacts/atp-catalogue-atp-datasets.json"}) +@PactUrl(urls = {"file:./src/test/resources/pacts/atp-catalogue-atp-datasets.json"}) @AutoConfigureMockMvc(addFilters = false, webDriverEnabled = false) @WebMvcTest(controllers = { DataSetController.class, @@ -197,7 +196,7 @@ void pactVerificationTestTemplate(PactVerificationContext context) { } @BeforeEach - void before(PactVerificationContext context) throws Exception { + void before(PactVerificationContext context) { beforeAll(); context.setTarget(new MockMvcTestTarget(mockMvc)); } diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndItfExecutorContractTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndItfExecutorContractTest.java index 40dbb0a..1bd4720 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndItfExecutorContractTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndItfExecutorContractTest.java @@ -4,8 +4,8 @@ import static org.mockito.Mockito.when; import java.io.ByteArrayInputStream; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; -import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.UUID; @@ -24,6 +24,7 @@ import org.qubership.atp.dataset.model.impl.DataSetListImpl; import org.qubership.atp.dataset.model.impl.MixInIdImpl; import org.qubership.atp.dataset.model.impl.TestPlanImpl; +import org.qubership.atp.dataset.model.impl.file.FileData; import org.qubership.atp.dataset.service.jpa.ContextType; import org.qubership.atp.dataset.service.jpa.delegates.Attribute; import org.qubership.atp.dataset.service.jpa.impl.DataSetParameterProvider; @@ -50,12 +51,12 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.core.io.InputStreamResource; -import org.springframework.http.HttpStatus; +import org.springframework.http.ContentDisposition; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; import au.com.dius.pact.provider.junit5.PactVerificationContext; import au.com.dius.pact.provider.junit5.PactVerificationInvocationContextProvider; @@ -66,7 +67,7 @@ @Isolated @Provider("atp-datasets") -@PactUrl(urls = {"src/test/resources/pacts/atp-itf-executor-atp-datasets.json"}) +@PactUrl(urls = {"file:./src/test/resources/pacts/atp-itf-executor-atp-datasets.json"}) @AutoConfigureMockMvc(addFilters = false, webDriverEnabled = false) @WebMvcTest(controllers = {AttachmentController.class, DataSetController.class, DataSetListController.class, AttributeController.class, VisibilityAreaController.class}) @@ -96,12 +97,24 @@ public static class TestApp { private VisibilityAreaController visibilityAreaController; public void beforeAll() { - InputStreamResource responseBody1 = new InputStreamResource(new ByteArrayInputStream("test".getBytes())); - MultiValueMap headers = new LinkedMultiValueMap<>(); - headers.add("Content-Disposition", "attachment; filename=\"name\""); + InputStreamResource responseBody = new InputStreamResource(new ByteArrayInputStream("test".getBytes())); + + FileData fileData = new FileData(); + fileData.setContentType("multipart/form-data"); + fileData.setFileName("name"); + + ContentDisposition contentDisposition = ContentDisposition.builder("attachment") + .filename("name", StandardCharsets.UTF_8) + .build(); + ResponseEntity attachmentResponse = + ResponseEntity + .ok() + .contentType(MediaType.parseMediaType(fileData.getContentType())) + .header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition.toString()) + .body(responseBody); when(attachmentController.getAttachmentByParameterId(any())) - .thenReturn(new ResponseEntity<>(responseBody1, headers, HttpStatus.OK)); + .thenReturn(attachmentResponse); String responseBody2 = "{\"key\":\"context\"}"; when(dataSetController.getItfContext(any())).thenReturn(responseBody2); @@ -134,7 +147,7 @@ void pactVerificationTestTemplate(PactVerificationContext context) { } @BeforeEach - void before(PactVerificationContext context) throws Exception { + void before(PactVerificationContext context) { beforeAll(); context.setTarget(new MockMvcTestTarget(mockMvc)); } @@ -143,7 +156,6 @@ void before(PactVerificationContext context) throws Exception { public void allPass() { } - private DataSetTree getResponseBody3_4_5_6(ContextType contextType) { DataSetContext dataSetContext = getDataSetContext(); DataSetParameterProvider dataSetParameterProvider = new DataSetParameterProvider(); @@ -151,10 +163,8 @@ private DataSetTree getResponseBody3_4_5_6(ContextType contextType) { DataSetListContext dataSetListContext = new DataSetListContext(UUID.randomUUID()); macroContext.setDataSetListContext(dataSetListContext); - DataSetTree dataSetTree = new DataSetTree(dataSetContext, 0, true, macroContext, + return new DataSetTree(dataSetContext, 0, true, macroContext, dataSetListContext, dataSetParameterProvider, contextType); - - return dataSetTree; } private DataSetContext getDataSetContext(){ @@ -171,7 +181,7 @@ private DataSetContext getDataSetContext(){ attribute2.setName("1ATTRIBUTE"); ParameterContext parameterContext2 = new ParameterContext(attribute2); - dataSetContext.setParameters(Arrays.asList(parameterContext2)); + dataSetContext.setParameters(List.of(parameterContext2)); return dataSetContext; } @@ -198,7 +208,7 @@ private VisibilityAreaFlatModel getVisibilityAreaFlatModel() { } private List getResponseBody7() { - return Arrays.asList(getVisibilityAreaFlatModel()); + return List.of(getVisibilityAreaFlatModel()); } private DataSetList getDataSetList() { @@ -213,7 +223,7 @@ private DataSetList getDataSetList() { } private List getResponseBody8() { - return Arrays.asList(getDataSetList()); + return List.of(getDataSetList()); } private DataSet getDataSet() { @@ -225,7 +235,7 @@ private DataSet getDataSet() { } private List getResponseBody9() { - return Arrays.asList(getDataSet()); + return List.of(getDataSet()); } private List getResponseBody10() { diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndItfStubsContractTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndItfStubsContractTest.java index f3eac1a..acb260d 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndItfStubsContractTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndItfStubsContractTest.java @@ -4,12 +4,14 @@ import static org.mockito.Mockito.when; import java.io.ByteArrayInputStream; -import java.io.IOException; +import java.nio.charset.StandardCharsets; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.TestTemplate; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.parallel.Isolated; +import org.qubership.atp.dataset.model.impl.file.FileData; +import org.qubership.atp.dataset.service.rest.server.AttachmentController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; @@ -20,12 +22,12 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.core.io.InputStreamResource; -import org.springframework.http.HttpStatus; +import org.springframework.http.ContentDisposition; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; import au.com.dius.pact.provider.junit5.PactVerificationContext; import au.com.dius.pact.provider.junit5.PactVerificationInvocationContextProvider; @@ -33,11 +35,10 @@ import au.com.dius.pact.provider.junitsupport.State; import au.com.dius.pact.provider.junitsupport.loader.PactUrl; import au.com.dius.pact.provider.spring.junit5.MockMvcTestTarget; -import org.qubership.atp.dataset.service.rest.server.AttachmentController; @Isolated @Provider("atp-datasets") -@PactUrl(urls = {"src/test/resources/pacts/atp-itf-stubs-atp-datasets.json"}) +@PactUrl(urls = {"file:./src/test/resources/pacts/atp-itf-stubs-atp-datasets.json"}) @AutoConfigureMockMvc(addFilters = false, webDriverEnabled = false) @WebMvcTest(controllers = {AttachmentController.class}) @SpringJUnitConfig(classes = {DatasetsAndItfStubsContractTest.TestApp.class}) @@ -55,13 +56,25 @@ public static class TestApp { @MockBean private AttachmentController attachmentController; - private void beforeAll() throws IOException { + private void beforeAll() { InputStreamResource responseBody = new InputStreamResource(new ByteArrayInputStream("test".getBytes())); - MultiValueMap headers = new LinkedMultiValueMap<>(); - headers.add("Content-Disposition", "attachment; filename=\"name\""); + + FileData fileData = new FileData(); + fileData.setContentType("multipart/form-data"); + fileData.setFileName("name"); + + ContentDisposition contentDisposition = ContentDisposition.builder("attachment") + .filename("name", StandardCharsets.UTF_8) + .build(); + ResponseEntity attachmentResponse = + ResponseEntity + .ok() + .contentType(MediaType.parseMediaType(fileData.getContentType())) + .header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition.toString()) + .body(responseBody); when(attachmentController.getAttachmentByParameterId(any())) - .thenReturn(new ResponseEntity<>(responseBody, headers, HttpStatus.OK)); + .thenReturn(attachmentResponse); } @TestTemplate @@ -71,7 +84,7 @@ void pactVerificationTestTemplate(PactVerificationContext context) { } @BeforeEach - void before(PactVerificationContext context) throws Exception { + void before(PactVerificationContext context) { beforeAll(); context.setTarget(new MockMvcTestTarget(mockMvc)); } diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndOrchestratorContractTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndOrchestratorContractTest.java index c16137e..e5d2cd2 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndOrchestratorContractTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndOrchestratorContractTest.java @@ -11,12 +11,28 @@ import java.util.Optional; import java.util.UUID; -import org.qubership.atp.dataset.service.jpa.impl.MetricsService; -import org.qubership.atp.dataset.service.rest.facade.AttachmentControllerFacade; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.TestTemplate; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.parallel.Isolated; +import org.qubership.atp.auth.springbootstarter.entities.UserInfo; +import org.qubership.atp.dataset.model.impl.file.FileData; +import org.qubership.atp.dataset.model.utils.DatasetResponse; +import org.qubership.atp.dataset.service.direct.AttributeService; +import org.qubership.atp.dataset.service.direct.ConcurrentModificationService; +import org.qubership.atp.dataset.service.direct.DataSetListService; +import org.qubership.atp.dataset.service.direct.DataSetService; +import org.qubership.atp.dataset.service.direct.GridFsService; +import org.qubership.atp.dataset.service.direct.ParameterService; +import org.qubership.atp.dataset.service.direct.importexport.service.DatasetListExportService; +import org.qubership.atp.dataset.service.direct.importexport.service.DatasetListImportService; +import org.qubership.atp.dataset.service.jpa.JpaDataSetListService; +import org.qubership.atp.dataset.service.jpa.JpaParameterService; +import org.qubership.atp.dataset.service.jpa.impl.DataSetListCheckService; +import org.qubership.atp.dataset.service.jpa.impl.MetricsService; +import org.qubership.atp.dataset.service.rest.facade.AttachmentControllerFacade; +import org.qubership.atp.dataset.service.rest.server.AttachmentController; +import org.qubership.atp.dataset.service.rest.server.DataSetListController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; @@ -40,28 +56,11 @@ import au.com.dius.pact.provider.junitsupport.State; import au.com.dius.pact.provider.junitsupport.loader.PactUrl; import au.com.dius.pact.provider.spring.junit5.MockMvcTestTarget; -import org.qubership.atp.auth.springbootstarter.entities.UserInfo; -import org.qubership.atp.dataset.model.impl.file.FileData; -import org.qubership.atp.dataset.model.utils.DatasetResponse; -import org.qubership.atp.dataset.service.direct.AttributeService; -import org.qubership.atp.dataset.service.direct.ConcurrentModificationService; -import org.qubership.atp.dataset.service.direct.DataSetListService; -import org.qubership.atp.dataset.service.direct.DataSetService; -import org.qubership.atp.dataset.service.direct.GridFsService; -import org.qubership.atp.dataset.service.direct.ParameterService; -import org.qubership.atp.dataset.service.direct.importexport.service.DatasetListExportService; -import org.qubership.atp.dataset.service.direct.importexport.service.DatasetListImportService; -import org.qubership.atp.dataset.service.jpa.DataSetServiceException; -import org.qubership.atp.dataset.service.jpa.JpaDataSetListService; -import org.qubership.atp.dataset.service.jpa.JpaParameterService; -import org.qubership.atp.dataset.service.jpa.impl.DataSetListCheckService; -import org.qubership.atp.dataset.service.rest.server.AttachmentController; -import org.qubership.atp.dataset.service.rest.server.DataSetListController; import lombok.extern.slf4j.Slf4j; @Isolated @Provider("atp-datasets") -@PactUrl(urls = {"src/test/resources/pacts/atp-orchestrator-atp-datasets.json"}) +@PactUrl(urls = {"file:./src/test/resources/pacts/atp-orchestrator-atp-datasets.json"}) @AutoConfigureMockMvc(addFilters = false, webDriverEnabled = false) @WebMvcTest(controllers = { DataSetListController.class, @@ -116,7 +115,7 @@ public static class TestApp { @MockBean private DataSetService dataSetService; - public void beforeAll() throws DataSetServiceException { + public void beforeAll() { List resultList = new ArrayList<>(); DatasetResponse datasetResponse = new DatasetResponse(UUID.randomUUID(), "dsName", UUID.randomUUID(), "dslName"); @@ -124,7 +123,7 @@ public void beforeAll() throws DataSetServiceException { UUID id = UUID.fromString("c2737427-05e4-4c17-8032-455539deaa01"); InputStream inputStream = new ByteArrayInputStream( "blabla".getBytes() ); - Optional optional = Optional.ofNullable(inputStream); + Optional optional = Optional.of(inputStream); FileData fileData = new FileData(); fileData.setContentType("multipart/form-data"); @@ -136,14 +135,13 @@ public void beforeAll() throws DataSetServiceException { InputStreamResource inputStreamResource = new InputStreamResource(inputStream); - ResponseEntity re = + ResponseEntity attachmentResponse = ResponseEntity .ok() .contentType(MediaType.parseMediaType(fileData.getContentType())) .header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition.toString()) .body(inputStreamResource); - when(dslService.getListOfDsIdsAndNameAndDslId(any())) .thenReturn(resultList); @@ -151,7 +149,7 @@ public void beforeAll() throws DataSetServiceException { when(gridFsService.getFileInfo(id)).thenReturn(fileData); when(attachmentControllerFacade.getAttachmentByParameterId(any())) - .thenReturn(re); + .thenReturn(attachmentResponse); } @TestTemplate @@ -161,7 +159,7 @@ void pactVerificationTestTemplate(PactVerificationContext context) { } @BeforeEach - void before(PactVerificationContext context) throws Exception { + void before(PactVerificationContext context) { beforeAll(); context.setTarget(new MockMvcTestTarget(mockMvc)); } diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndRamContractTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndRamContractTest.java index 8679a7a..400507f 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndRamContractTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndRamContractTest.java @@ -49,7 +49,7 @@ @Isolated @Provider("atp-datasets") -@PactUrl(urls = {"src/test/resources/pacts/atp-ram-atp-datasets.json"}) +@PactUrl(urls = {"file:./src/test/resources/pacts/atp-ram-atp-datasets.json"}) @AutoConfigureMockMvc(addFilters = false, webDriverEnabled = false) @WebMvcTest(controllers = {DataSetController.class, DataSetListController.class diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndSagaCoordinatorContractTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndSagaCoordinatorContractTest.java index c0c617d..b06f8b8 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndSagaCoordinatorContractTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/controllers/api/DatasetsAndSagaCoordinatorContractTest.java @@ -40,7 +40,7 @@ @Slf4j @Isolated @Provider("atp-datasets") -@PactUrl(urls = {"src/test/resources/pacts/atp-saga-coordinator-atp-datasets.json"}) +@PactUrl(urls = {"file:./src/test/resources/pacts/atp-saga-coordinator-atp-datasets.json"}) @AutoConfigureMockMvc(addFilters = false, webDriverEnabled = false) @WebMvcTest(controllers = {SagaController.class }) diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetAttributesImporterIntegrationTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetAttributesImporterIntegrationTest.java index 8128b94..66b49a3 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetAttributesImporterIntegrationTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetAttributesImporterIntegrationTest.java @@ -42,10 +42,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.jdbc.Sql; @Isolated @SpringBootTest +@ActiveProfiles("disable-security") public class DataSetAttributesImporterIntegrationTest { @Autowired diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetParametersImporterTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetParametersImporterTest.java index 6a81b74..95276d4 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetParametersImporterTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/service/DataSetParametersImporterTest.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.io.IOException; import java.nio.file.Path; import java.util.Collections; import java.util.HashMap; @@ -36,8 +35,8 @@ import org.junit.jupiter.api.parallel.Isolated; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.test.context.junit.jupiter.SpringExtension; - +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.qubership.atp.dataset.service.direct.ClearCacheService; import org.qubership.atp.dataset.service.jpa.DataSetServiceException; import org.qubership.atp.dataset.service.jpa.JpaAttributeService; @@ -50,10 +49,12 @@ import org.qubership.atp.ei.node.dto.ExportImportData; import org.qubership.atp.ei.node.dto.validation.ValidationType; import org.qubership.atp.ei.node.services.ObjectLoaderFromDiskService; +import org.springframework.test.context.junit.jupiter.SpringExtension; @Isolated @ExtendWith(SpringExtension.class) @ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class DataSetParametersImporterTest { private ObjectLoaderFromDiskService objectLoaderFromDiskService; diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/impl/DataSetListServiceImplTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/impl/DataSetListServiceImplTest.java index d9e9f83..1fcd538 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/impl/DataSetListServiceImplTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/impl/DataSetListServiceImplTest.java @@ -40,6 +40,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; @@ -53,6 +54,8 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.qubership.atp.dataset.config.TestConfiguration; import org.qubership.atp.dataset.db.jpa.ModelsProvider; import org.qubership.atp.dataset.db.jpa.entities.AttributeEntity; @@ -93,6 +96,7 @@ "feign.atp.macros.route=", "atp-dataset.javers.enabled=false" }) +@MockitoSettings(strictness = Strictness.LENIENT) public class DataSetListServiceImplTest extends DataSetBuilder { @MockBean @@ -109,7 +113,7 @@ public class DataSetListServiceImplTest extends DataSetBuilder { MacrosDto macrosDto; @AfterEach - public void tearDown() throws Exception { + public void tearDown() { visibilityAreaService.delete(vaId); } @@ -117,15 +121,15 @@ public void tearDown() throws Exception { public void testRenameDslReplaceRefs() { parameterService.update(source.getId(), "#REF_DSL(DSL.DS.ATTR)"); dataSetListService.rename(dataSetList.getId(), "SZ_Updated"); - assertEquals("#REF_DSL(SZ_Updated.DS.ATTR)", - wrapperService.unWrapAlias(parameterService.get(source.getId()).getText())); + String wrappedText = Objects.requireNonNull(parameterService.get(source.getId())).getText(); + assertEquals("#REF_DSL(SZ_Updated.DS.ATTR)", wrapperService.unWrapAlias(wrappedText)); } @Test public void testRenameDslReplaceRefsInCurrentDsl() { parameterService.update(source.getId(), "#REF_DSL(DSL.DS.ATTR)"); dataSetListService.rename(dataSetList.getId(), "SZ_Updated"); - String wrappedText = parameterService.get(source.getId()).getText(); + String wrappedText = Objects.requireNonNull(parameterService.get(source.getId())).getText(); assertEquals("#REF_DSL(SZ_Updated.DS.ATTR)", wrapperService.unWrapAlias(wrappedText)); } @@ -134,7 +138,7 @@ public void testRenameDslReplaceRefsInCurrentDsl() { public void testRenameDslReplaceRef() { parameterService.update(source.getId(), "#REF(DS.DSL.ATTR)"); dataSetListService.rename(dataSetList.getId(), "SZ_Updated"); - String wrappedText = parameterService.get(source.getId()).getText(); + String wrappedText = Objects.requireNonNull(parameterService.get(source.getId())).getText(); assertEquals("#REF(DS.SZ_Updated.ATTR)", wrappedText); } @@ -149,9 +153,8 @@ public void testRenameDslWillNotReplaceRefsInCurrentDslDslNameEntriesInAnotherDs @Test public void testRenameDslWillReplaceFewRefs() { source.setText("#REF_DSL(DS.Input.Attribute)REF_Abrakadabra#REF(DS.Input.Attribute)"); -// dslService.rename(UUID.randomUUID(), "SZ_Updated"); - assertEquals("#REF_DSL(DS.SZ_Updated.Attribute)REF_Abrakadabra#REF(DS.SZ_Updated.Attribute)" - , source.getText()); + assertEquals("#REF_DSL(DS.SZ_Updated.Attribute)REF_Abrakadabra#REF(DS.SZ_Updated.Attribute)", + source.getText()); } @Test @@ -159,6 +162,7 @@ public void addTestPlanToDataSetList_testPlanWasAdded() { TestPlan testPlan = testPlanService.create(vaId, "newTP").getFirst(); dataSetListService.modify(dataSetList.getId(), dataSetList.getName(), testPlan.getId(), false); DataSetList dsl = dataSetListService.get(dataSetList.getId()); + assertNotNull(dsl); assertEquals("newTP", dsl.getTestPlan().getName()); } @@ -168,6 +172,7 @@ public void clearTestPlanInDataSetList_testPlanWasDeleted() { dataSetListService.modify(dataSetList.getId(), dataSetList.getName(), testPlan.getId(), false); dataSetListService.modify(dataSetList.getId(), dataSetList.getName(), null, true); DataSetList dsl = dataSetListService.get(dataSetList.getId()); + assertNotNull(dsl); assertNull(dsl.getTestPlan()); } @@ -300,10 +305,10 @@ public void getDatasetsIdsWithItsNameAndDatasetList_correct_StructureWereReturne assertEquals(1, result.size(), "Result have 1 element"); - assertEquals(result.get(0).getDataSetName(), dataSet1.getName()); + assertEquals(dataSet1.getName(), result.getFirst().getDataSetName()); - assertEquals(result.get(0).getDataSetListId(), dsl.getId()); - assertEquals(result.get(0).getDataSetListName(), dsl.getName()); + assertEquals(dsl.getId(), result.getFirst().getDataSetListId()); + assertEquals(dsl.getName(), result.getFirst().getDataSetListName()); } @Test @@ -315,11 +320,13 @@ public void getFilteredDatasets_datasetsWereFilteredById() { DataSet dataSet4 = dataSetService.create(dsl.getId(), "ds4"); UiManDataSetList resultBefore = dataSetListService.getAsTree(dsl.getId(), false); + assertNotNull(resultBefore); assertEquals(4, resultBefore.getDataSets().size()); List filter = asList(dataSet1.getId(), dataSet2.getId()); UiManDataSetList resultAfter = dataSetListService.getAsTree(dsl.getId(), false, filter, false); + assertNotNull(resultAfter); assertEquals(2, resultAfter.getDataSets().size()); assertEquals(dataSet1.getId(), resultAfter.getDataSets().get(0).getId()); assertEquals(dataSet2.getId(), resultAfter.getDataSets().get(1).getId()); @@ -348,12 +355,14 @@ public void getFilteredDatasets_datasetsWereFilteredByAttributes() { "4", null, null); UiManDataSetList resultBefore = dataSetListService.getAsTree(dsl.getId(), false); + assertNotNull(resultBefore); assertEquals(4, resultBefore.getAttributes().size()); List filter = asList(attribute1.getId(), attribute2.getId()); UiManDataSetList resultAfter = dataSetListService.getAsTree(dsl.getId(), false, null, filter, null, null, false, true); + assertNotNull(resultAfter); assertEquals(2, resultAfter.getAttributes().size()); assertEquals(attribute1.getId(), resultAfter.getAttributes().get(0).getId()); assertEquals(attribute2.getId(), resultAfter.getAttributes().get(1).getId()); @@ -378,6 +387,7 @@ public void getFilteredDatasets_datasetsWereFilteredByIdAndAttributes() { .create(dsl.getId(), 3, "text4", AttributeType.TEXT, null, null); UiManDataSetList resultBefore = dataSetListService.getAsTree(dsl.getId(), false); + assertNotNull(resultBefore); assertEquals(4, resultBefore.getAttributes().size()); assertEquals(4, resultBefore.getDataSets().size()); @@ -387,6 +397,7 @@ public void getFilteredDatasets_datasetsWereFilteredByIdAndAttributes() { UiManDataSetList resultAfter = dataSetListService.getAsTree(dsl.getId(), false, filterDs, filter, null, null, false, true); + assertNotNull(resultAfter); assertEquals(2, resultAfter.getAttributes().size()); assertEquals(2, resultAfter.getDataSets().size()); assertEquals(dataSet1.getId(), resultAfter.getDataSets().get(0).getId()); @@ -450,8 +461,8 @@ public void testGetAffectedDataSetLists_shouldReturnsListWithOneElement_whenData dataSetListService.getAffectedDataSetLists(toDelete.getId(), 1, 0); assertThat(affectedDataSetLists, hasSize(1)); - assertThat(dsl1.getId(), equalTo(affectedDataSetLists.get(0).getDslId())); - assertThat(dsl1.getName(), equalTo(affectedDataSetLists.get(0).getDslName())); + assertThat(dsl1.getId(), equalTo(affectedDataSetLists.getFirst().getDslId())); + assertThat(dsl1.getName(), equalTo(affectedDataSetLists.getFirst().getDslName())); } @Test @@ -473,17 +484,15 @@ public void testGetAffectedDataSetLists_shouldReturnsEmptyList_whenDataSetListIs @Test public void testGetAffectedDataSetLists_shouldThrowAnException_whenLimitIsNegative() { DataSetList toDelete = dataSetListService.create(vaId, "dsl", null); - assertThrows(IllegalArgumentException.class, ()-> { - dataSetListService.getAffectedDataSetLists(toDelete.getId(), -1, 0); - }); + assertThrows(IllegalArgumentException.class, ()-> + dataSetListService.getAffectedDataSetLists(toDelete.getId(), -1, 0)); } @Test public void testGetAffectedDataSetLists_shouldThrowAnException_whenOffsetIsNegative() { DataSetList toDelete = dataSetListService.create(vaId, "dsl", null); - assertThrows(IllegalArgumentException.class, ()-> { - dataSetListService.getAffectedDataSetLists(toDelete.getId(), 1, -1); - }); + assertThrows(IllegalArgumentException.class, ()-> + dataSetListService.getAffectedDataSetLists(toDelete.getId(), 1, -1)); } @Test @@ -527,7 +536,7 @@ public void testCopyDslWithDatasets_dslWasCopiedWithoutTestPlan() { "Overlapped", null, null); Map> structureToCopy = new HashMap<>(); - structureToCopy.put(dslToCopy.getId(), new HashSet<>(asList(dataSet.getId()))); + structureToCopy.put(dslToCopy.getId(), new HashSet<>(Collections.singletonList(dataSet.getId()))); structureToCopy.put(dslToCopy2.getId(), new HashSet<>(asList(dataSet2.getId(), dataSet3.getId()))); //old ds - pair of new ds, new dsl @@ -538,45 +547,40 @@ public void testCopyDslWithDatasets_dslWasCopiedWithoutTestPlan() { DataSetList resultDsl1 = dataSetListService.get(result.get(dataSet.getId()).getValue()); - assertEquals(2, dataSetListService.get(result.get(dataSet2.getId()).getValue()).getDataSets().size(), + assertEquals(2, Objects.requireNonNull(dataSetListService.get(result.get(dataSet2.getId()).getValue())) + .getDataSets().size(), "second dsl has only 2 datasets"); + assertNotNull(resultDsl1); List attrs = resultDsl1.getAttributes(); assertEquals( "textAttr", attrs.get(0).getName()); assertEquals(AttributeType.TEXT, attrs.get(0).getType()); assertEquals("PostalCodeRef2", attrs.get(1).getName()); assertEquals( AttributeType.DSL, attrs.get(1).getType()); - assertNull(resultDsl1.getTestPlan()); } @Test public void testExistsById_shouldReturnsFalse_whenDataSetListIsNotExists() { boolean exists = dataSetListService.existsById(UUID.randomUUID()); - assertThat(exists, equalTo(false)); } @Test public void testExistsById_shouldReturnsTrue_whenDataSetListIsExists() { DataSetList dsl = dataSetListService.create(vaId, "dsl", null); - boolean exists = dataSetListService.existsById(dsl.getId()); - assertThat(exists, equalTo(true)); } @Test public void testExistsById_shouldThrowAnException_whenDataSetListIdIsNull() { - assertThrows(IllegalArgumentException.class, ()-> { - dataSetListService.existsById(null); - }); + assertThrows(IllegalArgumentException.class, ()-> dataSetListService.existsById(null)); } @Test public void testGetDataSetListModifiedWhen_shouldReturnsNull_whenDataSetListIsNotExists() { Timestamp modifiedWhen = dataSetListService.getModifiedWhen(UUID.randomUUID()); - assertThat(modifiedWhen, is(nullValue())); } @@ -594,18 +598,18 @@ public void testGetDataSetListModifiedWhen_shouldReturnsNull_whenDataSetListModi @Test public void testGetDataSetListModifiedWhen_shouldThrowAnException_whenDataSetListIdIsNull() { - assertThrows(IllegalArgumentException.class, ()-> { - dataSetListService.getModifiedWhen(null); - }); + assertThrows(IllegalArgumentException.class, ()-> dataSetListService.getModifiedWhen(null)); } @Test - public void testDelete_shouldRollbackTransaction_whenExceptionIsOccured() { + public void testDelete_shouldRollbackTransaction_whenExceptionIsOccurred() { doThrow(RuntimeException.class).when(dataSetListSnapshotService).deleteDataSetList(any()); try { dataSetListService.delete(dataSetList.getId()); - } catch (Exception ignored) {} + } catch (Exception ignored) { + // Silently ignore it + } assertNotNull(dataSetListService.get(dataSetList.getId())); } @@ -640,6 +644,7 @@ public void test_UiManDataSetList_whenMacrosAtpIs() { UiManDataSetList dataSetListUi = dataSetListService.getAsTree( dsl.getId(), true, null, null, null, null, false, true); + assertNotNull(dataSetListUi); assertEquals("32OK_MACRO_VALUE", dataSetListUi.getAttributes().get(0).getParameters().get(0).getValue()); assertEquals("Simple text", dataSetListUi.getAttributes().get(0).getParameters().get(1).getValue()); assertEquals("Simple text2", dataSetListUi.getAttributes().get(1).getParameters().get(0).getValue()); @@ -678,6 +683,7 @@ public void test_UiManDataSetList_emptyNonTechnicalMacrosList() { UiManDataSetList dataSetListUi = dataSetListService.getAsTree( dsl.getId(), true, null, null, null, null, false, true); + assertNotNull(dataSetListUi); assertEquals("32#RANDOMBETWEEN(31,31)", dataSetListUi.getAttributes().get(0).getParameters().get(0).getValue()); assertEquals("Simple text", dataSetListUi.getAttributes().get(0).getParameters().get(1).getValue()); assertEquals("Simple text2", dataSetListUi.getAttributes().get(1).getParameters().get(0).getValue()); @@ -697,8 +703,10 @@ public void getAsTree_runEvaluateMacros_macrosParameterEvaluated() { UiManDataSetList resultBefore = dataSetListService.getAsTree(dsl.getId(), false); UiManDataSetList resultAfter = dataSetListService.getAsTree(dsl.getId(), true); - assertTrue(resultBefore.getAttributes().get(0).getParameters().get(0).getValue().toString().contains(str)); - assertTrue(resultAfter.getAttributes().get(0).getParameters().get(0).getValue().toString().contains("3531")); + assertNotNull(resultBefore); + assertTrue(resultBefore.getAttributes().getFirst().getParameters().getFirst().getValue().toString().contains(str)); + assertNotNull(resultAfter); + assertTrue(resultAfter.getAttributes().getFirst().getParameters().getFirst().getValue().toString().contains("3531")); } @Test @@ -706,9 +714,9 @@ public void mark_setLabelToDatasetList_dataSetListHasLabel() { String labelName = "Label"; dataSetListService.mark(dslId, labelName); - List + + junit + junit + diff --git a/parent/parent-java/pom.xml b/parent/parent-java/pom.xml index 42ada4f..3365625 100644 --- a/parent/parent-java/pom.xml +++ b/parent/parent-java/pom.xml @@ -29,6 +29,7 @@ ${project.build.sourceEncoding} ${java.version} + true diff --git a/pom.xml b/pom.xml index 3a30229..80fe100 100644 --- a/pom.xml +++ b/pom.xml @@ -263,6 +263,7 @@ ${project.build.sourceEncoding} ${java.version} + true From ffbf0da0f992b134db84bf5a224dcdde859d3a93 Mon Sep 17 00:00:00 2001 From: kagw95 Date: Wed, 11 Mar 2026 16:38:13 +0400 Subject: [PATCH 09/29] fix: Unit tests are fixed. Hibernate aggregate queries results processing is fixed. Bump maven-surefire-plugin version to 3.2.5. --- .../service/jpa/delegates/DataSetList.java | 36 +++++++++---------- .../dataset/ei/DataSetExportExecutorTest.java | 35 +++++++++--------- .../service/DatasetListImportServiceTest.java | 4 +-- parent/parent-java/pom.xml | 2 +- 4 files changed, 35 insertions(+), 42 deletions(-) diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/DataSetList.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/DataSetList.java index 428e6c2..45993ae 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/DataSetList.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/service/jpa/delegates/DataSetList.java @@ -1,5 +1,5 @@ /* - * # Copyright 2024-2025 NetCracker Technology Corporation + * # Copyright 2024-2026 NetCracker Technology Corporation * # * # Licensed under the Apache License, Version 2.0 (the "License"); * # you may not use this file except in compliance with the License. @@ -16,7 +16,6 @@ package org.qubership.atp.dataset.service.jpa.delegates; -import java.math.BigInteger; import java.sql.Timestamp; import java.time.Instant; import java.util.ArrayList; @@ -31,8 +30,6 @@ import java.util.Set; import java.util.UUID; -import jakarta.annotation.Nullable; - import org.apache.commons.lang3.StringUtils; import org.qubership.atp.dataset.db.jpa.entities.AttributeEntity; import org.qubership.atp.dataset.db.jpa.entities.AttributeKeyEntity; @@ -50,6 +47,7 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; +import jakarta.annotation.Nullable; import lombok.extern.slf4j.Slf4j; @Slf4j @@ -147,9 +145,9 @@ public List getAttributes() { */ public Integer getAttributesCount() { String nativeQuery = "select count(1) from attribute where datasetlist_id = :dsl_id"; - return ((BigInteger) entityManager.createNativeQuery(nativeQuery) + return (Integer) entityManager.createNativeQuery(nativeQuery) .setParameter("dsl_id", getId()) - .getSingleResult()).intValue(); + .getSingleResult(); } /** @@ -180,11 +178,11 @@ public List getDataSetsColumns(List dataSetIds) { + " order by ordering" + ") ds_ordered" + " where id in (:ds_ids)"; - List queryResult = entityManager.createNativeQuery(nativeQuery) + List queryResult = entityManager.createNativeQuery(nativeQuery) .setParameter("list_id", getId()) .setParameter("ds_ids", dataSetIds) .getResultList(); - queryResult.forEach(bigInteger -> result.add(bigInteger.intValue() - 1)); + queryResult.forEach(bigInteger -> result.add(bigInteger - 1)); return result; } @@ -200,11 +198,11 @@ public Integer getDataSetColumnByName(String dataSetName) { + " order by ordering" + ") ds_ordered" + " where name = :ds_name"; - return ((BigInteger) entityManager + return (Integer) entityManager .createNativeQuery(nativeQuery) .setParameter("list_id", getId()) .setParameter("ds_name", dataSetName) - .getSingleResult()).intValue() - 1; + .getSingleResult() - 1; } /** @@ -219,11 +217,11 @@ public Integer getDataSetColumnById(UUID dataSetId) { + " order by ordering" + ") ds_ordered" + " where id = :ds_id"; - return ((BigInteger) entityManager + return (Integer) entityManager .createNativeQuery(nativeQuery) .setParameter("list_id", getId()) .setParameter("ds_id", dataSetId) - .getSingleResult()).intValue() - 1; + .getSingleResult() - 1; } /** @@ -245,7 +243,7 @@ public List getDataSetColumnsByIds(List dataSetIds) { .getResultList(); List result = new ArrayList<>(); for (Object o : untypedResult) { - result.add(((BigInteger) o).intValue() - 1); + result.add((Integer) o - 1); } return result; } @@ -312,10 +310,10 @@ public DataSet getDataSetById(UUID dataSetId) { */ public Integer getDataSetsCount() { String nativeQuery = "select count(1) from dataset where datasetlist_id = :list_id"; - return ((BigInteger) entityManager + return (Integer) entityManager .createNativeQuery(nativeQuery) .setParameter("list_id", getId()) - .getSingleResult()).intValue(); + .getSingleResult(); } public List getLabels() { @@ -506,11 +504,11 @@ public int getLastAttributeOrderNumber() { */ public long getLastDataSetsOrderNumber() { String nativeQuery = "select max(ordering) max_order_number from dataset where datasetlist_id = ?"; - BigInteger result = ((BigInteger) entityManager + Long result = ((Long) entityManager .createNativeQuery(nativeQuery) .setParameter(1, getId()) .getSingleResult()); - return result != null ? result.longValue() : 0L; + return result != null ? result : 0L; } public void setName(String name) { @@ -605,7 +603,7 @@ private void copyOverlapsToListNoPathUpdate( try { gridFsService.copy(oldOverlap.getId(), newOverlap.getId(), true); } catch (IllegalStateException | FileDsNotFoundToCopyException | FileDsCopyException e) { - log.error("File " + oldOverlap.getId() + " not found. Continue copying.", e); + log.error("File {} not found. Continue copying.", oldOverlap.getId(), e); } break; case DSL: @@ -665,7 +663,7 @@ private Map copyAttributesTo(DataSetList anotherDataSet new AttributeCopyData(copyAttribute, listValuesMap) ); } - log.debug("copyAttributesTo() - " + originalToCopy.entrySet()); + log.debug("copyAttributesTo() - {}", originalToCopy.entrySet()); return originalToCopy; } diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/DataSetExportExecutorTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/DataSetExportExecutorTest.java index e1eec2a..693c4a0 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/DataSetExportExecutorTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/ei/DataSetExportExecutorTest.java @@ -1,5 +1,5 @@ /* - * # Copyright 2024-2025 NetCracker Technology Corporation + * # Copyright 2024-2026 NetCracker Technology Corporation * # * # Licensed under the Apache License, Version 2.0 (the "License"); * # you may not use this file except in compliance with the License. @@ -40,14 +40,10 @@ import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.io.TempDir; import org.junit.jupiter.api.parallel.Isolated; -import org.mockito.InjectMocks; -import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.Spy; -import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.quality.Strictness; import org.qubership.atp.dataset.db.GridFsRepository; @@ -69,38 +65,41 @@ import org.qubership.atp.ei.node.dto.ExportScope; import org.qubership.atp.ei.node.services.FileService; import org.qubership.atp.ei.node.services.ObjectSaverToDiskService; -import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.TestPropertySource; import org.springframework.test.util.ReflectionTestUtils; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Sets; @Isolated -@ExtendWith(SpringExtension.class) -@ExtendWith(MockitoExtension.class) +@SpringBootTest @MockitoSettings(strictness = Strictness.LENIENT) +@TestPropertySource(properties = {"atp.export.pretty-print=true"}) public class DataSetExportExecutorTest { @Spy private ObjectSaverToDiskService objectSaverToDiskService = new ObjectSaverToDiskService(new FileService(), true); - @Mock + @MockBean private JpaDataSetListRepository jpaDataSetListRepository; - @Mock + @MockBean private JpaDataSetRepository jpaDataSetRepository; - @Mock + @MockBean private GridFsRepository gridFsRepository; - @Mock + @MockBean private MacroContextService macroContextService; - @Mock + @MockBean private DataSetListContextService dataSetListContextService; @Spy private ObjectMapper objectMapper; - @InjectMocks + @Autowired DataSetExportExecutor dataSetExportExecutor; - @Mock + @MockBean private JpaDataSetListService dslService; - @Mock + @MockBean private JpaDataSetServiceImpl dsService; @TempDir private Path tempDir; @@ -211,7 +210,6 @@ public void exportToFolder_GetNeededDatasetAndPlacedItToFolderAsFile_NeededDataS Set datasetIds = new HashSet<>(); datasetIds.add(dsId); Path path = Files.createDirectories(tempDir.resolve("dsExport")); -// Path path = folder.newFolder("dsExport").toPath(); UUID visibilityAreaId = UUID.fromString("0cce99d6-ef89-4163-8518-9e1dbf173a6d"); ExportImportData exportData = new ExportImportData(visibilityAreaId, atpExportScope, ExportFormat.ATP); exportData.getExportScope().getEntities().put(Constants.ENTITY_DATASETS, @@ -239,7 +237,6 @@ public void exportToFolder_convertToNttFormat() throws Exception { UUID dataSetId = UUID.fromString("8147cd6a-b742-4f63-be42-59c7c1ab5f2f"); datasetIds.add(dataSetId); Path path = Files.createDirectories(tempDir.resolve("dsExport")); -// Path path = folder.newFolder("dsExport").toPath(); UUID visibilityAreaId = UUID.fromString("0cce99d6-ef89-4163-8518-9e1dbf173a6d"); ExportImportData exportData = new ExportImportData(visibilityAreaId, atpExportScope, ExportFormat.NTT); exportData.getExportScope().getEntities().put(Constants.ENTITY_DATASETS, @@ -278,7 +275,7 @@ public void expandExportScope_exportSpecificDsls_DslForDsIsCollected() { exportData.getExportScope().getEntities().put(Constants.ENTITY_DATASET_STORAGE, new HashSet<>()); Set idsFromDb = new HashSet<>(); idsFromDb.add(dslId); - Mockito.when(jpaDataSetListRepository.getDslIdsByVa(exportData.getProjectId())).thenReturn(idsFromDb); + Mockito.when(jpaDataSetListRepository.getDslIdsByVa(Mockito.eq(exportData.getProjectId()))).thenReturn(idsFromDb); dataSetExportExecutor.expandExportScope(exportData); assertTrue(exportData.getExportScope().getEntities() .getOrDefault(Constants.ENTITY_DATASET_STORAGE, new HashSet<>()).contains(dslId.toString())); diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/importexport/service/DatasetListImportServiceTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/importexport/service/DatasetListImportServiceTest.java index 9300fc7..e0bda00 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/importexport/service/DatasetListImportServiceTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/importexport/service/DatasetListImportServiceTest.java @@ -1,5 +1,5 @@ /* - * # Copyright 2024-2025 NetCracker Technology Corporation + * # Copyright 2024-2026 NetCracker Technology Corporation * # * # Licensed under the Apache License, Version 2.0 (the "License"); * # you may not use this file except in compliance with the License. @@ -105,7 +105,6 @@ import org.qubership.atp.dataset.service.jpa.delegates.ListValue; import org.qubership.atp.dataset.service.jpa.model.AttributeTypeName; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.util.ReflectionTestUtils; import com.google.common.collect.ImmutableMap; @@ -171,7 +170,6 @@ */ @Isolated -@ExtendWith(SpringExtension.class) @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) @TestPropertySource(properties = {"atp-dataset.javers.enabled=false"}) diff --git a/parent/parent-java/pom.xml b/parent/parent-java/pom.xml index 3365625..7421831 100644 --- a/parent/parent-java/pom.xml +++ b/parent/parent-java/pom.xml @@ -85,7 +85,7 @@ maven-surefire-plugin - 3.1.2 + 3.2.5 -Dfile.encoding=${project.build.sourceEncoding} From 1ced53f05a1f3ff2b06985f5deecacaf507eeee3 Mon Sep 17 00:00:00 2001 From: kagw95 Date: Wed, 11 Mar 2026 16:40:38 +0400 Subject: [PATCH 10/29] fix(security): Dockerfile: Bump APK packages: sops to 3.11.0-r4, zlib to 1.3.2-r0. --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2cc246e..82a391b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,12 +27,13 @@ RUN echo "https://dl-cdn.alpinelinux.org/alpine/v3.23/community/" >/etc/apk/repo nss_wrapper=1.1.12-r1 \ pcre2=10.47-r0 \ procps-ng=4.0.5-r0 \ - sops=3.11.0-r3 \ + sops=3.11.0-r4 \ sysstat=12.7.8-r0 \ tcpdump=4.99.5-r1 \ wget=1.25.0-r2 \ xz-libs=5.8.2-r0 \ - zip=3.0-r13 && \ + zip=3.0-r13 \ + zlib=1.3.2-r0 && \ rm -rf /var/cache/apk/* COPY deployments/install deployments/install From 8feafe3933caef93cb888acd01b47998620e42ba Mon Sep 17 00:00:00 2001 From: kagw95 Date: Wed, 11 Mar 2026 17:33:28 +0400 Subject: [PATCH 11/29] fix: Bump clover-maven-plugin to 4.5.2. --- atp-dataset-migration/pom.xml | 2 +- atp-dataset/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/atp-dataset-migration/pom.xml b/atp-dataset-migration/pom.xml index 2342b6e..eb64dc2 100644 --- a/atp-dataset-migration/pom.xml +++ b/atp-dataset-migration/pom.xml @@ -313,7 +313,7 @@ org.openclover clover-maven-plugin - 4.5.0 + 4.5.2 21 21 diff --git a/atp-dataset/pom.xml b/atp-dataset/pom.xml index 0fe1ed2..e85d888 100644 --- a/atp-dataset/pom.xml +++ b/atp-dataset/pom.xml @@ -976,7 +976,7 @@ org.openclover clover-maven-plugin - 4.5.0 + 4.5.2 21 21 From 726ee27f38b1cddece22525d41f335c5c5ba2ff3 Mon Sep 17 00:00:00 2001 From: kagw95 Date: Wed, 11 Mar 2026 17:38:29 +0400 Subject: [PATCH 12/29] build(deps): bump netcracker/qubership-workflow-hub to 2.1.1. --- .github/workflows/dev-mvn-docker-build.yaml | 6 +++--- .github/workflows/maven-release-v2.yaml | 6 +++--- .github/workflows/pr-assigner.yml | 2 +- .github/workflows/security-scan.yml | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/dev-mvn-docker-build.yaml b/.github/workflows/dev-mvn-docker-build.yaml index 97c6be0..47e19bf 100644 --- a/.github/workflows/dev-mvn-docker-build.yaml +++ b/.github/workflows/dev-mvn-docker-build.yaml @@ -64,7 +64,7 @@ jobs: - name: Maven Docker build id: maven_build - uses: netcracker/qubership-workflow-hub/actions/maven-snapshot-deploy@8d542a426ce561c7dce745f6b9cee068d1d7e101 # v2.0.10 + uses: netcracker/qubership-workflow-hub/actions/maven-snapshot-deploy@5edd67e98d2f0eec5ab77b4deca0e1d481137462 # v2.1.1 with: java-version: "21" additional-mvn-args: ${{ env.additional-mvn-args }} @@ -139,13 +139,13 @@ jobs: - name: Metadata id: metadata - uses: netcracker/qubership-workflow-hub/actions/metadata-action@8d542a426ce561c7dce745f6b9cee068d1d7e101 #v2.0.10 + uses: netcracker/qubership-workflow-hub/actions/metadata-action@5edd67e98d2f0eec5ab77b4deca0e1d481137462 # v2.1.1 with: default-template: '{{ref-name}}-{{timestamp}}' - name: Build and Publish Docker Image id: docker_build - uses: netcracker/qubership-workflow-hub/actions/docker-action@8d542a426ce561c7dce745f6b9cee068d1d7e101 #v2.0.10 + uses: netcracker/qubership-workflow-hub/actions/docker-action@5edd67e98d2f0eec5ab77b4deca0e1d481137462 # v2.1.1 with: ref: ${{ github.ref }} dry-run: false diff --git a/.github/workflows/maven-release-v2.yaml b/.github/workflows/maven-release-v2.yaml index 064ead6..51a46d2 100644 --- a/.github/workflows/maven-release-v2.yaml +++ b/.github/workflows/maven-release-v2.yaml @@ -87,7 +87,7 @@ jobs: mongo_db: dsgridfs - name: "Build and Publish current SNAPSHOT (dry run)" - uses: netcracker/qubership-workflow-hub/actions/maven-release@8d542a426ce561c7dce745f6b9cee068d1d7e101 #v2.0.10 + uses: netcracker/qubership-workflow-hub/actions/maven-release@5edd67e98d2f0eec5ab77b4deca0e1d481137462 # v2.1.1 with: java-version: "21" version-type: ${{ github.event.inputs.version-type }} @@ -140,7 +140,7 @@ jobs: - name: "Build and Publish" id: build-and-publish - uses: netcracker/qubership-workflow-hub/actions/maven-release@8d542a426ce561c7dce745f6b9cee068d1d7e101 #v2.0.10 + uses: netcracker/qubership-workflow-hub/actions/maven-release@5edd67e98d2f0eec5ab77b4deca0e1d481137462 # v2.1.1 with: java-version: "21" version-type: ${{ github.event.inputs.version-type }} @@ -212,7 +212,7 @@ jobs: steps: - name: "Docker Build" id: docker_build - uses: netcracker/qubership-workflow-hub/actions/docker-action@8d542a426ce561c7dce745f6b9cee068d1d7e101 #v2.0.10 + uses: netcracker/qubership-workflow-hub/actions/docker-action@5edd67e98d2f0eec5ab77b4deca0e1d481137462 # v2.1.1 with: ref: v${{ needs.deploy.outputs.release-version }} download-artifact: true diff --git a/.github/workflows/pr-assigner.yml b/.github/workflows/pr-assigner.yml index d22b0f8..bb7f94f 100644 --- a/.github/workflows/pr-assigner.yml +++ b/.github/workflows/pr-assigner.yml @@ -26,6 +26,6 @@ jobs: with: persist-credentials: false - - uses: netcracker/qubership-workflow-hub/actions/pr-assigner@8d542a426ce561c7dce745f6b9cee068d1d7e101 #2.0.10 + - uses: netcracker/qubership-workflow-hub/actions/pr-assigner@5edd67e98d2f0eec5ab77b4deca0e1d481137462 # v2.1.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/security-scan.yml b/.github/workflows/security-scan.yml index db2cac5..8933ac3 100644 --- a/.github/workflows/security-scan.yml +++ b/.github/workflows/security-scan.yml @@ -60,7 +60,7 @@ jobs: steps: - name: List GHCR packages for this repo id: ghcr - uses: Netcracker/qubership-workflow-hub/actions/ghcr-discover-repo-packages@8d542a426ce561c7dce745f6b9cee068d1d7e101 #v2.0.10 + uses: Netcracker/qubership-workflow-hub/actions/ghcr-discover-repo-packages@5edd67e98d2f0eec5ab77b4deca0e1d481137462 # v2.1.1 env: GH_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} @@ -85,7 +85,7 @@ jobs: package: ${{ fromJson(needs.debug-packages.outputs.packages) }} name: "Run Security Scan (matrix)" - uses: netcracker/qubership-workflow-hub/.github/workflows/re-security-scan.yml@8d542a426ce561c7dce745f6b9cee068d1d7e101 #v2.0.10 + uses: netcracker/qubership-workflow-hub/.github/workflows/re-security-scan.yml@5edd67e98d2f0eec5ab77b4deca0e1d481137462 # v2.1.1 with: target: ${{ inputs.target || 'docker' }} image: ${{ format('{0}:{1}', matrix.package.path, inputs.tag || 'latest') }} @@ -94,7 +94,7 @@ jobs: needs: debug-packages if: ${{ inputs.image != '' && inputs.image != null }} name: "Run Security Scan (single image)" - uses: netcracker/qubership-workflow-hub/.github/workflows/re-security-scan.yml@8d542a426ce561c7dce745f6b9cee068d1d7e101 #v2.0.10 + uses: netcracker/qubership-workflow-hub/.github/workflows/re-security-scan.yml@5edd67e98d2f0eec5ab77b4deca0e1d481137462 # v2.1.1 with: target: ${{ inputs.target || 'docker' }} image: ${{ inputs.image }} From 691f388b84f8a987e49994244693f2a8cd65e53f Mon Sep 17 00:00:00 2001 From: kagw95 Date: Wed, 11 Mar 2026 18:46:05 +0400 Subject: [PATCH 13/29] fix: java version is set to 21 for maven-compiler-plugin and org.openclover:clover-maven-plugin. --- atp-dataset-migration/pom.xml | 5 ++++- atp-dataset-q-classes-generation/pom.xml | 4 ++++ atp-dataset/pom.xml | 6 ++++-- pom.xml | 3 +++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/atp-dataset-migration/pom.xml b/atp-dataset-migration/pom.xml index eb64dc2..b651ecd 100644 --- a/atp-dataset-migration/pom.xml +++ b/atp-dataset-migration/pom.xml @@ -315,7 +315,10 @@ clover-maven-plugin 4.5.2 - 21 + ${java.version} + ${java.version} + ${java.version} + 21 21 21 ${project.build.directory}/clover diff --git a/atp-dataset-q-classes-generation/pom.xml b/atp-dataset-q-classes-generation/pom.xml index bdf313d..19ffd9a 100644 --- a/atp-dataset-q-classes-generation/pom.xml +++ b/atp-dataset-q-classes-generation/pom.xml @@ -258,6 +258,10 @@ maven-compiler-plugin 3.15.0 + + ${java.version} + true + pg-compile diff --git a/atp-dataset/pom.xml b/atp-dataset/pom.xml index e85d888..3fa62a3 100644 --- a/atp-dataset/pom.xml +++ b/atp-dataset/pom.xml @@ -978,9 +978,11 @@ clover-maven-plugin 4.5.2 - 21 - 21 + ${java.version} + ${java.version} + ${java.version} 21 + 21 ${project.build.directory}/clover true true diff --git a/pom.xml b/pom.xml index 80fe100..36f257c 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,9 @@ 21 + 21 + 21 + 21 true UTF-8 From af71f9503d563e72bab5eaa82105a15fbbbdbd74 Mon Sep 17 00:00:00 2001 From: kagw95 Date: Wed, 11 Mar 2026 18:50:11 +0400 Subject: [PATCH 14/29] fix: ParameterControllerV2Test and ItfMultiplyTest Unit tests are fixed, @ConditionalOnMissingBean annotation is added for DataSource bean. Default values (for test database) are added for jdbc connection properties. --- .../src/main/config/application.properties | 10 +++++----- .../atp/dataset/config/DbConfiguration.java | 4 +++- .../service/direct/ItfMultiplyTest.java | 14 +++++++------- .../server/v2/ParameterControllerV2Test.java | 19 +++++++------------ 4 files changed, 22 insertions(+), 25 deletions(-) diff --git a/atp-dataset/src/main/config/application.properties b/atp-dataset/src/main/config/application.properties index 0c5ad9d..d4a8ba1 100644 --- a/atp-dataset/src/main/config/application.properties +++ b/atp-dataset/src/main/config/application.properties @@ -12,11 +12,11 @@ service.https.enabled=${HTTPS_ENABLE:false} spring.main.allow-circular-references=true nashorn.args="-strict --no-java --no-syntax-extensions" ##==================DB===================== -jdbc.Url=${jdbc.Url} -jdbc.Driver=${jdbc.Driver} -jdbc.User=${jdbc.User} -jdbc.Password=${jdbc.Password} -jdbc.Dialect=${jdbc.Dialect} +jdbc.Url=${jdbc.Url:jdbc:postgresql://localhost:5432/datasets} +jdbc.Driver=${jdbc.Driver:org.postgresql.Driver} +jdbc.User=${jdbc.User:datasets} +jdbc.Password=${jdbc.Password:datasets} +jdbc.Dialect=${jdbc.Dialect:com.querydsl.sql.PostgreSQLTemplates} jdbc.leak.detection.threshold=${JDBC_LEAK_DETECTION_THRESHOLD:900} spring.liquibase.change-log=classpath:changelog/changelog-main.xml dataset.migration.module.launch.enabled = ${MIGRATION_MODULE_LAUNCH_ENABLED:false} diff --git a/atp-dataset/src/main/java/org/qubership/atp/dataset/config/DbConfiguration.java b/atp-dataset/src/main/java/org/qubership/atp/dataset/config/DbConfiguration.java index 29bc0e3..f8280ff 100644 --- a/atp-dataset/src/main/java/org/qubership/atp/dataset/config/DbConfiguration.java +++ b/atp-dataset/src/main/java/org/qubership/atp/dataset/config/DbConfiguration.java @@ -1,5 +1,5 @@ /* - * # Copyright 2024-2025 NetCracker Technology Corporation + * # Copyright 2024-2026 NetCracker Technology Corporation * # * # Licensed under the Apache License, Version 2.0 (the "License"); * # you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ import org.qubership.atp.dataset.db.DBConfig; import org.qubership.atp.dataset.db.DbConfigImpl; import org.qubership.atp.dataset.service.direct.helper.DbCreationFacade; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -62,6 +63,7 @@ public DBConfig dbConfig() { */ @Bean + @ConditionalOnMissingBean(DataSource.class) public DataSource dataSource(DBConfig dbconfig) { HikariConfig config = new HikariConfig(); config.setLeakDetectionThreshold(SECONDS.toMillis(dbconfig.getLeakDetectionThreshold())); diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/ItfMultiplyTest.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/ItfMultiplyTest.java index 3d97b6a..1407b6e 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/ItfMultiplyTest.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/direct/ItfMultiplyTest.java @@ -27,12 +27,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Isolated; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.google.common.collect.Sets; import org.qubership.atp.dataset.JsonMatcher; import org.qubership.atp.dataset.config.MockJaversCommitEntityServiceConfiguration; import org.qubership.atp.dataset.config.TestConfiguration; @@ -43,6 +37,12 @@ import org.qubership.atp.dataset.model.utils.Utils; import org.qubership.atp.dataset.service.AbstractTest; import org.qubership.atp.dataset.service.rest.dto.manager.UiManDataSetList; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.google.common.collect.Sets; @Isolated @ContextConfiguration(classes = {TestConfiguration.class, MockJaversCommitEntityServiceConfiguration.class}) @@ -59,7 +59,7 @@ public void dsWithMixins_SerializeForUI_ContainMixinData() throws IOException { } @Test - public void dsWithMixins_GetAllEvaluated_HasValidNames() throws IOException { + public void dsWithMixins_GetAllEvaluated_HasValidNames() { MultiplyTestData d = createTestDataInstance(MultiplyTestData::new); List children = dataSetListService.getChildren(d.mix.getDataSetList().getId(), true); List childrenNames = children.stream().map(Named::getName).collect(Collectors.toList()); diff --git a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/rest/server/v2/ParameterControllerV2Test.java b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/rest/server/v2/ParameterControllerV2Test.java index 67f21c6..d2f7c49 100644 --- a/atp-dataset/src/test/java/org/qubership/atp/dataset/service/rest/server/v2/ParameterControllerV2Test.java +++ b/atp-dataset/src/test/java/org/qubership/atp/dataset/service/rest/server/v2/ParameterControllerV2Test.java @@ -1,5 +1,5 @@ /* - * # Copyright 2024-2025 NetCracker Technology Corporation + * # Copyright 2024-2026 NetCracker Technology Corporation * # * # Licensed under the Apache License, Version 2.0 (the "License"); * # you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.context.annotation.Import; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.jdbc.Sql; import org.springframework.test.web.servlet.MockMvc; @@ -50,7 +50,7 @@ @Isolated @SpringBootTest -@ContextConfiguration(classes = {TestConfiguration.class}) +@Import(TestConfiguration.class) @AutoConfigureMockMvc(addFilters = false) @TestPropertySource(properties = {"atp-dataset.javers.enabled=false"}) class ParameterControllerV2Test extends AbstractJpaTest { @@ -116,8 +116,8 @@ void update_notExistingVisibilityArea_internalServerError() throws Exception { if (e.getCause() != null) { assertThat(e.getCause(), instanceOf(IllegalArgumentException.class)); String causedByMessage = e.getCause().toString(); - assertThat(causedByMessage, matchesToRegExp(".*Can not change parameter with attribute id: .* " + - "because dataset id locked.*")); + assertThat(causedByMessage, matchesToRegExp( + ".*Can not change parameter with attribute id: .* because dataset id locked.*")); } } } @@ -171,8 +171,8 @@ void create_notExistingVisibilityArea_internalServerError() throws Exception { if (e.getCause() != null) { assertThat(e.getCause(), instanceOf(AopInvocationException.class)); String causedByMessage = e.getCause().toString(); - assertThat(causedByMessage, StringContains.containsString("Null return value from advice " + - "does not match primitive return type for")); + assertThat(causedByMessage, StringContains.containsString( + "Null return value from advice does not match primitive return type for")); } } } @@ -231,11 +231,6 @@ void bulkUpdateAttribute_notExistingVisibilityArea_InternalServerError() throws at org.qubership.atp.dataset.service.rest.server.v2.ParameterControllerV2Test .bulkUpdateAttribute_notExistingVisibilityArea_InternalServerError(ParameterControllerV2Test.java:199) */ - /* - System.out.println("Exception: " + e - + "\nMessage: " + e.getMessage() - + "\nCaused by: " + e.getCause()); - */ if (e.getCause() != null) { assertThat(e.getCause(), instanceOf(NullPointerException.class)); String causedByMessage = e.getCause().toString(); From 5da75ef6941ec50bc44cf0b975d58b0eaaf507b7 Mon Sep 17 00:00:00 2001 From: kagw95 Date: Wed, 11 Mar 2026 22:09:27 +0400 Subject: [PATCH 15/29] fix: org.openclover:clover-maven-plugin configuration is fixed to work with java 21 properly. --- atp-dataset-migration/pom.xml | 27 +++++++++++++++++++++------ atp-dataset/pom.xml | 26 +++++++++++++++++++++----- 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/atp-dataset-migration/pom.xml b/atp-dataset-migration/pom.xml index b651ecd..56e8742 100644 --- a/atp-dataset-migration/pom.xml +++ b/atp-dataset-migration/pom.xml @@ -315,12 +315,27 @@ clover-maven-plugin 4.5.2 - ${java.version} - ${java.version} - ${java.version} - 21 - 21 - 21 + 21 + 21 + + -source + 21 + -target + 21 + + + + -source + 21 + -target + 21 + + + 21 + + + 21 + ${project.build.directory}/clover true true diff --git a/atp-dataset/pom.xml b/atp-dataset/pom.xml index 3fa62a3..e1fbebf 100644 --- a/atp-dataset/pom.xml +++ b/atp-dataset/pom.xml @@ -978,11 +978,27 @@ clover-maven-plugin 4.5.2 - ${java.version} - ${java.version} - ${java.version} - 21 - 21 + 21 + 21 + + -source + 21 + -target + 21 + + + + -source + 21 + -target + 21 + + + 21 + + + 21 + ${project.build.directory}/clover true true From 8215c72798a456234436bf3cd9f9c234888d0b2a Mon Sep 17 00:00:00 2001 From: kagw95 Date: Wed, 11 Mar 2026 23:01:51 +0400 Subject: [PATCH 16/29] fix: org.openclover:clover-maven-plugin is removed from build configuration (due to java 21 isn't supported). maven-failsafe-plugin version is changed to 3.2.5. --- atp-dataset-migration/pom.xml | 63 --------------------------------- atp-dataset/pom.xml | 65 +---------------------------------- 2 files changed, 1 insertion(+), 127 deletions(-) diff --git a/atp-dataset-migration/pom.xml b/atp-dataset-migration/pom.xml index 56e8742..cb52dba 100644 --- a/atp-dataset-migration/pom.xml +++ b/atp-dataset-migration/pom.xml @@ -300,69 +300,6 @@ - - with-analyzers - - - enable-analyzers - true - - - - - - org.openclover - clover-maven-plugin - 4.5.2 - - 21 - 21 - - -source - 21 - -target - 21 - - - - -source - 21 - -target - 21 - - - 21 - - - 21 - - ${project.build.directory}/clover - true - true - false - 22% - - - - clover-instrument - initialize - - instrument-test - - - - clover-report - verify - - clover - check - - - - - - - migration-on-build-pg diff --git a/atp-dataset/pom.xml b/atp-dataset/pom.xml index e1fbebf..38275bb 100644 --- a/atp-dataset/pom.xml +++ b/atp-dataset/pom.xml @@ -963,69 +963,6 @@ - - with-analyzers - - - enable-analyzers - true - - - - - - org.openclover - clover-maven-plugin - 4.5.2 - - 21 - 21 - - -source - 21 - -target - 21 - - - - -source - 21 - -target - 21 - - - 21 - - - 21 - - ${project.build.directory}/clover - true - true - false - 47% - - - - clover-instrument - initialize - - instrument-test - - - - clover-report - verify - - clover - check - - - - - - - run-integration-tests @@ -1040,7 +977,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.0 + 3.2.5 From 1d9154a9e71ec54339b5200f5d811426cd509a46 Mon Sep 17 00:00:00 2001 From: kagw95 Date: Wed, 11 Mar 2026 23:35:37 +0400 Subject: [PATCH 17/29] build: Project version is set to 2.0.0-SNAPSHOT. --- atp-dataset-benchmarks/pom.xml | 2 +- atp-dataset-common/pom.xml | 2 +- atp-dataset-distribution/pom.xml | 2 +- atp-dataset-import/pom.xml | 2 +- atp-dataset-migration/pom.xml | 2 +- atp-dataset-openapi-specifications/pom.xml | 4 ++-- atp-dataset-q-classes-generation/pom.xml | 2 +- atp-dataset/pom.xml | 2 +- parent/parent-db-properties/pom.xml | 2 +- parent/parent-db/pom.xml | 2 +- parent/parent-dependencies/pom.xml | 2 +- parent/parent-java/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/atp-dataset-benchmarks/pom.xml b/atp-dataset-benchmarks/pom.xml index cba6d12..4154d7d 100644 --- a/atp-dataset-benchmarks/pom.xml +++ b/atp-dataset-benchmarks/pom.xml @@ -5,7 +5,7 @@ org.qubership.atp.dataset atp-dataset-parent-dependencies - 1.3.174-SNAPSHOT + 2.0.0-SNAPSHOT ../parent/parent-dependencies/pom.xml diff --git a/atp-dataset-common/pom.xml b/atp-dataset-common/pom.xml index f230d88..505ea37 100644 --- a/atp-dataset-common/pom.xml +++ b/atp-dataset-common/pom.xml @@ -3,7 +3,7 @@ org.qubership.atp.dataset atp-dataset-parent-java - 1.3.174-SNAPSHOT + 2.0.0-SNAPSHOT ../parent/parent-java/pom.xml 4.0.0 diff --git a/atp-dataset-distribution/pom.xml b/atp-dataset-distribution/pom.xml index 5e02b3e..69f59dd 100644 --- a/atp-dataset-distribution/pom.xml +++ b/atp-dataset-distribution/pom.xml @@ -5,7 +5,7 @@ org.qubership.atp.dataset atp-dataset-parent-dependencies - 1.3.174-SNAPSHOT + 2.0.0-SNAPSHOT ../parent/parent-dependencies/pom.xml diff --git a/atp-dataset-import/pom.xml b/atp-dataset-import/pom.xml index 980d001..be60fc4 100644 --- a/atp-dataset-import/pom.xml +++ b/atp-dataset-import/pom.xml @@ -3,7 +3,7 @@ org.qubership.atp.dataset atp-dataset-parent-db - 1.3.174-SNAPSHOT + 2.0.0-SNAPSHOT ../parent/parent-db/pom.xml diff --git a/atp-dataset-migration/pom.xml b/atp-dataset-migration/pom.xml index cb52dba..6c0be41 100644 --- a/atp-dataset-migration/pom.xml +++ b/atp-dataset-migration/pom.xml @@ -3,7 +3,7 @@ org.qubership.atp.dataset atp-dataset-parent-db-properties - 1.3.174-SNAPSHOT + 2.0.0-SNAPSHOT ../parent/parent-db-properties/pom.xml diff --git a/atp-dataset-openapi-specifications/pom.xml b/atp-dataset-openapi-specifications/pom.xml index 9bf21ae..70080e9 100644 --- a/atp-dataset-openapi-specifications/pom.xml +++ b/atp-dataset-openapi-specifications/pom.xml @@ -5,13 +5,13 @@ org.qubership.atp.dataset atp-dataset-parent-dependencies - 1.3.174-SNAPSHOT + 2.0.0-SNAPSHOT ../parent/parent-dependencies/pom.xml atp-dataset-openapi-specifications atp-dataset-openapi-specifications - 1.3.174-SNAPSHOT + 2.0.0-SNAPSHOT jar diff --git a/atp-dataset-q-classes-generation/pom.xml b/atp-dataset-q-classes-generation/pom.xml index 19ffd9a..81bdb31 100644 --- a/atp-dataset-q-classes-generation/pom.xml +++ b/atp-dataset-q-classes-generation/pom.xml @@ -3,7 +3,7 @@ org.qubership.atp.dataset atp-dataset-parent-db-properties - 1.3.174-SNAPSHOT + 2.0.0-SNAPSHOT ../parent/parent-db-properties/pom.xml diff --git a/atp-dataset/pom.xml b/atp-dataset/pom.xml index 38275bb..7191f56 100644 --- a/atp-dataset/pom.xml +++ b/atp-dataset/pom.xml @@ -3,7 +3,7 @@ org.qubership.atp.dataset atp-dataset-parent-db - 1.3.174-SNAPSHOT + 2.0.0-SNAPSHOT ../parent/parent-db/pom.xml diff --git a/parent/parent-db-properties/pom.xml b/parent/parent-db-properties/pom.xml index 3a73daa..fa454ea 100644 --- a/parent/parent-db-properties/pom.xml +++ b/parent/parent-db-properties/pom.xml @@ -3,7 +3,7 @@ org.qubership.atp.dataset atp-dataset-parent-java - 1.3.174-SNAPSHOT + 2.0.0-SNAPSHOT ../parent-java/pom.xml pom diff --git a/parent/parent-db/pom.xml b/parent/parent-db/pom.xml index 8f5598e..df90e46 100644 --- a/parent/parent-db/pom.xml +++ b/parent/parent-db/pom.xml @@ -4,7 +4,7 @@ org.qubership.atp.dataset atp-dataset-parent-db-properties - 1.3.174-SNAPSHOT + 2.0.0-SNAPSHOT ../parent-db-properties/pom.xml diff --git a/parent/parent-dependencies/pom.xml b/parent/parent-dependencies/pom.xml index cb2af42..8ccc4f8 100644 --- a/parent/parent-dependencies/pom.xml +++ b/parent/parent-dependencies/pom.xml @@ -5,7 +5,7 @@ org.qubership.atp.dataset atp-dataset-aggregator - 1.3.174-SNAPSHOT + 2.0.0-SNAPSHOT ../../pom.xml diff --git a/parent/parent-java/pom.xml b/parent/parent-java/pom.xml index 7421831..6449b3d 100644 --- a/parent/parent-java/pom.xml +++ b/parent/parent-java/pom.xml @@ -3,7 +3,7 @@ org.qubership.atp.dataset atp-dataset-parent-dependencies - 1.3.174-SNAPSHOT + 2.0.0-SNAPSHOT ../parent-dependencies/pom.xml diff --git a/pom.xml b/pom.xml index 36f257c..0021def 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.qubership.atp.dataset atp-dataset-aggregator - 1.3.174-SNAPSHOT + 2.0.0-SNAPSHOT pom From 18997689d8d22db6ff2190eb3532c8dc768cd5d5 Mon Sep 17 00:00:00 2001 From: kagw95 Date: Thu, 12 Mar 2026 09:14:12 +0400 Subject: [PATCH 18/29] build: maven-compiler-plugin configuration is fixed (annotation processors are reordered). --- atp-dataset/pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/atp-dataset/pom.xml b/atp-dataset/pom.xml index 7191f56..e00b039 100644 --- a/atp-dataset/pom.xml +++ b/atp-dataset/pom.xml @@ -535,7 +535,7 @@ org.springdoc springdoc-openapi-starter-webmvc-ui - 2.6.0 + 2.6.0 @@ -603,16 +603,16 @@ ${java.version} true - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - org.projectlombok lombok ${lombok.version} + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + org.projectlombok lombok-mapstruct-binding From c54eac41c38c971c944ab39966968bb324efd461 Mon Sep 17 00:00:00 2001 From: kagw95 Date: Thu, 12 Mar 2026 11:11:54 +0400 Subject: [PATCH 19/29] fix(security): Bump jackson to 2.18.6, httpclient5 to 5.4.3, commons-fileupload to 1.6.0, tika-core to 3.2.2. Improve dependency management of hazelcast dependencies. --- parent/parent-dependencies/pom.xml | 33 ++++++++++++++++++++++++------ pom.xml | 2 -- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/parent/parent-dependencies/pom.xml b/parent/parent-dependencies/pom.xml index 8ccc4f8..5778fd4 100644 --- a/parent/parent-dependencies/pom.xml +++ b/parent/parent-dependencies/pom.xml @@ -35,8 +35,8 @@ 4.1.0 4.14.0 3.1.11 - 2.17.3 - 4.2.6 + 2.18.6 + 5.3.5 1.5.5.Final 1.18.42 2.3.21.Final @@ -54,7 +54,7 @@ org.apache.httpcomponents.client5 httpclient5 - 5.4.1 + 5.4.3 org.apache.httpcomponents.core5 @@ -560,9 +560,9 @@ 1.21 - org.apache.commons - commons-fileupload2-jakarta-servlet5 - 2.0.0-M4 + commons-fileupload + commons-fileupload + 1.6.0 io.netty @@ -629,6 +629,27 @@ kafka-clients 3.9.1 + + org.apache.tika + tika-core + 3.2.2 + + + com.hazelcast + hazelcast-spring + 5.3.5 + + + com.hazelcast + hazelcast + 5.3.5 + + + com.fasterxml.jackson.core + jackson-core + + + diff --git a/pom.xml b/pom.xml index 0021def..36ac453 100644 --- a/pom.xml +++ b/pom.xml @@ -202,12 +202,10 @@ com.hazelcast hazelcast-spring - 5.3.5 com.hazelcast hazelcast - 5.3.5 From 22f67314601b0771a874fc4f72eb8663a636ad24 Mon Sep 17 00:00:00 2001 From: kagw95 Date: Thu, 12 Mar 2026 11:55:55 +0400 Subject: [PATCH 20/29] build: fix conditions of run-tests step. --- .github/workflows/dev-mvn-docker-build.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dev-mvn-docker-build.yaml b/.github/workflows/dev-mvn-docker-build.yaml index 47e19bf..224fccd 100644 --- a/.github/workflows/dev-mvn-docker-build.yaml +++ b/.github/workflows/dev-mvn-docker-build.yaml @@ -161,10 +161,12 @@ jobs: run-tests: needs: [ build-and-push ] if: | - needs.build-and-push.result == 'success' && - ( - github.event_name == 'pull_request' || - (github.event_name == 'push' && github.ref == 'refs/heads/main') + needs.build-and-push.result == 'success' && ( + github.event_name == 'pull_request' || + (github.event_name == 'push' && ( + github.ref == 'refs/heads/main' || + startsWith(github.ref, 'refs/pull/') + )) ) uses: netcracker/qubership-testing-platform-helm-hook-helper/.github/workflows/deploy-run-tests.yaml@main with: From 6836a9236b099c0b55c28fe4842bc0492e2939ca Mon Sep 17 00:00:00 2001 From: kagw95 Date: Thu, 12 Mar 2026 12:00:27 +0400 Subject: [PATCH 21/29] fix: pom.xml is cleansed. --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 36ac453..4ff21f6 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,6 @@ 21 21 21 - 21 true UTF-8 From 0d5cd6ec1d2c9215e6a68c4b8f8d3cd784b36aaf Mon Sep 17 00:00:00 2001 From: dale1020 Date: Thu, 12 Mar 2026 13:43:59 +0500 Subject: [PATCH 22/29] update if in run-tests --- .github/workflows/dev-mvn-docker-build.yaml | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dev-mvn-docker-build.yaml b/.github/workflows/dev-mvn-docker-build.yaml index 224fccd..f75965b 100644 --- a/.github/workflows/dev-mvn-docker-build.yaml +++ b/.github/workflows/dev-mvn-docker-build.yaml @@ -162,10 +162,10 @@ jobs: needs: [ build-and-push ] if: | needs.build-and-push.result == 'success' && ( - github.event_name == 'pull_request' || + github.event_name == 'pull_request' || (github.event_name == 'push' && ( github.ref == 'refs/heads/main' || - startsWith(github.ref, 'refs/pull/') + github.event.pull_request != null )) ) uses: netcracker/qubership-testing-platform-helm-hook-helper/.github/workflows/deploy-run-tests.yaml@main diff --git a/pom.xml b/pom.xml index 4ff21f6..cdf007a 100644 --- a/pom.xml +++ b/pom.xml @@ -304,4 +304,4 @@ - \ No newline at end of file + From b1ce8071754223cd8a405d2152fa810c217619b0 Mon Sep 17 00:00:00 2001 From: dale1020 Date: Thu, 12 Mar 2026 14:33:29 +0500 Subject: [PATCH 23/29] update if in run-tests --- .github/workflows/dev-mvn-docker-build.yaml | 13 +++++++------ pom.xml | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dev-mvn-docker-build.yaml b/.github/workflows/dev-mvn-docker-build.yaml index f75965b..efc8639 100644 --- a/.github/workflows/dev-mvn-docker-build.yaml +++ b/.github/workflows/dev-mvn-docker-build.yaml @@ -161,12 +161,13 @@ jobs: run-tests: needs: [ build-and-push ] if: | - needs.build-and-push.result == 'success' && ( - github.event_name == 'pull_request' || - (github.event_name == 'push' && ( - github.ref == 'refs/heads/main' || - github.event.pull_request != null - )) + needs.build-and-push.result == 'success' && + ( + ( + github.event_name == 'pull_request' && github.base_ref == 'main' + ) || ( + github.event_name == 'push' && github.ref == 'refs/heads/main' + ) ) uses: netcracker/qubership-testing-platform-helm-hook-helper/.github/workflows/deploy-run-tests.yaml@main with: diff --git a/pom.xml b/pom.xml index cdf007a..4ff21f6 100644 --- a/pom.xml +++ b/pom.xml @@ -304,4 +304,4 @@ - + \ No newline at end of file From 9e38da4b97fdc2abd0560d4c5149f3664ca184bb Mon Sep 17 00:00:00 2001 From: dale1020 Date: Thu, 12 Mar 2026 15:01:45 +0500 Subject: [PATCH 24/29] update if in run-tests --- .github/workflows/dev-mvn-docker-build.yaml | 8 +------- pom.xml | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/dev-mvn-docker-build.yaml b/.github/workflows/dev-mvn-docker-build.yaml index efc8639..db0b7e1 100644 --- a/.github/workflows/dev-mvn-docker-build.yaml +++ b/.github/workflows/dev-mvn-docker-build.yaml @@ -162,13 +162,7 @@ jobs: needs: [ build-and-push ] if: | needs.build-and-push.result == 'success' && - ( - ( - github.event_name == 'pull_request' && github.base_ref == 'main' - ) || ( - github.event_name == 'push' && github.ref == 'refs/heads/main' - ) - ) + (github.event_name == 'pull_request' && github.base_ref == 'main' || github.event_name == 'push' && (github.ref == 'refs/heads/main' || steps.pr_check.outputs.result == 'true')) uses: netcracker/qubership-testing-platform-helm-hook-helper/.github/workflows/deploy-run-tests.yaml@main with: repository_name: 'qubership-testing-platform-datasets' diff --git a/pom.xml b/pom.xml index 4ff21f6..cdf007a 100644 --- a/pom.xml +++ b/pom.xml @@ -304,4 +304,4 @@ - \ No newline at end of file + From 472121553f86431fb77a5e6b23b1fc4e16abd124 Mon Sep 17 00:00:00 2001 From: dale1020 Date: Thu, 12 Mar 2026 15:03:16 +0500 Subject: [PATCH 25/29] update if in run-tests --- .github/workflows/dev-mvn-docker-build.yaml | 7 +++++-- pom.xml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dev-mvn-docker-build.yaml b/.github/workflows/dev-mvn-docker-build.yaml index db0b7e1..f08e9f2 100644 --- a/.github/workflows/dev-mvn-docker-build.yaml +++ b/.github/workflows/dev-mvn-docker-build.yaml @@ -161,8 +161,11 @@ jobs: run-tests: needs: [ build-and-push ] if: | - needs.build-and-push.result == 'success' && - (github.event_name == 'pull_request' && github.base_ref == 'main' || github.event_name == 'push' && (github.ref == 'refs/heads/main' || steps.pr_check.outputs.result == 'true')) + needs.build-and-push.result == 'success' && + ( + (github.event_name == 'pull_request' && github.base_ref == 'main') || + (github.event_name == 'push' && (github.ref == 'refs/heads/main' || steps.pr_check.outputs.result == 'true')) + ) uses: netcracker/qubership-testing-platform-helm-hook-helper/.github/workflows/deploy-run-tests.yaml@main with: repository_name: 'qubership-testing-platform-datasets' diff --git a/pom.xml b/pom.xml index cdf007a..4ff21f6 100644 --- a/pom.xml +++ b/pom.xml @@ -304,4 +304,4 @@ - + \ No newline at end of file From 792b0cb33d505d40679906b5aa87e35f7858e5b3 Mon Sep 17 00:00:00 2001 From: dale1020 Date: Thu, 12 Mar 2026 15:14:26 +0500 Subject: [PATCH 26/29] update if in run-tests --- .github/workflows/dev-mvn-docker-build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dev-mvn-docker-build.yaml b/.github/workflows/dev-mvn-docker-build.yaml index f08e9f2..47e19bf 100644 --- a/.github/workflows/dev-mvn-docker-build.yaml +++ b/.github/workflows/dev-mvn-docker-build.yaml @@ -161,10 +161,10 @@ jobs: run-tests: needs: [ build-and-push ] if: | - needs.build-and-push.result == 'success' && + needs.build-and-push.result == 'success' && ( - (github.event_name == 'pull_request' && github.base_ref == 'main') || - (github.event_name == 'push' && (github.ref == 'refs/heads/main' || steps.pr_check.outputs.result == 'true')) + github.event_name == 'pull_request' || + (github.event_name == 'push' && github.ref == 'refs/heads/main') ) uses: netcracker/qubership-testing-platform-helm-hook-helper/.github/workflows/deploy-run-tests.yaml@main with: From 719f5dceeb5184cfbdc45cf1de46621494e1aed1 Mon Sep 17 00:00:00 2001 From: dale1020 Date: Thu, 12 Mar 2026 15:15:23 +0500 Subject: [PATCH 27/29] update if in run-tests --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4ff21f6..cdf007a 100644 --- a/pom.xml +++ b/pom.xml @@ -304,4 +304,4 @@ - \ No newline at end of file + From 2b237072b2649e1857f5dad44a9a8fe49a496495 Mon Sep 17 00:00:00 2001 From: dale1020 Date: Thu, 12 Mar 2026 15:45:44 +0500 Subject: [PATCH 28/29] update if in run-tests --- .github/workflows/dev-mvn-docker-build.yaml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev-mvn-docker-build.yaml b/.github/workflows/dev-mvn-docker-build.yaml index 47e19bf..4f28454 100644 --- a/.github/workflows/dev-mvn-docker-build.yaml +++ b/.github/workflows/dev-mvn-docker-build.yaml @@ -164,7 +164,7 @@ jobs: needs.build-and-push.result == 'success' && ( github.event_name == 'pull_request' || - (github.event_name == 'push' && github.ref == 'refs/heads/main') + (github.event_name == 'push' && github.event.pull_request.base.ref == 'refs/heads/main') ) uses: netcracker/qubership-testing-platform-helm-hook-helper/.github/workflows/deploy-run-tests.yaml@main with: diff --git a/pom.xml b/pom.xml index cdf007a..4ff21f6 100644 --- a/pom.xml +++ b/pom.xml @@ -304,4 +304,4 @@ - + \ No newline at end of file From bc6026d9e8b328f8e23b828b4cb52fb51971cf24 Mon Sep 17 00:00:00 2001 From: dale1020 Date: Thu, 12 Mar 2026 16:43:49 +0500 Subject: [PATCH 29/29] update if in run-tests --- .github/workflows/dev-mvn-docker-build.yaml | 5 ++--- pom.xml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dev-mvn-docker-build.yaml b/.github/workflows/dev-mvn-docker-build.yaml index 4f28454..f2a8141 100644 --- a/.github/workflows/dev-mvn-docker-build.yaml +++ b/.github/workflows/dev-mvn-docker-build.yaml @@ -21,7 +21,7 @@ on: - ".github/**" workflow_dispatch: {} pull_request: - branches: [main] + branches: main types: [opened, reopened, synchronize] @@ -163,8 +163,7 @@ jobs: if: | needs.build-and-push.result == 'success' && ( - github.event_name == 'pull_request' || - (github.event_name == 'push' && github.event.pull_request.base.ref == 'refs/heads/main') + github.event_name == 'pull_request' ) uses: netcracker/qubership-testing-platform-helm-hook-helper/.github/workflows/deploy-run-tests.yaml@main with: diff --git a/pom.xml b/pom.xml index 4ff21f6..cdf007a 100644 --- a/pom.xml +++ b/pom.xml @@ -304,4 +304,4 @@ - \ No newline at end of file +