This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch rel/0.93.0
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/rel/0.93.0 by this push:
new 9f8c3808e bug(#2165): Fix migration for adapter instances (#2167)
9f8c3808e is described below
commit 9f8c3808e834aaca985500c3415d893e6ace6cf0
Author: Philipp Zehnder <[email protected]>
AuthorDate: Mon Nov 13 09:08:49 2023 +0100
bug(#2165): Fix migration for adapter instances (#2167)
---
.../streampipes/service/core/migrations/v093/AdapterMigration.java | 4 +++-
.../core/migrations/v093/migrator/SpecificAdapterMigrator.java | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git
a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/v093/AdapterMigration.java
b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/v093/AdapterMigration.java
index 29fd205ab..0e488db65 100644
---
a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/v093/AdapterMigration.java
+++
b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/v093/AdapterMigration.java
@@ -111,7 +111,9 @@ public class AdapterMigration implements Migration {
LOG.info("Performing backup of old models to database
adapterinstance_backup");
adaptersToMigrate.forEach(adapter -> {
- new AdapterBackupWriter(adapterInstanceBackupClient, new
MigrationHelpers()).writeBackup(adapter);
+ // Is required to keep the _rev field for the original object. This
field must be removed for the backup
+ var copyAdapter = adapter.deepCopy();
+ new AdapterBackupWriter(adapterInstanceBackupClient, new
MigrationHelpers()).writeBackup(copyAdapter);
});
LOG.info("Performing migration of adapters");
diff --git
a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/v093/migrator/SpecificAdapterMigrator.java
b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/v093/migrator/SpecificAdapterMigrator.java
index 0c5a7765a..7c77c2f25 100644
---
a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/v093/migrator/SpecificAdapterMigrator.java
+++
b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/migrations/v093/migrator/SpecificAdapterMigrator.java
@@ -44,6 +44,8 @@ public class SpecificAdapterMigrator implements
AdapterMigrator {
var adapterName = helpers.getAdapterName(adapter);
var convertedAdapter = converter.convert(adapter);
+ LOG.info("Start migrating adapter {}", adapterName);
+
couchDbClient.update(convertedAdapter);
LOG.info("Successfully migrated adapter {}", adapterName);
