From e47a72636fc9458679a8c7dcd1d25bc223320e93 Mon Sep 17 00:00:00 2001 From: CMT Technical User Date: Tue, 26 Aug 2025 09:26:10 +0000 Subject: [PATCH 1/3] Synchronize repository - 2025-08-26 --- README.md | 2 +- REUSE.toml | 11 ++++ commercedbsync/buildcallbacks.xml | 2 +- commercedbsync/extensioninfo.xml | 2 +- commercedbsync/external-dependencies.xml | 2 +- commercedbsync/project.properties | 2 +- .../resources/commercedbsync-beans.xml | 2 +- .../resources/commercedbsync-items.xml | 2 +- .../resources/commercedbsync-spring.xml | 2 +- .../groovy/MigrationSummaryScript.groovy | 4 +- .../resources/groovy/ddlaltercreate.groovy | 2 +- .../projectdata-commercemigration-jobs.impex | 19 ++---- .../commercedbsync-locales_de.properties | 2 +- .../commercedbsync-locales_en.properties | 2 +- .../commercedbsync-locales_es.properties | 2 +- .../commercedbsync-locales_fr.properties | 2 +- .../commercedbsync-locales_it.properties | 2 +- .../commercedbsync-locales_ja.properties | 2 +- .../commercedbsync-locales_ko.properties | 2 +- .../commercedbsync-locales_pt.properties | 2 +- .../commercedbsync-locales_ru.properties | 2 +- .../commercedbsync-locales_zh.properties | 2 +- .../sql/createSchedulerTablesHANA.sql | 2 +- .../sql/createSchemaSchedulerTablesMYSQL.sql | 2 +- .../CommercedbsyncStandalone.java | 2 +- .../adapter/DataRepositoryAdapter.java | 2 +- .../impl/ContextualDataRepositoryAdapter.java | 2 +- .../anonymizer/AnonymizeFunctions.java | 2 +- .../anonymizer/AnonymizerConfigurator.java | 2 +- .../anonymizer/TextEvaluator.java | 2 +- .../anonymizer/TextTokenizer.java | 2 +- .../exception/ValidationException.java | 2 +- .../functions/FunctionEvaluator.java | 2 +- .../functions/impl/GuidFunctionEvaluator.java | 2 +- .../impl/RandomAddressGenerator.java | 2 +- .../impl/RandomFunctionEvaluator.java | 2 +- .../model/AnonymizerConfiguration.java | 2 +- .../anonymizer/model/Column.java | 2 +- .../anonymizer/model/Operation.java | 2 +- .../anonymizer/model/Table.java | 2 +- .../concurrent/DataCopyMethod.java | 2 +- .../commercedbsync/concurrent/DataPipe.java | 5 +- .../concurrent/DataPipeFactory.java | 5 +- .../DataThreadPoolConfigBuilder.java | 2 +- .../concurrent/DataThreadPoolFactory.java | 2 +- .../concurrent/DataThreadPoolMonitor.java | 2 +- .../concurrent/DataWorkerExecutor.java | 2 +- .../concurrent/DataWorkerPoolFactory.java | 2 +- .../concurrent/MDCTaskDecorator.java | 2 +- .../concurrent/MaybeFinished.java | 2 +- .../concurrent/PipeAbortedException.java | 2 +- .../concurrent/impl/DefaultDataPipe.java | 2 +- .../impl/DefaultDataPipeFactory.java | 12 ++-- .../impl/DefaultDataThreadPoolFactory.java | 2 +- .../impl/DefaultDataThreadPoolMonitor.java | 2 +- .../impl/DefaultDataWorkerExecutor.java | 2 +- .../impl/task/BatchMarkerDataReaderTask.java | 2 +- .../impl/task/BatchOffsetDataReaderTask.java | 2 +- .../impl/task/ChunkDataReaderTask.java | 2 +- .../concurrent/impl/task/DataReaderTask.java | 2 +- .../impl/task/DefaultDataReaderTask.java | 2 +- .../PartitionedBatchMarkerDataReaderTask.java | 2 +- .../concurrent/impl/task/PipeTaskContext.java | 2 +- .../concurrent/impl/task/RetriableTask.java | 2 +- .../constants/CommercedbsyncConstants.java | 2 +- .../commercedbsync/context/CopyContext.java | 2 +- .../context/IncrementalMigrationContext.java | 2 +- .../commercedbsync/context/LaunchOptions.java | 2 +- .../context/MigrationContext.java | 2 +- .../context/MigrationContextFactory.java | 4 +- .../context/SchemaDifferenceContext.java | 2 +- .../DefaultIncrementalMigrationContext.java | 6 +- .../context/impl/DefaultMigrationContext.java | 6 +- .../validation/MigrationContextValidator.java | 2 +- .../DefaultMigrationContextValidator.java | 4 +- .../cron/FullMigrationCronJob.java | 2 +- .../cron/IncrementalMigrationCronJob.java | 2 +- .../commercedbsync/cron/MigrationCronJob.java | 2 +- .../commercedbsync/dataset/DataColumn.java | 2 +- .../commercedbsync/dataset/DataSet.java | 2 +- .../dataset/impl/DefaultDataColumn.java | 2 +- .../dataset/impl/DefaultDataSet.java | 4 +- .../MigrationDataSourceFactory.java | 2 +- .../AbstractMigrationDataSourceFactory.java | 2 +- .../DefaultMigrationDataSourceFactory.java | 2 +- .../events/CopyCompleteEvent.java | 2 +- .../events/CopyDatabaseTableEvent.java | 2 +- .../commercedbsync/events/OperationEvent.java | 2 +- .../events/SchemaDifferenceEvent.java | 2 +- .../handlers/CopyCompleteEventListener.java | 2 +- .../CopyDatabaseTableEventListener.java | 2 +- .../filter/DataCopyTableFilter.java | 2 +- .../impl/CompositeDataCopyTableFilter.java | 2 +- .../impl/ExclusionDataCopyTableFilter.java | 4 +- .../impl/InclusionDataCopyTableFilter.java | 4 +- .../impl/IncrementalDataCopyTableFilter.java | 4 +- .../DefaultCMTRemoveInterceptor.java | 6 +- .../jalo/ItemDeletionMarker.java | 2 +- .../jobs/AbstractMigrationJobPerformable.java | 2 +- .../commercedbsync/jobs/FullMigrationJob.java | 2 +- .../jobs/IncrementalMigrationJob.java | 6 +- .../commercedbsync/jobs/MigrationPrepJob.java | 2 +- .../DefaultCMTAfterSaveListener.java | 4 +- .../logging/JDBCQueriesStore.java | 2 +- .../commercedbsync/logging/JdbcQueryLog.java | 2 +- .../logging/LoggingConnectionWrapper.java | 2 +- .../LoggingPreparedStatementWrapper.java | 2 +- .../logging/LoggingStatementWrapper.java | 4 +- .../performance/PerformanceCategory.java | 2 +- .../performance/PerformanceProfiler.java | 2 +- .../performance/PerformanceRecorder.java | 4 +- .../performance/PerformanceUnit.java | 2 +- .../impl/DefaultPerformanceProfiler.java | 2 +- .../processors/MigrationPostProcessor.java | 2 +- .../processors/MigrationPreProcessor.java | 2 +- .../AdjustActiveTypeSystemPostProcessor.java | 2 +- .../impl/DefaultMigrationPostProcessor.java | 2 +- .../impl/IndexAlignerPostProcessor.java | 4 +- .../impl/JdbcQueriesPostProcessor.java | 2 +- .../MSSQLUpdateStatisticsPostProcessor.java | 2 +- .../impl/ReportMigrationPostProcessor.java | 2 +- ...ransformFunctionGeneratorPreProcessor.java | 4 +- ...TruncateNotMigratedTablesPreProcessor.java | 2 +- .../TypeInfoTableGeneratorPreProcessor.java | 6 +- .../impl/UpdateYDeploymentsPostProcessor.java | 2 +- .../impl/ViewDropPostProcessor.java | 2 +- .../impl/ViewGeneratorPreProcessor.java | 2 +- .../profile/DataSourceConfiguration.java | 2 +- .../DataSourceConfigurationFactory.java | 2 +- .../impl/DefaultDataSourceConfiguration.java | 6 +- ...DefaultDataSourceConfigurationFactory.java | 2 +- ...validDataSourceConfigurationException.java | 2 +- .../provider/CopyItemProvider.java | 2 +- .../impl/DefaultDataCopyItemProvider.java | 2 +- .../repository/DataRepository.java | 2 +- .../impl/AbstractDataRepository.java | 66 ++++++++++++------- .../repository/impl/AzureDataRepository.java | 9 +-- .../impl/AzureIncrementalDataRepository.java | 8 ++- .../impl/DataRepositoryFactory.java | 2 +- .../repository/impl/HanaDataRepository.java | 2 +- .../repository/impl/HsqlRepository.java | 2 +- .../repository/impl/MySQLDataRepository.java | 2 +- .../impl/MySQLIncrementalDataRepository.java | 2 +- .../repository/impl/NullRepository.java | 2 +- .../repository/impl/OracleDataRepository.java | 2 +- .../impl/PostGresDataRepository.java | 4 +- .../platform/MigrationHybrisHANABuilder.java | 2 +- .../platform/MigrationHybrisHANAPlatform.java | 2 +- .../platform/MigrationHybrisMSSqlBuilder.java | 2 +- .../MigrationHybrisMSSqlPlatform.java | 2 +- .../platform/MigrationHybrisMySqlBuilder.java | 2 +- .../MigrationHybrisMySqlPlatform.java | 2 +- .../MigrationHybrisPostGresBuilder.java | 35 ++-------- .../MigrationHybrisPostGresPlatform.java | 18 ++--- .../ClusterTableSplittingStrategy.java | 2 +- .../scheduler/DatabaseCopyScheduler.java | 2 +- .../DatabaseOperationSchedulerAlgorithm.java | 2 +- .../DatabaseSchemaDifferenceScheduler.java | 2 +- .../CustomClusterDatabaseCopyScheduler.java | 2 +- .../DefaultClusterTableSplittingStrategy.java | 2 +- ...aultDatabaseSchemaDifferenceScheduler.java | 2 +- .../RoundRobinClusterSchedulerAlgorithm.java | 2 +- .../service/DatabaseCopyTaskRepository.java | 2 +- .../service/DatabaseMigrationCopyService.java | 2 +- ...atabaseMigrationDataTypeMapperService.java | 2 +- .../DatabaseMigrationReportService.java | 2 +- ...DatabaseMigrationReportStorageService.java | 2 +- .../service/DatabaseMigrationService.java | 2 +- .../DatabaseSchemaDifferenceService.java | 2 +- ...atabaseSchemaDifferenceTaskRepository.java | 2 +- ...DatabaseMigrationReportStorageService.java | 4 +- .../DefaultDatabaseCopyTaskRepository.java | 2 +- ...atabaseMigrationDataTypeMapperService.java | 2 +- ...DefaultDatabaseMigrationReportService.java | 4 +- .../impl/DefaultDatabaseMigrationService.java | 2 +- ...efaultDatabaseSchemaDifferenceService.java | 6 +- ...atabaseSchemaDifferenceTaskRepository.java | 2 +- .../PipeDatabaseMigrationCopyService.java | 2 +- .../setup/InitUpdateProcessTrigger.java | 2 +- .../strategy/PipeWriterStrategy.java | 5 +- .../strategy/impl/CopyPipeWriterContext.java | 2 +- .../strategy/impl/CopyPipeWriterStrategy.java | 4 +- .../strategy/impl/CopyPipeWriterTask.java | 4 +- .../strategy/impl/DataDeleteWriterTask.java | 2 +- .../commercedbsync/utils/FileUtils.java | 2 +- .../utils/LocalDateTypeAdapter.java | 2 +- .../commercedbsync/utils/MaskUtil.java | 2 +- .../views/TableViewGenerator.java | 4 +- .../views/ViewConfigurationContext.java | 2 +- .../platform/azure/media/AzureCloudUtils.java | 4 +- .../platform/core/TenantPropertiesLoader.java | 2 +- .../views/TableViewGeneratorTest.java | 2 +- commercedbsynchac/buildcallbacks.xml | 2 +- commercedbsynchac/extensioninfo.xml | 2 +- commercedbsynchac/external-dependencies.xml | 2 +- .../hac/resources/jsp/dataCopy.jsp | 2 +- .../hac/resources/jsp/dataSource.jsp | 2 +- .../hac/resources/jsp/migrationReports.jsp | 2 +- .../hac/resources/jsp/schemaCopy.jsp | 2 +- .../hac/resources/static/css/dataCopy.css | 2 +- .../hac/resources/static/css/database.css | 2 +- .../hac/resources/static/css/schemaCopy.css | 2 +- .../resources/static/js/customStatistics.js | 2 +- .../hac/resources/static/js/dataCopy.js | 2 +- .../hac/resources/static/js/dataSource.js | 2 +- .../resources/static/js/migrationMetrics.js | 2 +- .../resources/static/js/migrationReports.js | 2 +- .../hac/resources/static/js/schemaCopy.js | 2 +- .../CommercemigrationhacController.java | 12 ++-- .../CommercemigrationhacControllerTest.java | 2 +- commercedbsynchac/project.properties | 2 +- .../resources/commercedbsynchac-beans.xml | 2 +- .../resources/commercedbsynchac-items.xml | 2 +- .../resources/commercedbsynchac-spring.xml | 2 +- .../localization/i2ihac-locales_de.properties | 2 +- .../localization/i2ihac-locales_en.properties | 2 +- .../localization/i2ihac-locales_es.properties | 2 +- .../localization/i2ihac-locales_fr.properties | 2 +- .../localization/i2ihac-locales_it.properties | 2 +- .../localization/i2ihac-locales_ja.properties | 2 +- .../localization/i2ihac-locales_ko.properties | 2 +- .../localization/i2ihac-locales_pt.properties | 2 +- .../localization/i2ihac-locales_ru.properties | 2 +- .../localization/i2ihac-locales_zh.properties | 2 +- .../CommercedbsynchacStandalone.java | 2 +- .../constants/YhacextConstants.java | 2 +- .../metric/MetricService.java | 2 +- .../metric/impl/DefaultMetricService.java | 2 +- .../metric/populator/MetricPopulator.java | 2 +- .../populator/impl/CpuMetricPopulator.java | 2 +- .../populator/impl/DTUMetricPopulator.java | 2 +- .../impl/HikariConnectionMetricPopulator.java | 2 +- ...HikariSourceConnectionMetricPopulator.java | 2 +- ...HikariTargetConnectionMetricPopulator.java | 2 +- .../populator/impl/IOMetricPopulator.java | 2 +- .../populator/impl/MemoryMetricPopulator.java | 2 +- .../impl/TaskExecutorMetricPopulator.java | 4 +- .../impl/ThreadPoolMetricPopulator.java | 4 +- 238 files changed, 358 insertions(+), 369 deletions(-) create mode 100644 REUSE.toml diff --git a/README.md b/README.md index 717d633..e232873 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ Features and changes [presentation video](https://sapvideoa35699dc5.hana.ondeman # Requirements -- SAP Commerce (>=1811) +- SAP Commerce (>=2211-jdk21.x) - Tested with source databases: - Azure SQL - MySQL (5.7) diff --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 0000000..39f1ae5 --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,11 @@ +version = 1 +SPDX-PackageName = "SAP Commerce DB Sync" +SPDX-PackageSupplier = "yannick.robin@sap.com" +SPDX-PackageDownloadLocation = "https://github.com/SAP/sap-commerce-db-sync" +SPDX-PackageComment = "The code in this project may include calls to APIs (\"API Calls\") of\n SAP or third-party products or services developed outside of this project\n (\"External Products\").\n \"APIs\" means application programming interfaces, as well as their respective\n specifications and implementing code that allows software to communicate with\n other software.\n API Calls to External Products are not licensed under the open source license\n that governs this project. The use of such API Calls and related External\n Products are subject to applicable additional agreements with the relevant\n provider of the External Products. In no event shall the open source license\n that governs this project grant any rights in or to any External Products,or\n alter, expand or supersede any terms of the applicable additional agreements.\n If you have a valid license agreement with SAP for the use of a particular SAP\n External Product, then you may make use of any API Calls included in this\n project's code for that SAP External Product, subject to the terms of such\n license agreement. If you do not have a valid license agreement for the use of\n a particular SAP External Product, then you may only make use of any API Calls\n in this project for that SAP External Product for your internal, non-productive\n and non-commercial test and evaluation of such API Calls. Nothing herein grants\n you any rights to use or access any SAP External Product, or provide any third\n parties the right to use of access any SAP External Product, through API Calls." + +[[annotations]] +path = "**" +precedence = "aggregate" +SPDX-FileCopyrightText = "2025 SAP SE or an SAP affiliate company and SAP Commerce DB Sync contributors" +SPDX-License-Identifier = "Apache-2.0" diff --git a/commercedbsync/buildcallbacks.xml b/commercedbsync/buildcallbacks.xml index c723961..ccd34bb 100644 --- a/commercedbsync/buildcallbacks.xml +++ b/commercedbsync/buildcallbacks.xml @@ -1,6 +1,6 @@ diff --git a/commercedbsync/extensioninfo.xml b/commercedbsync/extensioninfo.xml index 5204953..14bc29f 100644 --- a/commercedbsync/extensioninfo.xml +++ b/commercedbsync/extensioninfo.xml @@ -1,7 +1,7 @@ diff --git a/commercedbsync/external-dependencies.xml b/commercedbsync/external-dependencies.xml index 4e72fdc..de09e8d 100644 --- a/commercedbsync/external-dependencies.xml +++ b/commercedbsync/external-dependencies.xml @@ -1,5 +1,5 @@ diff --git a/commercedbsync/project.properties b/commercedbsync/project.properties index e5e9aa9..ac2638a 100644 --- a/commercedbsync/project.properties +++ b/commercedbsync/project.properties @@ -1,5 +1,5 @@ # -# Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. +# Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. # License: Apache-2.0 # # diff --git a/commercedbsync/resources/commercedbsync-beans.xml b/commercedbsync/resources/commercedbsync-beans.xml index 997312d..3b98e31 100644 --- a/commercedbsync/resources/commercedbsync-beans.xml +++ b/commercedbsync/resources/commercedbsync-beans.xml @@ -1,6 +1,6 @@ diff --git a/commercedbsync/resources/commercedbsync-items.xml b/commercedbsync/resources/commercedbsync-items.xml index 1e7091e..916706c 100644 --- a/commercedbsync/resources/commercedbsync-items.xml +++ b/commercedbsync/resources/commercedbsync-items.xml @@ -1,6 +1,6 @@ diff --git a/commercedbsync/resources/commercedbsync-spring.xml b/commercedbsync/resources/commercedbsync-spring.xml index 1522de6..2cc07e2 100644 --- a/commercedbsync/resources/commercedbsync-spring.xml +++ b/commercedbsync/resources/commercedbsync-spring.xml @@ -1,6 +1,6 @@ diff --git a/commercedbsync/resources/groovy/MigrationSummaryScript.groovy b/commercedbsync/resources/groovy/MigrationSummaryScript.groovy index ab05740..40206b1 100644 --- a/commercedbsync/resources/groovy/MigrationSummaryScript.groovy +++ b/commercedbsync/resources/groovy/MigrationSummaryScript.groovy @@ -1,5 +1,5 @@ /* - * Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -7,7 +7,7 @@ package groovy import de.hybris.platform.util.Config -import org.apache.commons.lang.StringUtils +import org.apache.commons.lang3.StringUtils import java.util.stream.Collectors diff --git a/commercedbsync/resources/groovy/ddlaltercreate.groovy b/commercedbsync/resources/groovy/ddlaltercreate.groovy index 4df0f40..2e2212a 100644 --- a/commercedbsync/resources/groovy/ddlaltercreate.groovy +++ b/commercedbsync/resources/groovy/ddlaltercreate.groovy @@ -1,5 +1,5 @@ /* - * Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/resources/impex/projectdata-commercemigration-jobs.impex b/commercedbsync/resources/impex/projectdata-commercemigration-jobs.impex index 61f7065..febacec 100644 --- a/commercedbsync/resources/impex/projectdata-commercemigration-jobs.impex +++ b/commercedbsync/resources/impex/projectdata-commercemigration-jobs.impex @@ -38,18 +38,11 @@ INSERT_UPDATE CompositeEntry;code[unique=true];executableCronJob(code) ;reverseMigrateTableEntry;reverseFullMigrationJob ;reverseMigrateIncrementalEntry;reverseIncrementalMigrationJob -INSERT_UPDATE CompositeCronJob;code[unique=true];job(code);sessionLanguage(isoCode)[default=en]; - ;compositeDatabaseMigrationJob;compositeJobPerformable; - ;compositeTableMigrationJob;compositeJobPerformable; - ;compositeIncrementalMigrationJob;compositeJobPerformable; - ;compositeReverseTableMigrationJob;compositeJobPerformable; - ;compositeReverseIncrementalMigrationJob;compositeJobPerformable; - -INSERT_UPDATE CompositeCronJob;code[unique=true];compositeEntries(code)[mode = append] - ;compositeDatabaseMigrationJob;prepForDbMigrationEntry,migrateDatabaseEntry - ;compositeTableMigrationJob;prepForTableMigrationEntry,migrateTableEntry - ;compositeIncrementalMigrationJob;prepForIncrementalMigrationEntry,migrateIncrementalEntry - ;compositeReverseTableMigrationjob;prepForReverseTableMigrationEntry,reverseMigrateTableEntry - ;compositeReverseIncrementalMigrationJob;prepForReverseIncrementalMigrationEntry,reverseMigrateIncrementalEntry +INSERT_UPDATE CompositeCronJob;code[unique=true];job(code);compositeEntries(code)[mode = append];sessionLanguage(isoCode)[default=en] + ;compositeDatabaseMigrationJob;compositeJobPerformable;prepForDbMigrationEntry,migrateDatabaseEntry; + ;compositeTableMigrationJob;compositeJobPerformable;prepForTableMigrationEntry,migrateTableEntry; + ;compositeIncrementalMigrationJob;compositeJobPerformable;prepForIncrementalMigrationEntry,migrateIncrementalEntry; + ;compositeReverseTableMigrationjob;compositeJobPerformable;prepForReverseTableMigrationEntry,reverseMigrateTableEntry; + ;compositeReverseIncrementalMigrationJob;compositeJobPerformable;prepForReverseIncrementalMigrationEntry,reverseMigrateIncrementalEntry; diff --git a/commercedbsync/resources/localization/commercedbsync-locales_de.properties b/commercedbsync/resources/localization/commercedbsync-locales_de.properties index e214d48..ccc4d7e 100644 --- a/commercedbsync/resources/localization/commercedbsync-locales_de.properties +++ b/commercedbsync/resources/localization/commercedbsync-locales_de.properties @@ -1,5 +1,5 @@ # -# Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. +# Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. # License: Apache-2.0 # # diff --git a/commercedbsync/resources/localization/commercedbsync-locales_en.properties b/commercedbsync/resources/localization/commercedbsync-locales_en.properties index 1872fa0..2f89779 100644 --- a/commercedbsync/resources/localization/commercedbsync-locales_en.properties +++ b/commercedbsync/resources/localization/commercedbsync-locales_en.properties @@ -1,5 +1,5 @@ # -# Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. +# Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. # License: Apache-2.0 # # diff --git a/commercedbsync/resources/localization/commercedbsync-locales_es.properties b/commercedbsync/resources/localization/commercedbsync-locales_es.properties index e214d48..ccc4d7e 100644 --- a/commercedbsync/resources/localization/commercedbsync-locales_es.properties +++ b/commercedbsync/resources/localization/commercedbsync-locales_es.properties @@ -1,5 +1,5 @@ # -# Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. +# Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. # License: Apache-2.0 # # diff --git a/commercedbsync/resources/localization/commercedbsync-locales_fr.properties b/commercedbsync/resources/localization/commercedbsync-locales_fr.properties index e214d48..ccc4d7e 100644 --- a/commercedbsync/resources/localization/commercedbsync-locales_fr.properties +++ b/commercedbsync/resources/localization/commercedbsync-locales_fr.properties @@ -1,5 +1,5 @@ # -# Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. +# Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. # License: Apache-2.0 # # diff --git a/commercedbsync/resources/localization/commercedbsync-locales_it.properties b/commercedbsync/resources/localization/commercedbsync-locales_it.properties index e214d48..ccc4d7e 100644 --- a/commercedbsync/resources/localization/commercedbsync-locales_it.properties +++ b/commercedbsync/resources/localization/commercedbsync-locales_it.properties @@ -1,5 +1,5 @@ # -# Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. +# Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. # License: Apache-2.0 # # diff --git a/commercedbsync/resources/localization/commercedbsync-locales_ja.properties b/commercedbsync/resources/localization/commercedbsync-locales_ja.properties index e214d48..ccc4d7e 100644 --- a/commercedbsync/resources/localization/commercedbsync-locales_ja.properties +++ b/commercedbsync/resources/localization/commercedbsync-locales_ja.properties @@ -1,5 +1,5 @@ # -# Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. +# Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. # License: Apache-2.0 # # diff --git a/commercedbsync/resources/localization/commercedbsync-locales_ko.properties b/commercedbsync/resources/localization/commercedbsync-locales_ko.properties index e214d48..ccc4d7e 100644 --- a/commercedbsync/resources/localization/commercedbsync-locales_ko.properties +++ b/commercedbsync/resources/localization/commercedbsync-locales_ko.properties @@ -1,5 +1,5 @@ # -# Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. +# Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. # License: Apache-2.0 # # diff --git a/commercedbsync/resources/localization/commercedbsync-locales_pt.properties b/commercedbsync/resources/localization/commercedbsync-locales_pt.properties index e214d48..ccc4d7e 100644 --- a/commercedbsync/resources/localization/commercedbsync-locales_pt.properties +++ b/commercedbsync/resources/localization/commercedbsync-locales_pt.properties @@ -1,5 +1,5 @@ # -# Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. +# Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. # License: Apache-2.0 # # diff --git a/commercedbsync/resources/localization/commercedbsync-locales_ru.properties b/commercedbsync/resources/localization/commercedbsync-locales_ru.properties index e214d48..ccc4d7e 100644 --- a/commercedbsync/resources/localization/commercedbsync-locales_ru.properties +++ b/commercedbsync/resources/localization/commercedbsync-locales_ru.properties @@ -1,5 +1,5 @@ # -# Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. +# Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. # License: Apache-2.0 # # diff --git a/commercedbsync/resources/localization/commercedbsync-locales_zh.properties b/commercedbsync/resources/localization/commercedbsync-locales_zh.properties index e214d48..ccc4d7e 100644 --- a/commercedbsync/resources/localization/commercedbsync-locales_zh.properties +++ b/commercedbsync/resources/localization/commercedbsync-locales_zh.properties @@ -1,5 +1,5 @@ # -# Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. +# Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. # License: Apache-2.0 # # diff --git a/commercedbsync/resources/sql/createSchedulerTablesHANA.sql b/commercedbsync/resources/sql/createSchedulerTablesHANA.sql index 535a200..4c95129 100644 --- a/commercedbsync/resources/sql/createSchedulerTablesHANA.sql +++ b/commercedbsync/resources/sql/createSchedulerTablesHANA.sql @@ -344,7 +344,7 @@ WHERE AND total > completed; /* - * Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/resources/sql/createSchemaSchedulerTablesMYSQL.sql b/commercedbsync/resources/sql/createSchemaSchedulerTablesMYSQL.sql index 3851575..1663339 100644 --- a/commercedbsync/resources/sql/createSchemaSchedulerTablesMYSQL.sql +++ b/commercedbsync/resources/sql/createSchemaSchedulerTablesMYSQL.sql @@ -33,7 +33,7 @@ CREATE TABLE MIGRATIONTOOLKIT_SCHEMADIFFSTATUS ( completed INT NOT NULL DEFAULT 0, failed INT NOT NULL DEFAULT 0, status VARCHAR(255) NOT NULL DEFAULT 'RUNNING', - sqlScript TEXT NULL + sqlScript MEDIUMTEXT NULL ); # DROP TRIGGER IF EXISTS MIGRATIONTOOLKIT_SCHEMADIFFSTATUS_Insert; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/CommercedbsyncStandalone.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/CommercedbsyncStandalone.java index f9a74b9..6d5adfd 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/CommercedbsyncStandalone.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/CommercedbsyncStandalone.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/adapter/DataRepositoryAdapter.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/adapter/DataRepositoryAdapter.java index e3aadc7..436661e 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/adapter/DataRepositoryAdapter.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/adapter/DataRepositoryAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/adapter/impl/ContextualDataRepositoryAdapter.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/adapter/impl/ContextualDataRepositoryAdapter.java index 950d784..2a49e43 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/adapter/impl/ContextualDataRepositoryAdapter.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/adapter/impl/ContextualDataRepositoryAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/AnonymizeFunctions.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/AnonymizeFunctions.java index 76183f2..6f5a67d 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/AnonymizeFunctions.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/AnonymizeFunctions.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/AnonymizerConfigurator.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/AnonymizerConfigurator.java index 451840c..fcde74f 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/AnonymizerConfigurator.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/AnonymizerConfigurator.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/TextEvaluator.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/TextEvaluator.java index c3e4a65..8059716 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/TextEvaluator.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/TextEvaluator.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/TextTokenizer.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/TextTokenizer.java index 5453f51..fcb7325 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/TextTokenizer.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/TextTokenizer.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/exception/ValidationException.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/exception/ValidationException.java index a203a97..ae6bf56 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/exception/ValidationException.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/exception/ValidationException.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/functions/FunctionEvaluator.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/functions/FunctionEvaluator.java index f23142e..9ef4463 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/functions/FunctionEvaluator.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/functions/FunctionEvaluator.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/functions/impl/GuidFunctionEvaluator.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/functions/impl/GuidFunctionEvaluator.java index 2e221f5..de37594 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/functions/impl/GuidFunctionEvaluator.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/functions/impl/GuidFunctionEvaluator.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/functions/impl/RandomAddressGenerator.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/functions/impl/RandomAddressGenerator.java index 87e2f81..da5be65 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/functions/impl/RandomAddressGenerator.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/functions/impl/RandomAddressGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/functions/impl/RandomFunctionEvaluator.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/functions/impl/RandomFunctionEvaluator.java index 5e91aa2..e02b932 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/functions/impl/RandomFunctionEvaluator.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/functions/impl/RandomFunctionEvaluator.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/model/AnonymizerConfiguration.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/model/AnonymizerConfiguration.java index 3acd38f..ea4acc1 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/model/AnonymizerConfiguration.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/model/AnonymizerConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/model/Column.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/model/Column.java index 90046f5..31e2b71 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/model/Column.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/model/Column.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/model/Operation.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/model/Operation.java index 33cf4fa..616d1f8 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/model/Operation.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/model/Operation.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/model/Table.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/model/Table.java index 57f2018..74cadad 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/model/Table.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/anonymizer/model/Table.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataCopyMethod.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataCopyMethod.java index f409f2d..fdceca4 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataCopyMethod.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataCopyMethod.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataPipe.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataPipe.java index d47de79..6a5162e 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataPipe.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataPipe.java @@ -1,13 +1,11 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ package com.sap.cx.boosters.commercedbsync.concurrent; -import javax.annotation.concurrent.ThreadSafe; - /** * Used to separate database reading and writing operations, after reading data * from the DB, the result is put to the pipe and can be used by the database @@ -15,7 +13,6 @@ * * @param */ -@ThreadSafe public interface DataPipe { void requestAbort(Exception e); diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataPipeFactory.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataPipeFactory.java index 381964c..0c5d1c9 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataPipeFactory.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataPipeFactory.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -8,9 +8,6 @@ import com.sap.cx.boosters.commercedbsync.context.CopyContext; -import javax.annotation.concurrent.ThreadSafe; - -@ThreadSafe public interface DataPipeFactory { DataPipe create(CopyContext context, CopyContext.DataCopyItem item) throws Exception; } diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataThreadPoolConfigBuilder.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataThreadPoolConfigBuilder.java index 5c56806..966ec37 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataThreadPoolConfigBuilder.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataThreadPoolConfigBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataThreadPoolFactory.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataThreadPoolFactory.java index aea73f7..487ab95 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataThreadPoolFactory.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataThreadPoolFactory.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataThreadPoolMonitor.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataThreadPoolMonitor.java index d4c262f..6be727c 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataThreadPoolMonitor.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataThreadPoolMonitor.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataWorkerExecutor.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataWorkerExecutor.java index d9e1a8c..6332195 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataWorkerExecutor.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataWorkerExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataWorkerPoolFactory.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataWorkerPoolFactory.java index 8a34d7a..cf22e54 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataWorkerPoolFactory.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/DataWorkerPoolFactory.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/MDCTaskDecorator.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/MDCTaskDecorator.java index 2c06238..47b323e 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/MDCTaskDecorator.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/MDCTaskDecorator.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/MaybeFinished.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/MaybeFinished.java index d1354cc..cca182c 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/MaybeFinished.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/MaybeFinished.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/PipeAbortedException.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/PipeAbortedException.java index 3ad3605..40e8104 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/PipeAbortedException.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/PipeAbortedException.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/DefaultDataPipe.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/DefaultDataPipe.java index bff9002..f74521c 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/DefaultDataPipe.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/DefaultDataPipe.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/DefaultDataPipeFactory.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/DefaultDataPipeFactory.java index 6abe3a8..b69a2d1 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/DefaultDataPipeFactory.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/DefaultDataPipeFactory.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -26,8 +26,8 @@ import com.sap.cx.boosters.commercedbsync.views.TableViewGenerator; import de.hybris.platform.core.Registry; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.tuple.Pair; -import org.fest.util.Collections; import com.sap.cx.boosters.commercedbsync.DataThreadPoolConfig; import com.sap.cx.boosters.commercedbsync.MarkersQueryDefinition; import com.sap.cx.boosters.commercedbsync.service.DatabaseCopyBatch; @@ -194,7 +194,7 @@ private void scheduleWorkers(CopyContext context, DataWorkerExecutor wo Set pendingBatchesForPipeline = taskRepository .findPendingBatchesForPipeline(context, copyItem, partition); batchMarkersList = new ArrayList<>(pendingBatchesForPipeline.stream() - .map(b -> Collections.list(b.getLowerBoundary())).toList()); + .map(b -> List.of(b.getLowerBoundary())).toList()); taskRepository.resetPipelineBatches(context, copyItem, partition); createDataReaderTasks(workerExecutor, pipeTaskContext, batchColumn, batchMarkersList, copyItem, chunkedTable, partition); @@ -202,8 +202,8 @@ private void scheduleWorkers(CopyContext context, DataWorkerExecutor wo } else { Set pendingBatchesForPipeline = taskRepository .findPendingBatchesForPipeline(context, copyItem); - batchMarkersList = pendingBatchesForPipeline.stream() - .map(b -> Collections.list(b.getLowerBoundary())).collect(Collectors.toList()); + batchMarkersList = pendingBatchesForPipeline.stream().map(b -> List.of(b.getLowerBoundary())) + .collect(Collectors.toList()); taskRepository.resetPipelineBatches(context, copyItem); createDataReaderTasks(workerExecutor, pipeTaskContext, batchColumn, batchMarkersList, copyItem, chunkedTable, null); @@ -280,7 +280,7 @@ protected void createDataReaderTasks(DataWorkerExecutor workerExecutor, if (nextIndex < batchMarkersList.size()) { nextBatchMarkerRow = Optional.of(batchMarkersList.get(nextIndex)); } - if (!Collections.isEmpty(lastBatchMarkerRow)) { + if (!CollectionUtils.isEmpty(lastBatchMarkerRow)) { Object lastBatchValue = lastBatchMarkerRow.get(0); Object nextValue = nextBatchMarkerRow.map(v -> v.get(0)).orElseGet(() -> null); // check if nextValue is null and allow Pair(value, null) only if it is last diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/DefaultDataThreadPoolFactory.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/DefaultDataThreadPoolFactory.java index a67785f..785688a 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/DefaultDataThreadPoolFactory.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/DefaultDataThreadPoolFactory.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/DefaultDataThreadPoolMonitor.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/DefaultDataThreadPoolMonitor.java index 2777eb4..9482911 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/DefaultDataThreadPoolMonitor.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/DefaultDataThreadPoolMonitor.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/DefaultDataWorkerExecutor.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/DefaultDataWorkerExecutor.java index 791a1d1..c690abf 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/DefaultDataWorkerExecutor.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/DefaultDataWorkerExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/BatchMarkerDataReaderTask.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/BatchMarkerDataReaderTask.java index e076357..720073f 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/BatchMarkerDataReaderTask.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/BatchMarkerDataReaderTask.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/BatchOffsetDataReaderTask.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/BatchOffsetDataReaderTask.java index a9f9164..38be03b 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/BatchOffsetDataReaderTask.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/BatchOffsetDataReaderTask.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/ChunkDataReaderTask.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/ChunkDataReaderTask.java index abed0b0..32542e2 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/ChunkDataReaderTask.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/ChunkDataReaderTask.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/DataReaderTask.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/DataReaderTask.java index 64863bd..ba78e31 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/DataReaderTask.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/DataReaderTask.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/DefaultDataReaderTask.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/DefaultDataReaderTask.java index 5722fa3..7afaf34 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/DefaultDataReaderTask.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/DefaultDataReaderTask.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/PartitionedBatchMarkerDataReaderTask.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/PartitionedBatchMarkerDataReaderTask.java index bdfc0ef..b379bf9 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/PartitionedBatchMarkerDataReaderTask.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/PartitionedBatchMarkerDataReaderTask.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/PipeTaskContext.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/PipeTaskContext.java index 501c9e6..c32839f 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/PipeTaskContext.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/PipeTaskContext.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/RetriableTask.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/RetriableTask.java index c8615b3..f70177a 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/RetriableTask.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/concurrent/impl/task/RetriableTask.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/constants/CommercedbsyncConstants.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/constants/CommercedbsyncConstants.java index f771b59..582c2a2 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/constants/CommercedbsyncConstants.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/constants/CommercedbsyncConstants.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/CopyContext.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/CopyContext.java index c00a3ae..a7863df 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/CopyContext.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/CopyContext.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/IncrementalMigrationContext.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/IncrementalMigrationContext.java index 82a71eb..cfba86b 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/IncrementalMigrationContext.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/IncrementalMigrationContext.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/LaunchOptions.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/LaunchOptions.java index 62438c8..7b78276 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/LaunchOptions.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/LaunchOptions.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/MigrationContext.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/MigrationContext.java index dc7b392..dcaba40 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/MigrationContext.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/MigrationContext.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/MigrationContextFactory.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/MigrationContextFactory.java index 77e30e2..b2884d2 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/MigrationContextFactory.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/MigrationContextFactory.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -11,7 +11,7 @@ import com.sap.cx.boosters.commercedbsync.context.impl.DefaultMigrationContext; import com.sap.cx.boosters.commercedbsync.profile.DataSourceConfigurationFactory; import com.sap.cx.boosters.commercedbsync.repository.impl.DataRepositoryFactory; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; public class MigrationContextFactory { final DataRepositoryFactory dataRepositoryFactory; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/SchemaDifferenceContext.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/SchemaDifferenceContext.java index 2dc5cb1..b912660 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/SchemaDifferenceContext.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/SchemaDifferenceContext.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/impl/DefaultIncrementalMigrationContext.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/impl/DefaultIncrementalMigrationContext.java index c081fbe..f3dd818 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/impl/DefaultIncrementalMigrationContext.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/impl/DefaultIncrementalMigrationContext.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -9,8 +9,8 @@ import com.sap.cx.boosters.commercedbsync.constants.CommercedbsyncConstants; import com.sap.cx.boosters.commercedbsync.profile.DataSourceConfigurationFactory; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import com.sap.cx.boosters.commercedbsync.context.IncrementalMigrationContext; import com.sap.cx.boosters.commercedbsync.repository.impl.DataRepositoryFactory; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/impl/DefaultMigrationContext.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/impl/DefaultMigrationContext.java index 6f8bb1f..ffdf391 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/impl/DefaultMigrationContext.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/impl/DefaultMigrationContext.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -14,8 +14,8 @@ import com.sap.cx.boosters.commercedbsync.repository.DataRepository; import com.sap.cx.boosters.commercedbsync.repository.impl.DataRepositoryFactory; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.lang3.StringUtils; import java.sql.SQLException; import java.time.Instant; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/validation/MigrationContextValidator.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/validation/MigrationContextValidator.java index b301a6d..848d27c 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/validation/MigrationContextValidator.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/validation/MigrationContextValidator.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/validation/impl/DefaultMigrationContextValidator.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/validation/impl/DefaultMigrationContextValidator.java index 3ed90f7..cae35a3 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/validation/impl/DefaultMigrationContextValidator.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/validation/impl/DefaultMigrationContextValidator.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -12,7 +12,7 @@ import com.sap.cx.boosters.commercedbsync.repository.DataRepository; import de.hybris.bootstrap.ddl.tools.persistenceinfo.PersistenceInformation; import de.hybris.platform.servicelayer.config.ConfigurationService; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/cron/FullMigrationCronJob.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/cron/FullMigrationCronJob.java index e2829ff..de3df6a 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/cron/FullMigrationCronJob.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/cron/FullMigrationCronJob.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/cron/IncrementalMigrationCronJob.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/cron/IncrementalMigrationCronJob.java index a75cd36..2a06360 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/cron/IncrementalMigrationCronJob.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/cron/IncrementalMigrationCronJob.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/cron/MigrationCronJob.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/cron/MigrationCronJob.java index 3c2d0a8..bda841b 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/cron/MigrationCronJob.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/cron/MigrationCronJob.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/dataset/DataColumn.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/dataset/DataColumn.java index c069ad2..a8cb91b 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/dataset/DataColumn.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/dataset/DataColumn.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/dataset/DataSet.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/dataset/DataSet.java index 41143b9..714eae2 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/dataset/DataSet.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/dataset/DataSet.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/dataset/impl/DefaultDataColumn.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/dataset/impl/DefaultDataColumn.java index eec21e9..3bb841d 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/dataset/impl/DefaultDataColumn.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/dataset/impl/DefaultDataColumn.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/dataset/impl/DefaultDataSet.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/dataset/impl/DefaultDataSet.java index df103fa..1cb70b7 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/dataset/impl/DefaultDataSet.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/dataset/impl/DefaultDataSet.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -13,7 +13,6 @@ import com.sap.cx.boosters.commercedbsync.dataset.DataColumn; import com.sap.cx.boosters.commercedbsync.dataset.DataSet; -import javax.annotation.concurrent.Immutable; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -21,7 +20,6 @@ import static java.sql.Types.CHAR; import static java.sql.Types.SMALLINT; -@Immutable public class DefaultDataSet implements DataSet { private final int batchId; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/datasource/MigrationDataSourceFactory.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/datasource/MigrationDataSourceFactory.java index d0c135b..8da220c 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/datasource/MigrationDataSourceFactory.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/datasource/MigrationDataSourceFactory.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/datasource/impl/AbstractMigrationDataSourceFactory.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/datasource/impl/AbstractMigrationDataSourceFactory.java index d00746d..39b4a42 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/datasource/impl/AbstractMigrationDataSourceFactory.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/datasource/impl/AbstractMigrationDataSourceFactory.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/datasource/impl/DefaultMigrationDataSourceFactory.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/datasource/impl/DefaultMigrationDataSourceFactory.java index 123f223..de96ecc 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/datasource/impl/DefaultMigrationDataSourceFactory.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/datasource/impl/DefaultMigrationDataSourceFactory.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/CopyCompleteEvent.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/CopyCompleteEvent.java index 7aad8c7..2e41ee0 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/CopyCompleteEvent.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/CopyCompleteEvent.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/CopyDatabaseTableEvent.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/CopyDatabaseTableEvent.java index d6bb669..3f00928 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/CopyDatabaseTableEvent.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/CopyDatabaseTableEvent.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/OperationEvent.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/OperationEvent.java index dd886f9..267298b 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/OperationEvent.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/OperationEvent.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/SchemaDifferenceEvent.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/SchemaDifferenceEvent.java index a93fb19..4441ec0 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/SchemaDifferenceEvent.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/SchemaDifferenceEvent.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/handlers/CopyCompleteEventListener.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/handlers/CopyCompleteEventListener.java index 17a2a19..703bc0d 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/handlers/CopyCompleteEventListener.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/handlers/CopyCompleteEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/handlers/CopyDatabaseTableEventListener.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/handlers/CopyDatabaseTableEventListener.java index 6725317..792e831 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/handlers/CopyDatabaseTableEventListener.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/events/handlers/CopyDatabaseTableEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/filter/DataCopyTableFilter.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/filter/DataCopyTableFilter.java index 80b5e8e..2b41db9 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/filter/DataCopyTableFilter.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/filter/DataCopyTableFilter.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/filter/impl/CompositeDataCopyTableFilter.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/filter/impl/CompositeDataCopyTableFilter.java index 5642562..1ad98ec 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/filter/impl/CompositeDataCopyTableFilter.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/filter/impl/CompositeDataCopyTableFilter.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/filter/impl/ExclusionDataCopyTableFilter.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/filter/impl/ExclusionDataCopyTableFilter.java index 338a787..43ff0d3 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/filter/impl/ExclusionDataCopyTableFilter.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/filter/impl/ExclusionDataCopyTableFilter.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -9,7 +9,7 @@ import com.google.common.base.Predicates; import com.sap.cx.boosters.commercedbsync.context.MigrationContext; import com.sap.cx.boosters.commercedbsync.filter.DataCopyTableFilter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.Set; import java.util.function.Predicate; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/filter/impl/InclusionDataCopyTableFilter.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/filter/impl/InclusionDataCopyTableFilter.java index 91afb96..38dd806 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/filter/impl/InclusionDataCopyTableFilter.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/filter/impl/InclusionDataCopyTableFilter.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -9,7 +9,7 @@ import com.google.common.base.Predicates; import com.sap.cx.boosters.commercedbsync.context.MigrationContext; import com.sap.cx.boosters.commercedbsync.filter.DataCopyTableFilter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.Set; import java.util.function.Predicate; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/filter/impl/IncrementalDataCopyTableFilter.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/filter/impl/IncrementalDataCopyTableFilter.java index 5047702..3a4e700 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/filter/impl/IncrementalDataCopyTableFilter.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/filter/impl/IncrementalDataCopyTableFilter.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -10,7 +10,7 @@ import com.sap.cx.boosters.commercedbsync.constants.CommercedbsyncConstants; import com.sap.cx.boosters.commercedbsync.context.MigrationContext; import com.sap.cx.boosters.commercedbsync.filter.DataCopyTableFilter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.Set; import java.util.function.Predicate; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/interceptors/DefaultCMTRemoveInterceptor.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/interceptors/DefaultCMTRemoveInterceptor.java index 5097bc5..8ba8b5d 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/interceptors/DefaultCMTRemoveInterceptor.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/interceptors/DefaultCMTRemoveInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -19,9 +19,9 @@ import java.util.Collections; import java.util.List; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import com.sap.cx.boosters.commercedbsync.enums.ItemChangeType; import com.sap.cx.boosters.commercedbsync.model.ItemDeletionMarkerModel; import org.slf4j.Logger; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/jalo/ItemDeletionMarker.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/jalo/ItemDeletionMarker.java index 5619a72..ee567c2 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/jalo/ItemDeletionMarker.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/jalo/ItemDeletionMarker.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/jobs/AbstractMigrationJobPerformable.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/jobs/AbstractMigrationJobPerformable.java index 4fad45f..901c6ab 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/jobs/AbstractMigrationJobPerformable.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/jobs/AbstractMigrationJobPerformable.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/jobs/FullMigrationJob.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/jobs/FullMigrationJob.java index 42abe9c..970604a 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/jobs/FullMigrationJob.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/jobs/FullMigrationJob.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/jobs/IncrementalMigrationJob.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/jobs/IncrementalMigrationJob.java index 6c89988..6d022c7 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/jobs/IncrementalMigrationJob.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/jobs/IncrementalMigrationJob.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -25,10 +25,10 @@ import java.time.Instant; import java.util.*; import java.util.stream.Collectors; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import com.sap.cx.boosters.commercedbsync.MigrationStatus; import com.sap.cx.boosters.commercedbsync.model.cron.IncrementalMigrationCronJobModel; import org.slf4j.Logger; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/jobs/MigrationPrepJob.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/jobs/MigrationPrepJob.java index 368db62..f9265d6 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/jobs/MigrationPrepJob.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/jobs/MigrationPrepJob.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/listeners/DefaultCMTAfterSaveListener.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/listeners/DefaultCMTAfterSaveListener.java index 9694278..138aa52 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/listeners/DefaultCMTAfterSaveListener.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/listeners/DefaultCMTAfterSaveListener.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -25,7 +25,7 @@ import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/logging/JDBCQueriesStore.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/logging/JDBCQueriesStore.java index 821aa9d..945035e 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/logging/JDBCQueriesStore.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/logging/JDBCQueriesStore.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/logging/JdbcQueryLog.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/logging/JdbcQueryLog.java index 8a1c6ee..4cdadfa 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/logging/JdbcQueryLog.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/logging/JdbcQueryLog.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/logging/LoggingConnectionWrapper.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/logging/LoggingConnectionWrapper.java index 0321e4a..f85c3bc 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/logging/LoggingConnectionWrapper.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/logging/LoggingConnectionWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/logging/LoggingPreparedStatementWrapper.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/logging/LoggingPreparedStatementWrapper.java index d8d61ab..beeb699 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/logging/LoggingPreparedStatementWrapper.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/logging/LoggingPreparedStatementWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/logging/LoggingStatementWrapper.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/logging/LoggingStatementWrapper.java index 107d18f..ea6ac26 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/logging/LoggingStatementWrapper.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/logging/LoggingStatementWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -16,7 +16,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Wrapper of {@link Statement} to add custom logging behavior when SQL queries diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/performance/PerformanceCategory.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/performance/PerformanceCategory.java index f02501f..d46f8d5 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/performance/PerformanceCategory.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/performance/PerformanceCategory.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/performance/PerformanceProfiler.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/performance/PerformanceProfiler.java index 4c2d7b1..63c4278 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/performance/PerformanceProfiler.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/performance/PerformanceProfiler.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/performance/PerformanceRecorder.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/performance/PerformanceRecorder.java index d7f7fa5..c8729e4 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/performance/PerformanceRecorder.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/performance/PerformanceRecorder.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -10,7 +10,6 @@ import com.google.common.base.Stopwatch; import com.google.common.util.concurrent.AtomicDouble; -import javax.annotation.concurrent.ThreadSafe; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; @@ -81,7 +80,6 @@ public String toString() { return "PerformanceRecorder{name=" + getName() + ",{" + Joiner.on("},{").join(getRecords().values()) + "}}"; } - @ThreadSafe public static class PerformanceAggregation { private final Stopwatch timer; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/performance/PerformanceUnit.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/performance/PerformanceUnit.java index 2855bbe..29f3745 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/performance/PerformanceUnit.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/performance/PerformanceUnit.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/performance/impl/DefaultPerformanceProfiler.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/performance/impl/DefaultPerformanceProfiler.java index d8aa31a..63f2518 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/performance/impl/DefaultPerformanceProfiler.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/performance/impl/DefaultPerformanceProfiler.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/MigrationPostProcessor.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/MigrationPostProcessor.java index 9105e66..4561820 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/MigrationPostProcessor.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/MigrationPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/MigrationPreProcessor.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/MigrationPreProcessor.java index 68b6acd..33120bd 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/MigrationPreProcessor.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/MigrationPreProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/AdjustActiveTypeSystemPostProcessor.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/AdjustActiveTypeSystemPostProcessor.java index cf52eb3..8ffeb92 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/AdjustActiveTypeSystemPostProcessor.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/AdjustActiveTypeSystemPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/DefaultMigrationPostProcessor.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/DefaultMigrationPostProcessor.java index eaaf10b..b96b338 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/DefaultMigrationPostProcessor.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/DefaultMigrationPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/IndexAlignerPostProcessor.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/IndexAlignerPostProcessor.java index 32f1d32..4d16183 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/IndexAlignerPostProcessor.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/IndexAlignerPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -10,7 +10,7 @@ import java.util.Set; import java.util.stream.Collectors; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.apache.ddlutils.model.Database; import org.apache.ddlutils.model.Index; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/JdbcQueriesPostProcessor.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/JdbcQueriesPostProcessor.java index aa6f920..127bb32 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/JdbcQueriesPostProcessor.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/JdbcQueriesPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/MSSQLUpdateStatisticsPostProcessor.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/MSSQLUpdateStatisticsPostProcessor.java index aba04c0..5f842e6 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/MSSQLUpdateStatisticsPostProcessor.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/MSSQLUpdateStatisticsPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/ReportMigrationPostProcessor.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/ReportMigrationPostProcessor.java index 726d88a..367c98c 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/ReportMigrationPostProcessor.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/ReportMigrationPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/TransformFunctionGeneratorPreProcessor.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/TransformFunctionGeneratorPreProcessor.java index ee91b94..9d62e2c 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/TransformFunctionGeneratorPreProcessor.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/TransformFunctionGeneratorPreProcessor.java @@ -1,12 +1,12 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ package com.sap.cx.boosters.commercedbsync.processors.impl; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.io.ClassPathResource; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/TruncateNotMigratedTablesPreProcessor.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/TruncateNotMigratedTablesPreProcessor.java index 61705e9..589d499 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/TruncateNotMigratedTablesPreProcessor.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/TruncateNotMigratedTablesPreProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/TypeInfoTableGeneratorPreProcessor.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/TypeInfoTableGeneratorPreProcessor.java index e45f370..2b3d7d8 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/TypeInfoTableGeneratorPreProcessor.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/TypeInfoTableGeneratorPreProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -13,8 +13,8 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.io.ClassPathResource; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/UpdateYDeploymentsPostProcessor.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/UpdateYDeploymentsPostProcessor.java index f1f5b33..7f29d0c 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/UpdateYDeploymentsPostProcessor.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/UpdateYDeploymentsPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/ViewDropPostProcessor.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/ViewDropPostProcessor.java index 65d6ea5..8b48c3b 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/ViewDropPostProcessor.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/ViewDropPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/ViewGeneratorPreProcessor.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/ViewGeneratorPreProcessor.java index 141aedf..dde0c36 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/ViewGeneratorPreProcessor.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/processors/impl/ViewGeneratorPreProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/profile/DataSourceConfiguration.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/profile/DataSourceConfiguration.java index a80f6ce..9a44577 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/profile/DataSourceConfiguration.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/profile/DataSourceConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/profile/DataSourceConfigurationFactory.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/profile/DataSourceConfigurationFactory.java index b150f22..364299e 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/profile/DataSourceConfigurationFactory.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/profile/DataSourceConfigurationFactory.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/profile/impl/DefaultDataSourceConfiguration.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/profile/impl/DefaultDataSourceConfiguration.java index 1282ede..34ffc34 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/profile/impl/DefaultDataSourceConfiguration.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/profile/impl/DefaultDataSourceConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -7,8 +7,8 @@ package com.sap.cx.boosters.commercedbsync.profile.impl; import de.hybris.bootstrap.ddl.tools.persistenceinfo.PersistenceInformation; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.lang3.StringUtils; import com.sap.cx.boosters.commercedbsync.profile.DataSourceConfiguration; import java.util.Optional; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/profile/impl/DefaultDataSourceConfigurationFactory.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/profile/impl/DefaultDataSourceConfigurationFactory.java index d05e175..e9599fc 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/profile/impl/DefaultDataSourceConfigurationFactory.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/profile/impl/DefaultDataSourceConfigurationFactory.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/profile/impl/InvalidDataSourceConfigurationException.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/profile/impl/InvalidDataSourceConfigurationException.java index a1950b0..f29be3a 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/profile/impl/InvalidDataSourceConfigurationException.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/profile/impl/InvalidDataSourceConfigurationException.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/provider/CopyItemProvider.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/provider/CopyItemProvider.java index 5827a9c..462bf26 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/provider/CopyItemProvider.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/provider/CopyItemProvider.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/provider/impl/DefaultDataCopyItemProvider.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/provider/impl/DefaultDataCopyItemProvider.java index cdf2422..4f5e174 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/provider/impl/DefaultDataCopyItemProvider.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/provider/impl/DefaultDataCopyItemProvider.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/DataRepository.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/DataRepository.java index 06bcc5f..77a5675 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/DataRepository.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/DataRepository.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/AbstractDataRepository.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/AbstractDataRepository.java index 8c63009..ace17f3 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/AbstractDataRepository.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/AbstractDataRepository.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -77,6 +77,7 @@ public abstract class AbstractDataRepository implements DataRepository { // one store per data repository private final JDBCQueriesStore jdbcQueriesStore; private final Map dataSourceHolder = new ConcurrentHashMap<>(); + private final Map knownAuditTables = new ConcurrentHashMap<>(); private final DataSourceConfiguration dataSourceConfiguration; private final MigrationDataSourceFactory migrationDataSourceFactory; @@ -199,8 +200,8 @@ protected String createRowCountQuery() { return "SELECT COUNT(*) FROM %s WHERE %s"; } - protected String createRowCountModifiedAfterQuery() { - return "SELECT COUNT_BIG(*) FROM %s WHERE modifiedts > ? AND %s"; + protected String createRowCountModifiedAfterQuery(String table) { + return "SELECT COUNT_BIG(*) FROM %s WHERE " + getTimeStampColumn(table) + " > ? AND %s"; } @Override @@ -228,7 +229,7 @@ public long getRowCountModifiedAfter(String table, Instant time, boolean isDelet @Override public long getRowCountModifiedAfter(String table, Instant time) throws SQLException { List conditions = new ArrayList<>(1); - conditions.add("modifiedts > ?"); + conditions.add(getTimeStampColumn(table) + " > ?"); processDefaultConditions(table, conditions); try (Connection connection = getConnection()) { @@ -262,8 +263,9 @@ public DataSet getAllModifiedAfter(String table, Instant time) throws Exception List conditions = new ArrayList<>(1); processDefaultConditions(table, conditions); try (Connection connection = getConnection()) { - try (PreparedStatement stmt = connection.prepareStatement(String - .format("SELECT * FROM %s WHERE modifiedts > ? AND %s", table, expandConditions(conditions)))) { + try (PreparedStatement stmt = connection + .prepareStatement(String.format("SELECT * FROM %s WHERE %s > ? AND %s", table, + getTimeStampColumn(table), expandConditions(conditions)))) { stmt.setTimestamp(1, Timestamp.from(time)); ResultSet resultSet = stmt.executeQuery(); return convertToDataSet(resultSet); @@ -513,23 +515,25 @@ private String detectTypeSystemSuffix(String tableName, String name) { } @Override - public boolean isAuditTable(String table) throws Exception { - String tablePrefix = getDataSourceConfiguration().getTablePrefix(); - String query = String.format("SELECT count(*) from %s%s WHERE AuditTableName = ? OR AuditTableName = ?", - StringUtils.defaultIfBlank(tablePrefix, ""), CommercedbsyncConstants.DEPLOYMENTS_TABLE); - try (Connection connection = getConnection(); PreparedStatement stmt = connection.prepareStatement(query)) { - stmt.setObject(1, StringUtils.removeStartIgnoreCase(table, tablePrefix)); - stmt.setObject(2, table); - try (ResultSet rs = stmt.executeQuery()) { - boolean isAudit = false; - if (rs.next()) { - isAudit = rs.getInt(1) > 0; + public boolean isAuditTable(final String table) throws Exception { + return knownAuditTables.computeIfAbsent(table, t -> { + String tablePrefix = getDataSourceConfiguration().getTablePrefix(); + String query = String.format("SELECT count(*) from %s%s WHERE AuditTableName = ? OR AuditTableName = ?", + StringUtils.defaultIfBlank(tablePrefix, ""), CommercedbsyncConstants.DEPLOYMENTS_TABLE); + try (Connection connection = getConnection(); PreparedStatement stmt = connection.prepareStatement(query)) { + stmt.setObject(1, StringUtils.removeStartIgnoreCase(table, tablePrefix)); + stmt.setObject(2, table); + try (ResultSet rs = stmt.executeQuery()) { + boolean isAudit = false; + if (rs.next()) { + isAudit = rs.getInt(1) > 0; + } + return isAudit; } - return isAudit; + } catch (SQLException ignored) { + return false; } - } catch (SQLException ignored) { - return false; - } + }); } protected abstract String createAllTableNamesQuery(); @@ -561,7 +565,7 @@ public DataSet getBatchWithoutIdentifier(OffsetQueryDefinition queryDefinition, List conditionsList = new ArrayList<>(1); processDefaultConditions(queryDefinition.getTable(), conditionsList); if (time != null) { - conditionsList.add("modifiedts > ?"); + conditionsList.add(getTimeStampColumn(queryDefinition.getTable()) + " > ?"); } String[] conditions = null; if (!conditionsList.isEmpty()) { @@ -603,7 +607,7 @@ public DataSet getBatchOrderedByColumn(SeekQueryDefinition queryDefinition, Inst int conditionIndex = 1; int timeConditionIndex = 0; if (time != null) { - conditionsList.add("modifiedts > ?"); + conditionsList.add(getTimeStampColumn(queryDefinition.getTable()) + " > ?"); timeConditionIndex = conditionIndex++; } int lastColumnConditionIndex = 0; @@ -657,8 +661,9 @@ public DataSet getBatchMarkersOrderedByColumn(MarkersQueryDefinition queryDefini // get batches with modifiedts >= configured time for incremental migration List conditionsList = new ArrayList<>(2); processDefaultConditions(queryDefinition.getTable(), conditionsList); + if (time != null) { - conditionsList.add("modifiedts > ?"); + conditionsList.add(getTimeStampColumn(queryDefinition.getTable()) + " > ?"); } String[] conditions = null; if (!conditionsList.isEmpty()) { @@ -743,6 +748,19 @@ protected DataSet convertToBatchDataSet(int batchId, ResultSet resultSet, final return convertToDataSet(batchId, resultSet, partition); } + protected String getTimeStampColumn(String tableName) { + try { + if (isAuditTable(tableName)) { + return "currenttimestamp"; + } + } catch (Exception e) { + // Log an error if there is an issue checking if the table is an audit table + LOG.error("Error checking if table is an audit table", e); + } + // Default to using the modified timestamp column + return "modifiedts"; + } + @Override public boolean validateConnection() throws SQLException { try (Connection connection = getConnection()) { diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/AzureDataRepository.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/AzureDataRepository.java index 712d367..97cd90c 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/AzureDataRepository.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/AzureDataRepository.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -246,11 +246,6 @@ protected String createRowCountQuery() { return "SELECT COUNT_BIG(*) FROM %s WHERE %s"; } - @Override - protected String createRowCountModifiedAfterQuery() { - return "SELECT COUNT_BIG(*) FROM %s WHERE modifiedts > ? AND %s"; - } - @Override public long getRowCount(String table) throws SQLException { List conditionsList = new ArrayList<>(1); @@ -281,7 +276,7 @@ public long getRowCountModifiedAfter(String table, Instant time) throws SQLExcep } try (Connection connection = getConnection()) { try (PreparedStatement stmt = connection.prepareStatement( - String.format(createRowCountModifiedAfterQuery(), table, expandConditions(conditions)))) { + String.format(createRowCountModifiedAfterQuery(table), table, expandConditions(conditions)))) { stmt.setTimestamp(1, Timestamp.from(time)); ResultSet resultSet = stmt.executeQuery(); long value = 0; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/AzureIncrementalDataRepository.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/AzureIncrementalDataRepository.java index b5e7ba8..e07ab73 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/AzureIncrementalDataRepository.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/AzureIncrementalDataRepository.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -95,6 +95,12 @@ public DataSet getBatchOrderedByColumn(SeekQueryDefinition queryDefinition, Inst } } + @Override + protected String createRowCountModifiedAfterQuery(String table) { + return "SELECT COUNT_BIG(*) FROM %s WHERE " + getTimeStampColumn(table) + " > ?"; + + } + private String buildValueBatchQueryForDeletion(SeekQueryDefinition queryDefinition, String... conditions) { return String.format("SELECT TOP %s * FROM %s WHERE %s ORDER BY %s", queryDefinition.getBatchSize(), deletionTable, expandConditions(conditions), queryDefinition.getColumn()); diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/DataRepositoryFactory.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/DataRepositoryFactory.java index 21a1ac6..5063195 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/DataRepositoryFactory.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/DataRepositoryFactory.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/HanaDataRepository.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/HanaDataRepository.java index fe863f5..768e5f8 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/HanaDataRepository.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/HanaDataRepository.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/HsqlRepository.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/HsqlRepository.java index 60a13d0..a5ae052 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/HsqlRepository.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/HsqlRepository.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/MySQLDataRepository.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/MySQLDataRepository.java index 3a992cc..50c7efb 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/MySQLDataRepository.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/MySQLDataRepository.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/MySQLIncrementalDataRepository.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/MySQLIncrementalDataRepository.java index 60dc994..2db3dca 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/MySQLIncrementalDataRepository.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/MySQLIncrementalDataRepository.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/NullRepository.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/NullRepository.java index d905181..2ea5df0 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/NullRepository.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/NullRepository.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/OracleDataRepository.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/OracleDataRepository.java index db05602..8b31198 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/OracleDataRepository.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/OracleDataRepository.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/PostGresDataRepository.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/PostGresDataRepository.java index 3f46d60..559ce9c 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/PostGresDataRepository.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/impl/PostGresDataRepository.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -154,7 +154,7 @@ public String buildBulkUpsertStatement(String table, List columnsToCopy, sqlBuilder.append("INSERT INTO ").append(table).append(" \n"); sqlBuilder .append(getBulkInsertStatementParamList(columnsToCopy, Collections.nCopies(columnsToCopy.size(), "?"))); - sqlBuilder.append(String.format(" ON CONFLICT (%s) DO UPDATE ", upsertIDs.get(0))).append('\n'); + sqlBuilder.append(String.format(" ON CONFLICT (%s) DO UPDATE ", String.join(", ", upsertIDs))).append('\n'); sqlBuilder.append(getBulkUpdateStatementParamList(columnsToCopy, Collections.emptyList(), upsertIDs)); return sqlBuilder.toString(); diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisHANABuilder.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisHANABuilder.java index 1a0fcc8..246e691 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisHANABuilder.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisHANABuilder.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisHANAPlatform.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisHANAPlatform.java index a9e7a4e..e1f2d02 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisHANAPlatform.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisHANAPlatform.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisMSSqlBuilder.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisMSSqlBuilder.java index 8a3aade..6efeedb 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisMSSqlBuilder.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisMSSqlBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisMSSqlPlatform.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisMSSqlPlatform.java index 05f9e49..f844f22 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisMSSqlPlatform.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisMSSqlPlatform.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisMySqlBuilder.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisMySqlBuilder.java index 322a5a6..ce47e6f 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisMySqlBuilder.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisMySqlBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisMySqlPlatform.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisMySqlPlatform.java index 638514e..01e6156 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisMySqlPlatform.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisMySqlPlatform.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisPostGresBuilder.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisPostGresBuilder.java index 03fb311..80b03c2 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisPostGresBuilder.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisPostGresBuilder.java @@ -1,23 +1,24 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ package com.sap.cx.boosters.commercedbsync.repository.platform; +import de.hybris.bootstrap.ddl.DatabaseSettings; +import de.hybris.bootstrap.ddl.sql.HybrisPostgreSqlBuilder; import org.apache.commons.lang3.StringUtils; import org.apache.ddlutils.Platform; import org.apache.ddlutils.model.Column; import org.apache.ddlutils.model.TypeMap; -import org.apache.ddlutils.platform.postgresql.PostgreSqlBuilder; import java.sql.Types; -public class MigrationHybrisPostGresBuilder extends PostgreSqlBuilder { +public class MigrationHybrisPostGresBuilder extends HybrisPostgreSqlBuilder { - public MigrationHybrisPostGresBuilder(Platform platform) { - super(platform); + public MigrationHybrisPostGresBuilder(Platform platform, DatabaseSettings databaseSettings) { + super(platform, databaseSettings); } @Override @@ -40,7 +41,7 @@ protected String getSqlType(Column column) { if (sizeSpec != null) { if (this.getPlatformInfo().hasSize(column.getTypeCode())) { sqlType.append("("); - sqlType.append(detectSize(column)); + sqlType.append(sizeSpec); sqlType.append(")"); } else if (this.getPlatformInfo().hasPrecisionAndScale(column.getTypeCode())) { sqlType.append("("); @@ -55,28 +56,6 @@ protected String getSqlType(Column column) { return sqlType.toString(); } - // ddlutils cannot handle "complex" sizes ootb, therefore adding support here - private String detectSize(Column column) { - if (this.getPlatformInfo().hasSize(column.getTypeCode())) { - if (column.getTypeCode() == Types.NVARCHAR) { - if (column.getSizeAsInt() > 4000) { - return "MAX"; - } - } - if (column.getTypeCode() == Types.VARCHAR) { - if (column.getSizeAsInt() > 8000) { - return "MAX"; - } - } - if (column.getTypeCode() == Types.VARBINARY) { - if (column.getSizeAsInt() > 8000) { - return "MAX"; - } - } - } - return column.getSize(); - } - @Override public boolean isValidDefaultValue(String defaultSpec, int typeCode) { return defaultSpec != null && StringUtils.isNumeric(defaultSpec) diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisPostGresPlatform.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisPostGresPlatform.java index 07aff13..da71f7d 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisPostGresPlatform.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/repository/platform/MigrationHybrisPostGresPlatform.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -33,7 +33,7 @@ private MigrationHybrisPostGresPlatform() { public static HybrisPlatform build(DatabaseSettings databaseSettings) { MigrationHybrisPostGresPlatform instance = new MigrationHybrisPostGresPlatform(); instance.provideCustomMapping(); - instance.setSqlBuilder(new MigrationHybrisPostGresBuilder(instance)); + instance.setSqlBuilder(new MigrationHybrisPostGresBuilder(instance, databaseSettings)); instance.setModelReader(new MigrationPostgreSqlModelReader(instance)); return instance; } @@ -43,17 +43,17 @@ private void provideCustomMapping() { platformInfo.setMaxIdentifierLength(63); platformInfo.setMaxColumnNameLength(30); platformInfo.addNativeTypeMapping(Types.NVARCHAR, "VARCHAR", Types.VARCHAR); - platformInfo.addNativeTypeMapping(Types.NCHAR, "int2", Types.TINYINT); - platformInfo.addNativeTypeMapping(Types.CHAR, "int2", Types.TINYINT); + platformInfo.addNativeTypeMapping(Types.NCHAR, "SMALLINT", Types.TINYINT); + platformInfo.addNativeTypeMapping(Types.CHAR, "SMALLINT", Types.TINYINT); platformInfo.setHasSize(Types.CHAR, false); platformInfo.setHasSize(Types.NCHAR, false); platformInfo.setHasSize(Types.NVARCHAR, true); platformInfo.setHasSize(Types.VARCHAR, true); - platformInfo.addNativeTypeMapping(Types.BIGINT, "int8"); - platformInfo.addNativeTypeMapping(Types.INTEGER, "int"); - platformInfo.addNativeTypeMapping(Types.SMALLINT, "int2"); - platformInfo.addNativeTypeMapping(Types.TINYINT, "int2"); - platformInfo.addNativeTypeMapping(Types.DOUBLE, "float8"); + platformInfo.addNativeTypeMapping(Types.BIGINT, "BIGINT"); + platformInfo.addNativeTypeMapping(Types.INTEGER, "INTEGER"); + platformInfo.addNativeTypeMapping(Types.SMALLINT, "SMALLINT"); + platformInfo.addNativeTypeMapping(Types.TINYINT, "SMALLINT"); + platformInfo.addNativeTypeMapping(Types.DOUBLE, "DOUBLE PRECISION", Types.DOUBLE); } @Override diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/ClusterTableSplittingStrategy.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/ClusterTableSplittingStrategy.java index 7da0617..23e0de8 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/ClusterTableSplittingStrategy.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/ClusterTableSplittingStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/DatabaseCopyScheduler.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/DatabaseCopyScheduler.java index db8d914..b01d3bb 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/DatabaseCopyScheduler.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/DatabaseCopyScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/DatabaseOperationSchedulerAlgorithm.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/DatabaseOperationSchedulerAlgorithm.java index 724c65f..67bd97f 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/DatabaseOperationSchedulerAlgorithm.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/DatabaseOperationSchedulerAlgorithm.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/DatabaseSchemaDifferenceScheduler.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/DatabaseSchemaDifferenceScheduler.java index 97d37f3..e6d74c4 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/DatabaseSchemaDifferenceScheduler.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/DatabaseSchemaDifferenceScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/impl/CustomClusterDatabaseCopyScheduler.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/impl/CustomClusterDatabaseCopyScheduler.java index 6967b0d..23c3ae9 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/impl/CustomClusterDatabaseCopyScheduler.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/impl/CustomClusterDatabaseCopyScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/impl/DefaultClusterTableSplittingStrategy.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/impl/DefaultClusterTableSplittingStrategy.java index 17bbf11..eab875f 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/impl/DefaultClusterTableSplittingStrategy.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/impl/DefaultClusterTableSplittingStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/impl/DefaultDatabaseSchemaDifferenceScheduler.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/impl/DefaultDatabaseSchemaDifferenceScheduler.java index ec4a33a..ed2efd4 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/impl/DefaultDatabaseSchemaDifferenceScheduler.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/impl/DefaultDatabaseSchemaDifferenceScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/impl/RoundRobinClusterSchedulerAlgorithm.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/impl/RoundRobinClusterSchedulerAlgorithm.java index d84595e..ff6f621 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/impl/RoundRobinClusterSchedulerAlgorithm.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/scheduler/impl/RoundRobinClusterSchedulerAlgorithm.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseCopyTaskRepository.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseCopyTaskRepository.java index c229a63..d83eb71 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseCopyTaskRepository.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseCopyTaskRepository.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseMigrationCopyService.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseMigrationCopyService.java index d2c81c2..bbb2409 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseMigrationCopyService.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseMigrationCopyService.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseMigrationDataTypeMapperService.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseMigrationDataTypeMapperService.java index bfd1627..5168279 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseMigrationDataTypeMapperService.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseMigrationDataTypeMapperService.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseMigrationReportService.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseMigrationReportService.java index dae8cfe..8d64840 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseMigrationReportService.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseMigrationReportService.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseMigrationReportStorageService.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseMigrationReportStorageService.java index 341c40c..e8c8cc6 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseMigrationReportStorageService.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseMigrationReportStorageService.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseMigrationService.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseMigrationService.java index f288954..2769890 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseMigrationService.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseMigrationService.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseSchemaDifferenceService.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseSchemaDifferenceService.java index 0765a53..ec71242 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseSchemaDifferenceService.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseSchemaDifferenceService.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseSchemaDifferenceTaskRepository.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseSchemaDifferenceTaskRepository.java index 8a3dbc5..fcda0f4 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseSchemaDifferenceTaskRepository.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/DatabaseSchemaDifferenceTaskRepository.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/BlobDatabaseMigrationReportStorageService.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/BlobDatabaseMigrationReportStorageService.java index 881a126..959404a 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/BlobDatabaseMigrationReportStorageService.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/BlobDatabaseMigrationReportStorageService.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -13,7 +13,7 @@ import com.azure.storage.blob.specialized.BlockBlobClient; import com.sap.cx.boosters.commercedbsync.service.DatabaseMigrationReportStorageService; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import com.sap.cx.boosters.commercedbsync.context.MigrationContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseCopyTaskRepository.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseCopyTaskRepository.java index baeadb2..a9056b8 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseCopyTaskRepository.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseCopyTaskRepository.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseMigrationDataTypeMapperService.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseMigrationDataTypeMapperService.java index d1162e6..c987cf8 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseMigrationDataTypeMapperService.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseMigrationDataTypeMapperService.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseMigrationReportService.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseMigrationReportService.java index d70fd4b..6a71caf 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseMigrationReportService.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseMigrationReportService.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -10,7 +10,7 @@ import com.sap.cx.boosters.commercedbsync.scheduler.DatabaseCopyScheduler; import com.sap.cx.boosters.commercedbsync.utils.MaskUtil; import de.hybris.platform.servicelayer.config.ConfigurationService; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import com.sap.cx.boosters.commercedbsync.MigrationReport; import com.sap.cx.boosters.commercedbsync.context.CopyContext; import com.sap.cx.boosters.commercedbsync.service.DatabaseCopyTaskRepository; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseMigrationService.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseMigrationService.java index c31e675..4544ca1 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseMigrationService.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseMigrationService.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseSchemaDifferenceService.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseSchemaDifferenceService.java index 000a10a..fa72316 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseSchemaDifferenceService.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseSchemaDifferenceService.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -28,7 +28,7 @@ import com.sap.cx.boosters.commercedbsync.service.DatabaseSchemaDifferenceTaskRepository; import de.hybris.platform.commercedbsynchac.data.SchemaDifferenceResultData; import de.hybris.platform.servicelayer.config.ConfigurationService; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.ddlutils.Platform; import org.apache.ddlutils.model.Column; @@ -40,7 +40,7 @@ import org.slf4j.MDC; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.StringWriter; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseSchemaDifferenceTaskRepository.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseSchemaDifferenceTaskRepository.java index 7b9930d..45f9bf2 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseSchemaDifferenceTaskRepository.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseSchemaDifferenceTaskRepository.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/PipeDatabaseMigrationCopyService.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/PipeDatabaseMigrationCopyService.java index 862294a..5c56a9d 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/PipeDatabaseMigrationCopyService.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/PipeDatabaseMigrationCopyService.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/setup/InitUpdateProcessTrigger.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/setup/InitUpdateProcessTrigger.java index 81943e7..3e67f1c 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/setup/InitUpdateProcessTrigger.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/setup/InitUpdateProcessTrigger.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/strategy/PipeWriterStrategy.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/strategy/PipeWriterStrategy.java index 780025b..9fef22f 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/strategy/PipeWriterStrategy.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/strategy/PipeWriterStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -9,14 +9,11 @@ import com.sap.cx.boosters.commercedbsync.concurrent.DataPipe; import com.sap.cx.boosters.commercedbsync.context.CopyContext; -import javax.annotation.concurrent.ThreadSafe; - /** * Main Strategy to Write Data to a target Database * * @param */ -@ThreadSafe public interface PipeWriterStrategy { /** * Performs the actual copying of Data Items diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/strategy/impl/CopyPipeWriterContext.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/strategy/impl/CopyPipeWriterContext.java index 6f07be4..783400b 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/strategy/impl/CopyPipeWriterContext.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/strategy/impl/CopyPipeWriterContext.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/strategy/impl/CopyPipeWriterStrategy.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/strategy/impl/CopyPipeWriterStrategy.java index 18775fd..0d2e26d 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/strategy/impl/CopyPipeWriterStrategy.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/strategy/impl/CopyPipeWriterStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -16,7 +16,7 @@ import com.sap.cx.boosters.commercedbsync.strategy.PipeWriterStrategy; import de.hybris.bootstrap.ddl.DataBaseProvider; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import com.sap.cx.boosters.commercedbsync.DataThreadPoolConfig; import com.sap.cx.boosters.commercedbsync.concurrent.DataPipe; import com.sap.cx.boosters.commercedbsync.concurrent.DataThreadPoolConfigBuilder; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/strategy/impl/CopyPipeWriterTask.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/strategy/impl/CopyPipeWriterTask.java index 3cef7cd..48f4126 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/strategy/impl/CopyPipeWriterTask.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/strategy/impl/CopyPipeWriterTask.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -19,7 +19,7 @@ import com.sap.cx.boosters.commercedbsync.performance.PerformanceRecorder; import com.sap.cx.boosters.commercedbsync.performance.PerformanceUnit; import de.hybris.bootstrap.ddl.DataBaseProvider; -import org.apache.commons.collections.MapUtils; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/strategy/impl/DataDeleteWriterTask.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/strategy/impl/DataDeleteWriterTask.java index d71b10d..f1866bf 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/strategy/impl/DataDeleteWriterTask.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/strategy/impl/DataDeleteWriterTask.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/utils/FileUtils.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/utils/FileUtils.java index 99de317..071d231 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/utils/FileUtils.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/utils/FileUtils.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/utils/LocalDateTypeAdapter.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/utils/LocalDateTypeAdapter.java index b8293d0..a3f52ed 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/utils/LocalDateTypeAdapter.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/utils/LocalDateTypeAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/utils/MaskUtil.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/utils/MaskUtil.java index 27b022c..5386326 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/utils/MaskUtil.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/utils/MaskUtil.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/views/TableViewGenerator.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/views/TableViewGenerator.java index 464ee6a..04be535 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/views/TableViewGenerator.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/views/TableViewGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -11,7 +11,7 @@ import java.util.Set; import java.util.stream.Collectors; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.StringSubstitutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/views/ViewConfigurationContext.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/views/ViewConfigurationContext.java index 374be38..f7c1283 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/views/ViewConfigurationContext.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/views/ViewConfigurationContext.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/src/de/hybris/platform/azure/media/AzureCloudUtils.java b/commercedbsync/src/de/hybris/platform/azure/media/AzureCloudUtils.java index c7b07c7..c67eec5 100644 --- a/commercedbsync/src/de/hybris/platform/azure/media/AzureCloudUtils.java +++ b/commercedbsync/src/de/hybris/platform/azure/media/AzureCloudUtils.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -9,7 +9,7 @@ import de.hybris.platform.core.Registry; import de.hybris.platform.media.storage.MediaStorageConfigService; import de.hybris.platform.util.Config; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class AzureCloudUtils { private static final int MIN_AZURE_MEDIA_FOLDER_QUALIFIER_SIZE = 3; diff --git a/commercedbsync/src/de/hybris/platform/core/TenantPropertiesLoader.java b/commercedbsync/src/de/hybris/platform/core/TenantPropertiesLoader.java index 441ee20..4e37df7 100644 --- a/commercedbsync/src/de/hybris/platform/core/TenantPropertiesLoader.java +++ b/commercedbsync/src/de/hybris/platform/core/TenantPropertiesLoader.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsync/testsrc/com/sap/cx/boosters/commercedbsync/views/TableViewGeneratorTest.java b/commercedbsync/testsrc/com/sap/cx/boosters/commercedbsync/views/TableViewGeneratorTest.java index 9baf5f4..f2160ac 100644 --- a/commercedbsync/testsrc/com/sap/cx/boosters/commercedbsync/views/TableViewGeneratorTest.java +++ b/commercedbsync/testsrc/com/sap/cx/boosters/commercedbsync/views/TableViewGeneratorTest.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/buildcallbacks.xml b/commercedbsynchac/buildcallbacks.xml index 1750cbc..00077da 100644 --- a/commercedbsynchac/buildcallbacks.xml +++ b/commercedbsynchac/buildcallbacks.xml @@ -1,6 +1,6 @@ diff --git a/commercedbsynchac/extensioninfo.xml b/commercedbsynchac/extensioninfo.xml index f8e32d5..c6fd6f4 100644 --- a/commercedbsynchac/extensioninfo.xml +++ b/commercedbsynchac/extensioninfo.xml @@ -1,6 +1,6 @@ diff --git a/commercedbsynchac/external-dependencies.xml b/commercedbsynchac/external-dependencies.xml index 4d5a2e2..1d6ff14 100644 --- a/commercedbsynchac/external-dependencies.xml +++ b/commercedbsynchac/external-dependencies.xml @@ -1,5 +1,5 @@ diff --git a/commercedbsynchac/hac/resources/jsp/dataCopy.jsp b/commercedbsynchac/hac/resources/jsp/dataCopy.jsp index 2369d61..6e84e91 100644 --- a/commercedbsynchac/hac/resources/jsp/dataCopy.jsp +++ b/commercedbsynchac/hac/resources/jsp/dataCopy.jsp @@ -1,7 +1,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib prefix="hac" uri="/WEB-INF/custom.tld" %> <%-- - ~ Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + ~ Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. ~ License: Apache-2.0 ~ --%> diff --git a/commercedbsynchac/hac/resources/jsp/dataSource.jsp b/commercedbsynchac/hac/resources/jsp/dataSource.jsp index 9e3ec0d..72eb4bd 100644 --- a/commercedbsynchac/hac/resources/jsp/dataSource.jsp +++ b/commercedbsynchac/hac/resources/jsp/dataSource.jsp @@ -1,7 +1,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib prefix="hac" uri="/WEB-INF/custom.tld" %> <%-- - ~ Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + ~ Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. ~ License: Apache-2.0 ~ --%> diff --git a/commercedbsynchac/hac/resources/jsp/migrationReports.jsp b/commercedbsynchac/hac/resources/jsp/migrationReports.jsp index 44daa59..53d9a0b 100644 --- a/commercedbsynchac/hac/resources/jsp/migrationReports.jsp +++ b/commercedbsynchac/hac/resources/jsp/migrationReports.jsp @@ -2,7 +2,7 @@ <%@ taglib prefix="hac" uri="/WEB-INF/custom.tld" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%-- - ~ Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + ~ Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. ~ License: Apache-2.0 ~ --%> diff --git a/commercedbsynchac/hac/resources/jsp/schemaCopy.jsp b/commercedbsynchac/hac/resources/jsp/schemaCopy.jsp index 5cacb1e..3c0c571 100644 --- a/commercedbsynchac/hac/resources/jsp/schemaCopy.jsp +++ b/commercedbsynchac/hac/resources/jsp/schemaCopy.jsp @@ -2,7 +2,7 @@ <%@ taglib prefix="hac" uri="/WEB-INF/custom.tld" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%-- - ~ Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + ~ Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. ~ License: Apache-2.0 ~ --%> diff --git a/commercedbsynchac/hac/resources/static/css/dataCopy.css b/commercedbsynchac/hac/resources/static/css/dataCopy.css index bf16320..90592b1 100644 --- a/commercedbsynchac/hac/resources/static/css/dataCopy.css +++ b/commercedbsynchac/hac/resources/static/css/dataCopy.css @@ -1,5 +1,5 @@ /* - * Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/hac/resources/static/css/database.css b/commercedbsynchac/hac/resources/static/css/database.css index 8c8565f..2b2e2ba 100644 --- a/commercedbsynchac/hac/resources/static/css/database.css +++ b/commercedbsynchac/hac/resources/static/css/database.css @@ -1,5 +1,5 @@ /* - * Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/hac/resources/static/css/schemaCopy.css b/commercedbsynchac/hac/resources/static/css/schemaCopy.css index b6b441b..539e75a 100644 --- a/commercedbsynchac/hac/resources/static/css/schemaCopy.css +++ b/commercedbsynchac/hac/resources/static/css/schemaCopy.css @@ -1,5 +1,5 @@ /* - * Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/hac/resources/static/js/customStatistics.js b/commercedbsynchac/hac/resources/static/js/customStatistics.js index 859886d..22d4b0f 100644 --- a/commercedbsynchac/hac/resources/static/js/customStatistics.js +++ b/commercedbsynchac/hac/resources/static/js/customStatistics.js @@ -1,5 +1,5 @@ /* - * Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/hac/resources/static/js/dataCopy.js b/commercedbsynchac/hac/resources/static/js/dataCopy.js index c78aa80..1371761 100644 --- a/commercedbsynchac/hac/resources/static/js/dataCopy.js +++ b/commercedbsynchac/hac/resources/static/js/dataCopy.js @@ -1,5 +1,5 @@ /* - * Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/hac/resources/static/js/dataSource.js b/commercedbsynchac/hac/resources/static/js/dataSource.js index efe9e81..24dae45 100644 --- a/commercedbsynchac/hac/resources/static/js/dataSource.js +++ b/commercedbsynchac/hac/resources/static/js/dataSource.js @@ -1,5 +1,5 @@ /* - * Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/hac/resources/static/js/migrationMetrics.js b/commercedbsynchac/hac/resources/static/js/migrationMetrics.js index f0f3055..3c9a8f8 100644 --- a/commercedbsynchac/hac/resources/static/js/migrationMetrics.js +++ b/commercedbsynchac/hac/resources/static/js/migrationMetrics.js @@ -1,6 +1,6 @@ /* - * Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/hac/resources/static/js/migrationReports.js b/commercedbsynchac/hac/resources/static/js/migrationReports.js index 4b5367e..115d9bd 100644 --- a/commercedbsynchac/hac/resources/static/js/migrationReports.js +++ b/commercedbsynchac/hac/resources/static/js/migrationReports.js @@ -1,5 +1,5 @@ /* - * Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/hac/resources/static/js/schemaCopy.js b/commercedbsynchac/hac/resources/static/js/schemaCopy.js index a63dfb9..6d2c0a8 100644 --- a/commercedbsynchac/hac/resources/static/js/schemaCopy.js +++ b/commercedbsynchac/hac/resources/static/js/schemaCopy.js @@ -1,5 +1,5 @@ /* - * Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/hac/src/de/hybris/platform/hac/controller/CommercemigrationhacController.java b/commercedbsynchac/hac/src/de/hybris/platform/hac/controller/CommercemigrationhacController.java index b8b3bd9..0c4db95 100644 --- a/commercedbsynchac/hac/src/de/hybris/platform/hac/controller/CommercemigrationhacController.java +++ b/commercedbsynchac/hac/src/de/hybris/platform/hac/controller/CommercemigrationhacController.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -26,9 +26,9 @@ import de.hybris.platform.commercedbsynchac.data.*; import de.hybris.platform.servicelayer.config.ConfigurationService; import de.hybris.platform.servicelayer.user.UserService; -import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.logging.log4j.util.Strings; import org.slf4j.Logger; @@ -43,7 +43,7 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.Serializable; import java.net.URI; import java.nio.charset.StandardCharsets; @@ -58,7 +58,7 @@ * */ @Controller -@RequestMapping("/commercedbsynchac/**") +@RequestMapping("/commercedbsynchac") public class CommercemigrationhacController { private static final String DEFAULT_EMPTY_VAL = "[NOT SET]"; diff --git a/commercedbsynchac/hac/testsrc/de/hybris/platform/hac/controller/CommercemigrationhacControllerTest.java b/commercedbsynchac/hac/testsrc/de/hybris/platform/hac/controller/CommercemigrationhacControllerTest.java index 74dd53f..e5505a5 100644 --- a/commercedbsynchac/hac/testsrc/de/hybris/platform/hac/controller/CommercemigrationhacControllerTest.java +++ b/commercedbsynchac/hac/testsrc/de/hybris/platform/hac/controller/CommercemigrationhacControllerTest.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/project.properties b/commercedbsynchac/project.properties index cd1fd56..39a626e 100644 --- a/commercedbsynchac/project.properties +++ b/commercedbsynchac/project.properties @@ -1,5 +1,5 @@ # -# Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. +# Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. # License: Apache-2.0 # # diff --git a/commercedbsynchac/resources/commercedbsynchac-beans.xml b/commercedbsynchac/resources/commercedbsynchac-beans.xml index d1822b6..3257144 100644 --- a/commercedbsynchac/resources/commercedbsynchac-beans.xml +++ b/commercedbsynchac/resources/commercedbsynchac-beans.xml @@ -1,7 +1,7 @@ diff --git a/commercedbsynchac/resources/commercedbsynchac-items.xml b/commercedbsynchac/resources/commercedbsynchac-items.xml index 0549dc5..673ffab 100644 --- a/commercedbsynchac/resources/commercedbsynchac-items.xml +++ b/commercedbsynchac/resources/commercedbsynchac-items.xml @@ -1,6 +1,6 @@ diff --git a/commercedbsynchac/resources/commercedbsynchac-spring.xml b/commercedbsynchac/resources/commercedbsynchac-spring.xml index ff81411..aa5bf7b 100644 --- a/commercedbsynchac/resources/commercedbsynchac-spring.xml +++ b/commercedbsynchac/resources/commercedbsynchac-spring.xml @@ -1,6 +1,6 @@ diff --git a/commercedbsynchac/resources/localization/i2ihac-locales_de.properties b/commercedbsynchac/resources/localization/i2ihac-locales_de.properties index e214d48..ccc4d7e 100644 --- a/commercedbsynchac/resources/localization/i2ihac-locales_de.properties +++ b/commercedbsynchac/resources/localization/i2ihac-locales_de.properties @@ -1,5 +1,5 @@ # -# Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. +# Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. # License: Apache-2.0 # # diff --git a/commercedbsynchac/resources/localization/i2ihac-locales_en.properties b/commercedbsynchac/resources/localization/i2ihac-locales_en.properties index e214d48..ccc4d7e 100644 --- a/commercedbsynchac/resources/localization/i2ihac-locales_en.properties +++ b/commercedbsynchac/resources/localization/i2ihac-locales_en.properties @@ -1,5 +1,5 @@ # -# Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. +# Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. # License: Apache-2.0 # # diff --git a/commercedbsynchac/resources/localization/i2ihac-locales_es.properties b/commercedbsynchac/resources/localization/i2ihac-locales_es.properties index e214d48..ccc4d7e 100644 --- a/commercedbsynchac/resources/localization/i2ihac-locales_es.properties +++ b/commercedbsynchac/resources/localization/i2ihac-locales_es.properties @@ -1,5 +1,5 @@ # -# Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. +# Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. # License: Apache-2.0 # # diff --git a/commercedbsynchac/resources/localization/i2ihac-locales_fr.properties b/commercedbsynchac/resources/localization/i2ihac-locales_fr.properties index e214d48..ccc4d7e 100644 --- a/commercedbsynchac/resources/localization/i2ihac-locales_fr.properties +++ b/commercedbsynchac/resources/localization/i2ihac-locales_fr.properties @@ -1,5 +1,5 @@ # -# Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. +# Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. # License: Apache-2.0 # # diff --git a/commercedbsynchac/resources/localization/i2ihac-locales_it.properties b/commercedbsynchac/resources/localization/i2ihac-locales_it.properties index e214d48..ccc4d7e 100644 --- a/commercedbsynchac/resources/localization/i2ihac-locales_it.properties +++ b/commercedbsynchac/resources/localization/i2ihac-locales_it.properties @@ -1,5 +1,5 @@ # -# Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. +# Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. # License: Apache-2.0 # # diff --git a/commercedbsynchac/resources/localization/i2ihac-locales_ja.properties b/commercedbsynchac/resources/localization/i2ihac-locales_ja.properties index e214d48..ccc4d7e 100644 --- a/commercedbsynchac/resources/localization/i2ihac-locales_ja.properties +++ b/commercedbsynchac/resources/localization/i2ihac-locales_ja.properties @@ -1,5 +1,5 @@ # -# Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. +# Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. # License: Apache-2.0 # # diff --git a/commercedbsynchac/resources/localization/i2ihac-locales_ko.properties b/commercedbsynchac/resources/localization/i2ihac-locales_ko.properties index e214d48..ccc4d7e 100644 --- a/commercedbsynchac/resources/localization/i2ihac-locales_ko.properties +++ b/commercedbsynchac/resources/localization/i2ihac-locales_ko.properties @@ -1,5 +1,5 @@ # -# Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. +# Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. # License: Apache-2.0 # # diff --git a/commercedbsynchac/resources/localization/i2ihac-locales_pt.properties b/commercedbsynchac/resources/localization/i2ihac-locales_pt.properties index e214d48..ccc4d7e 100644 --- a/commercedbsynchac/resources/localization/i2ihac-locales_pt.properties +++ b/commercedbsynchac/resources/localization/i2ihac-locales_pt.properties @@ -1,5 +1,5 @@ # -# Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. +# Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. # License: Apache-2.0 # # diff --git a/commercedbsynchac/resources/localization/i2ihac-locales_ru.properties b/commercedbsynchac/resources/localization/i2ihac-locales_ru.properties index e214d48..ccc4d7e 100644 --- a/commercedbsynchac/resources/localization/i2ihac-locales_ru.properties +++ b/commercedbsynchac/resources/localization/i2ihac-locales_ru.properties @@ -1,5 +1,5 @@ # -# Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. +# Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. # License: Apache-2.0 # # diff --git a/commercedbsynchac/resources/localization/i2ihac-locales_zh.properties b/commercedbsynchac/resources/localization/i2ihac-locales_zh.properties index e214d48..ccc4d7e 100644 --- a/commercedbsynchac/resources/localization/i2ihac-locales_zh.properties +++ b/commercedbsynchac/resources/localization/i2ihac-locales_zh.properties @@ -1,5 +1,5 @@ # -# Copyright: 2022 SAP SE or an SAP affiliate company and commerce-db-synccontributors. +# Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. # License: Apache-2.0 # # diff --git a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/CommercedbsynchacStandalone.java b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/CommercedbsynchacStandalone.java index b5022a0..e0aa83d 100644 --- a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/CommercedbsynchacStandalone.java +++ b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/CommercedbsynchacStandalone.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/constants/YhacextConstants.java b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/constants/YhacextConstants.java index 7b1c1a5..aa9e40b 100644 --- a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/constants/YhacextConstants.java +++ b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/constants/YhacextConstants.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/MetricService.java b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/MetricService.java index 7427122..56c998c 100644 --- a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/MetricService.java +++ b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/MetricService.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/impl/DefaultMetricService.java b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/impl/DefaultMetricService.java index 2df3ef5..ca8d817 100644 --- a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/impl/DefaultMetricService.java +++ b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/impl/DefaultMetricService.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/MetricPopulator.java b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/MetricPopulator.java index 6e94bde..622cf06 100644 --- a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/MetricPopulator.java +++ b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/MetricPopulator.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/CpuMetricPopulator.java b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/CpuMetricPopulator.java index d7c0f9f..b5a3de4 100644 --- a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/CpuMetricPopulator.java +++ b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/CpuMetricPopulator.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/DTUMetricPopulator.java b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/DTUMetricPopulator.java index be223be..38da998 100644 --- a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/DTUMetricPopulator.java +++ b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/DTUMetricPopulator.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/HikariConnectionMetricPopulator.java b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/HikariConnectionMetricPopulator.java index 4fa8df3..f984d12 100644 --- a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/HikariConnectionMetricPopulator.java +++ b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/HikariConnectionMetricPopulator.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/HikariSourceConnectionMetricPopulator.java b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/HikariSourceConnectionMetricPopulator.java index 8ea13ad..9cd294b 100644 --- a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/HikariSourceConnectionMetricPopulator.java +++ b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/HikariSourceConnectionMetricPopulator.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/HikariTargetConnectionMetricPopulator.java b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/HikariTargetConnectionMetricPopulator.java index 465bdb2..8ab4932 100644 --- a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/HikariTargetConnectionMetricPopulator.java +++ b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/HikariTargetConnectionMetricPopulator.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/IOMetricPopulator.java b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/IOMetricPopulator.java index 973cb99..1a32483 100644 --- a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/IOMetricPopulator.java +++ b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/IOMetricPopulator.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/MemoryMetricPopulator.java b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/MemoryMetricPopulator.java index 735b7c2..365002b 100644 --- a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/MemoryMetricPopulator.java +++ b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/MemoryMetricPopulator.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ diff --git a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/TaskExecutorMetricPopulator.java b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/TaskExecutorMetricPopulator.java index 7b0d7e1..c48f8c1 100644 --- a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/TaskExecutorMetricPopulator.java +++ b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/TaskExecutorMetricPopulator.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -8,7 +8,7 @@ import com.sap.cx.boosters.commercedbsynchac.metric.populator.MetricPopulator; import de.hybris.platform.commercedbsynchac.data.MetricData; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import com.sap.cx.boosters.commercedbsync.context.MigrationContext; import org.springframework.core.task.AsyncTaskExecutor; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; diff --git a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/ThreadPoolMetricPopulator.java b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/ThreadPoolMetricPopulator.java index 3b41e28..c54d6bf 100644 --- a/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/ThreadPoolMetricPopulator.java +++ b/commercedbsynchac/src/com/sap/cx/boosters/commercedbsynchac/metric/populator/impl/ThreadPoolMetricPopulator.java @@ -1,5 +1,5 @@ /* - * Copyright: 2023 SAP SE or an SAP affiliate company and commerce-db-synccontributors. + * Copyright: 2025 SAP SE or an SAP affiliate company and commerce-db-synccontributors. * License: Apache-2.0 * */ @@ -10,7 +10,7 @@ import com.sap.cx.boosters.commercedbsync.context.MigrationContext; import com.sap.cx.boosters.commercedbsynchac.metric.populator.MetricPopulator; import de.hybris.platform.commercedbsynchac.data.MetricData; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class ThreadPoolMetricPopulator implements MetricPopulator { From c5c33e3c01351ad6645112522074bd9e9a38f1bc Mon Sep 17 00:00:00 2001 From: CMT Technical User Date: Mon, 1 Sep 2025 12:21:00 +0000 Subject: [PATCH 2/3] Synchronize repository - 2025-09-01 --- .../impl/DefaultDatabaseCopyTaskRepository.java | 4 ---- .../impl/DefaultDatabaseSchemaDifferenceService.java | 6 +++--- ...DefaultDatabaseSchemaDifferenceTaskRepository.java | 11 ++++------- .../controller/CommercemigrationhacController.java | 8 ++++++++ 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseCopyTaskRepository.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseCopyTaskRepository.java index a9056b8..f4d065c 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseCopyTaskRepository.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseCopyTaskRepository.java @@ -367,10 +367,6 @@ private Connection getConnection(CopyContext context) throws Exception { } private Connection getConnection(MigrationContext context) throws Exception { - /* - * if (!repository.getDatabaseProvider().isMssqlUsed()) { throw new - * IllegalStateException("Scheduler tables requires MSSQL database"); } - */ return context.getDataRepository().getConnection(); } diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseSchemaDifferenceService.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseSchemaDifferenceService.java index fa72316..86414a7 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseSchemaDifferenceService.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseSchemaDifferenceService.java @@ -128,9 +128,9 @@ private String processChanges(final MigrationContext context, final Database cur } /* - * ORACLE_TARGET - START This a TEMP fix, it is difficlt to get from from Sql - * Server NVARCHAR(255), NVARCHAR(MAX) to convert properly into to Orcale's - * VARCHAR2(255) and CLOB respectively. Therefore when the schema script output + * ORACLE_TARGET - START This a TEMP fix, it is difficult to get from from Sql + * Server NVARCHAR(255), NVARCHAR(MAX) to convert properly into to Oracle's + * VARCHAR2(255) and CLOB respectively. Therefore, when the schema script output * has VARCHAR2(2147483647) which is from SqlServer's NVARCHAR(max), then we * just make it CLOB. Alternatively check if something can be done via the * mappings in OracleDataRepository. diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseSchemaDifferenceTaskRepository.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseSchemaDifferenceTaskRepository.java index 45f9bf2..76da97e 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseSchemaDifferenceTaskRepository.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseSchemaDifferenceTaskRepository.java @@ -10,7 +10,6 @@ import com.sap.cx.boosters.commercedbsync.SchemaDifferenceStatus; import com.sap.cx.boosters.commercedbsync.context.MigrationContext; import com.sap.cx.boosters.commercedbsync.context.SchemaDifferenceContext; -import com.sap.cx.boosters.commercedbsync.repository.DataRepository; import com.sap.cx.boosters.commercedbsync.service.DatabaseSchemaDifferenceTaskRepository; import de.hybris.platform.commercedbsynchac.data.SchemaDifferenceResultContainerData; import de.hybris.platform.commercedbsynchac.data.SchemaDifferenceResultData; @@ -200,13 +199,11 @@ private Timestamp now() { } private Connection getConnection(SchemaDifferenceContext context) throws Exception { - final MigrationContext migrationContext = context.getMigrationContext(); - - final DataRepository repository = !migrationContext.isDataSynchronizationEnabled() - ? migrationContext.getDataTargetRepository() - : migrationContext.getDataSourceRepository(); + return getConnection(context.getMigrationContext()); + } - return repository.getConnection(); + private Connection getConnection(MigrationContext context) throws Exception { + return context.getDataRepository().getConnection(); } /** diff --git a/commercedbsynchac/hac/src/de/hybris/platform/hac/controller/CommercemigrationhacController.java b/commercedbsynchac/hac/src/de/hybris/platform/hac/controller/CommercemigrationhacController.java index 0c4db95..f1e0b25 100644 --- a/commercedbsynchac/hac/src/de/hybris/platform/hac/controller/CommercemigrationhacController.java +++ b/commercedbsynchac/hac/src/de/hybris/platform/hac/controller/CommercemigrationhacController.java @@ -87,6 +87,8 @@ public class CommercemigrationhacController { @Autowired BlobDatabaseMigrationReportStorageService blobDatabaseMigrationReportStorageService; + private long lastStartRequest = -1; + private final boolean useCodeMirrorWebJar; public CommercemigrationhacController() { @@ -297,6 +299,12 @@ public MigrationStatus copyData(@RequestParam Map copyConf throw new IllegalStateException("Migration cannot be started from HAC"); } + if (lastStartRequest > 0 && (System.currentTimeMillis() - lastStartRequest) < 5000) { + throw new IllegalStateException("Please wait at least 5 seconds before starting a migration again"); + } + + lastStartRequest = System.currentTimeMillis(); + String currentMigrationId = databaseMigrationService.getMigrationID(migrationContext); MigrationStatus migrationStatus = new MigrationStatus(); LaunchOptions launchOptions = new LaunchOptions(); From c35689b0dc1ab90be2ebaf1c8124c9bc5a2b97cb Mon Sep 17 00:00:00 2001 From: CMT Technical User Date: Mon, 1 Sep 2025 12:35:15 +0000 Subject: [PATCH 3/3] Synchronize repository - 2025-09-01 --- commercedbsync/project.properties | 7 +++++++ .../resources/sql/createSchedulerTablesHANA.sql | 4 ++-- .../resources/sql/createSchedulerTablesMSSQL.sql | 4 ++-- .../resources/sql/createSchedulerTablesMYSQL.sql | 4 ++-- .../resources/sql/createSchedulerTablesORACLE.sql | 4 ++-- .../resources/sql/createSchedulerTablesPOSTGRESQL.sql | 4 ++-- .../validation/impl/DefaultMigrationContextValidator.java | 6 +++--- .../service/impl/DefaultDatabaseCopyTaskRepository.java | 8 ++++---- 8 files changed, 24 insertions(+), 17 deletions(-) diff --git a/commercedbsync/project.properties b/commercedbsync/project.properties index ac2638a..12fd1b5 100644 --- a/commercedbsync/project.properties +++ b/commercedbsync/project.properties @@ -684,6 +684,13 @@ migration.media.container.prefix=${db.tableprefix} # @optional true ## migration.media.container.suffix= +## +# Allow to disable the validation, that source database is not CCv2 managed database +# +# @values true or false +# @optional true +## +migration.disable.source.db.check=false # Enhanced Logging log4j2.appender.migrationAppender.type=Console diff --git a/commercedbsync/resources/sql/createSchedulerTablesHANA.sql b/commercedbsync/resources/sql/createSchedulerTablesHANA.sql index 4c95129..22b27bb 100644 --- a/commercedbsync/resources/sql/createSchedulerTablesHANA.sql +++ b/commercedbsync/resources/sql/createSchedulerTablesHANA.sql @@ -83,8 +83,8 @@ CREATE TABLE MIGRATIONTOOLKIT_TABLECOPYBATCHES_PART ( pipelinename NVARCHAR(255) NOT NULL, lowerBoundary NVARCHAR(255) NOT NULL, upperBoundary NVARCHAR(255) NULL, - partition VARCHAR(128) NOT NULL, - PRIMARY KEY (migrationid, batchId, pipelinename, partition) + partKey VARCHAR(128) NOT NULL, + PRIMARY KEY (migrationid, batchId, pipelinename, partKey) ); # diff --git a/commercedbsync/resources/sql/createSchedulerTablesMSSQL.sql b/commercedbsync/resources/sql/createSchedulerTablesMSSQL.sql index c02e7e2..920dca6 100644 --- a/commercedbsync/resources/sql/createSchedulerTablesMSSQL.sql +++ b/commercedbsync/resources/sql/createSchedulerTablesMSSQL.sql @@ -48,8 +48,8 @@ CREATE TABLE MIGRATIONTOOLKIT_TABLECOPYBATCHES_PART ( pipelinename NVARCHAR(255) NOT NULL, lowerBoundary NVARCHAR(255) NOT NULL, upperBoundary NVARCHAR(255) NULL, - partition VARCHAR(128) NOT NULL, - PRIMARY KEY (migrationid, batchId, pipelinename, partition) + partKey VARCHAR(128) NOT NULL, + PRIMARY KEY (migrationid, batchId, pipelinename, partKey) ); DROP TABLE IF EXISTS MIGRATIONTOOLKIT_TABLECOPYSTATUS; diff --git a/commercedbsync/resources/sql/createSchedulerTablesMYSQL.sql b/commercedbsync/resources/sql/createSchedulerTablesMYSQL.sql index c976ceb..dfec2bb 100644 --- a/commercedbsync/resources/sql/createSchedulerTablesMYSQL.sql +++ b/commercedbsync/resources/sql/createSchedulerTablesMYSQL.sql @@ -50,8 +50,8 @@ CREATE TABLE MIGRATIONTOOLKIT_TABLECOPYBATCHES_PART pipelinename VARCHAR(255) NOT NULL, lowerBoundary VARCHAR(255) NOT NULL, upperBoundary VARCHAR(255) NULL, - partition VARCHAR(128) NOT NULL, - PRIMARY KEY (migrationid, batchId, pipelinename, partition) + partKey VARCHAR(128) NOT NULL, + PRIMARY KEY (migrationid, batchId, pipelinename, partKey) ); # DROP TABLE IF EXISTS MIGRATIONTOOLKIT_TABLECOPYSTATUS; diff --git a/commercedbsync/resources/sql/createSchedulerTablesORACLE.sql b/commercedbsync/resources/sql/createSchedulerTablesORACLE.sql index bf2047f..52a5f77 100644 --- a/commercedbsync/resources/sql/createSchedulerTablesORACLE.sql +++ b/commercedbsync/resources/sql/createSchedulerTablesORACLE.sql @@ -72,8 +72,8 @@ CREATE TABLE MIGRATIONTOOLKIT_TABLECOPYBATCHES_PART ( pipelinename NVARCHAR2(255) NOT NULL, lowerBoundary NVARCHAR2(255) NOT NULL, upperBoundary NVARCHAR2(255) NULL, - partition VARCHAR(128) NOT NULL, - PRIMARY KEY (migrationid, batchId, pipelinename, partition) + partKey VARCHAR(128) NOT NULL, + PRIMARY KEY (migrationid, batchId, pipelinename, partKey) ) / diff --git a/commercedbsync/resources/sql/createSchedulerTablesPOSTGRESQL.sql b/commercedbsync/resources/sql/createSchedulerTablesPOSTGRESQL.sql index f10cb61..c86bd6a 100644 --- a/commercedbsync/resources/sql/createSchedulerTablesPOSTGRESQL.sql +++ b/commercedbsync/resources/sql/createSchedulerTablesPOSTGRESQL.sql @@ -57,8 +57,8 @@ CREATE TABLE MIGRATIONTOOLKIT_TABLECOPYBATCHES_PART ( pipelinename VARCHAR(255) NOT NULL, lowerBoundary VARCHAR(255) NOT NULL, upperBoundary VARCHAR(255) NULL, - partition VARCHAR(128) NOT NULL, - PRIMARY KEY (migrationid, batchId, pipelinename, partition) + partKey VARCHAR(128) NOT NULL, + PRIMARY KEY (migrationid, batchId, pipelinename, partKey) ); # diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/validation/impl/DefaultMigrationContextValidator.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/validation/impl/DefaultMigrationContextValidator.java index cae35a3..88ef5ff 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/validation/impl/DefaultMigrationContextValidator.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/context/validation/impl/DefaultMigrationContextValidator.java @@ -25,6 +25,7 @@ public class DefaultMigrationContextValidator implements MigrationContextValidat private static final String DB_URL_PROPERTY_KEY = "db.url"; private static final String DISABLE_UNLOCKING = "system.unlocking.disabled"; + private static final String DISABLE_SOURCE_DB_CHECK = "migration.disable.source.db.check"; private ConfigurationService configurationService; @Override @@ -41,12 +42,11 @@ private void checkSourceDbIsNotTargetDb(MigrationContext context) { return; // in this mode, source DB can (should?) be set to CCv2 instance } - // Canonically the target should always be the CCV2 DB and we have to verify - // nobody is trying to copy *from* that final String sourceDbUrl = context.getDataSourceRepository().getDataSourceConfiguration().getConnectionString(); final String ccv2ManagedDB = getConfigurationService().getConfiguration().getString(DB_URL_PROPERTY_KEY); - if (sourceDbUrl.equals(ccv2ManagedDB)) { + if (!getConfigurationService().getConfiguration().getBoolean(DISABLE_SOURCE_DB_CHECK, false) + && sourceDbUrl.equals(ccv2ManagedDB)) { throw new RuntimeException( "Invalid data source configuration - cannot use the CCV2-managed database as the source."); } diff --git a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseCopyTaskRepository.java b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseCopyTaskRepository.java index f4d065c..5926bb9 100644 --- a/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseCopyTaskRepository.java +++ b/commercedbsync/src/com/sap/cx/boosters/commercedbsync/service/impl/DefaultDatabaseCopyTaskRepository.java @@ -241,7 +241,7 @@ public void scheduleBatch(CopyContext context, CopyContext.DataCopyItem copyItem } else { LOG.debug("Schedule Batch for {} with ID {}, partition {}", copyItem.getPipelineName(), batchId, partition); String insert = "INSERT INTO " + TABLECOPYBATCHES_PART - + " (migrationId, batchId, pipelinename, lowerBoundary, upperBoundary, partition) VALUES (?, ?, ?, ?, ?, ?)"; + + " (migrationId, batchId, pipelinename, lowerBoundary, upperBoundary, partKey) VALUES (?, ?, ?, ?, ?, ?)"; try (Connection conn = getConnection(context); PreparedStatement stmt = conn.prepareStatement(insert)) { stmt.setObject(1, context.getMigrationId()); stmt.setObject(2, batchId); @@ -278,7 +278,7 @@ public void markBatchCompleted(CopyContext context, CopyContext.DataCopyItem cop } else { LOG.debug("Mark batch completed for {} with ID {}", copyItem.getPipelineName(), batchId); String insert = "DELETE FROM " + TABLECOPYBATCHES_PART - + " WHERE migrationId = ? AND batchId = ? AND pipelinename = ? AND partition = ?"; + + " WHERE migrationId = ? AND batchId = ? AND pipelinename = ? AND partKey = ?"; try (Connection conn = getConnection(context); PreparedStatement stmt = conn.prepareStatement(insert)) { stmt.setObject(1, context.getMigrationId()); stmt.setObject(2, batchId); @@ -311,7 +311,7 @@ public void resetPipelineBatches(CopyContext context, CopyContext.DataCopyItem c resetPipelineBatches(context, copyItem); } else { String insert = "DELETE FROM " + TABLECOPYBATCHES_PART - + " WHERE migrationId = ? AND pipelinename = ? AND partition = ?"; + + " WHERE migrationId = ? AND pipelinename = ? AND partKey = ?"; try (Connection conn = getConnection(context); PreparedStatement stmt = conn.prepareStatement(insert)) { stmt.setObject(1, context.getMigrationId()); stmt.setObject(2, copyItem.getPipelineName()); @@ -343,7 +343,7 @@ public Set findPendingBatchesForPipeline(CopyContext context, return findPendingBatchesForPipeline(context, item); } else { String sql = "SELECT * FROM " + TABLECOPYBATCHES_PART - + " WHERE migrationid = ? AND pipelinename = ? and partition = ? ORDER BY batchId ASC"; + + " WHERE migrationid = ? AND pipelinename = ? and partKey = ? ORDER BY batchId ASC"; try (Connection connection = getConnection(context); PreparedStatement stmt = connection.prepareStatement(sql)) { stmt.setObject(1, context.getMigrationId());