You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2018/07/31 14:37:40 UTC

[1/2] syncope git commit: [SYNCOPE-1335] Generating more meaningful ids for implementations

Repository: syncope
Updated Branches:
  refs/heads/2_1_X 174588acc -> 689b087b1
  refs/heads/master 348f15064 -> cf95a35fa


[SYNCOPE-1335] Generating more meaningful ids for implementations


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/689b087b
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/689b087b
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/689b087b

Branch: refs/heads/2_1_X
Commit: 689b087b1a6c97f0f3f5a0eb8a06e563eec3ff09
Parents: 174588a
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Jul 31 16:37:18 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Jul 31 16:37:18 2018 +0200

----------------------------------------------------------------------
 .../java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/689b087b/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
----------------------------------------------------------------------
diff --git a/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java b/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
index 01554f3..cf0a924 100644
--- a/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
+++ b/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
@@ -114,7 +114,7 @@ public final class GenerateUpgradeSQL {
                     String itemId = rs.getString(1);
                     String transformerClassName = rs.getString(2);
 
-                    String implementationId = "OrgUnitItemTransformer_" + itemId;
+                    String implementationId = "OrgUnitItemTransformer_" + transformerClassName + "_" + itemId;
                     OUT.write("INSERT INTO Implementation(id,type,engine,body) VALUES("
                             + "'" + implementationId + "',"
                             + "'ITEM_TRANSFORMER',"
@@ -417,7 +417,7 @@ public final class GenerateUpgradeSQL {
                     String itemId = rs.getString(1);
                     String transformerClassName = rs.getString(2);
 
-                    String implementationId = "MappingItemTransformer_" + itemId;
+                    String implementationId = "MappingItemTransformer_" + transformerClassName + "_" + itemId;
                     OUT.write("INSERT INTO Implementation(id,type,engine,body) VALUES("
                             + "'" + implementationId + "',"
                             + "'ITEM_TRANSFORMER',"


[2/2] syncope git commit: [SYNCOPE-1335] Generating more meaningful ids for implementations

Posted by il...@apache.org.
[SYNCOPE-1335] Generating more meaningful ids for implementations


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/cf95a35f
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/cf95a35f
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/cf95a35f

Branch: refs/heads/master
Commit: cf95a35fabffebd73adde14a481508e31b7d29a1
Parents: 348f150
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Jul 31 16:37:18 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Jul 31 16:37:31 2018 +0200

----------------------------------------------------------------------
 .../java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/cf95a35f/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
----------------------------------------------------------------------
diff --git a/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java b/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
index 01554f3..cf0a924 100644
--- a/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
+++ b/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
@@ -114,7 +114,7 @@ public final class GenerateUpgradeSQL {
                     String itemId = rs.getString(1);
                     String transformerClassName = rs.getString(2);
 
-                    String implementationId = "OrgUnitItemTransformer_" + itemId;
+                    String implementationId = "OrgUnitItemTransformer_" + transformerClassName + "_" + itemId;
                     OUT.write("INSERT INTO Implementation(id,type,engine,body) VALUES("
                             + "'" + implementationId + "',"
                             + "'ITEM_TRANSFORMER',"
@@ -417,7 +417,7 @@ public final class GenerateUpgradeSQL {
                     String itemId = rs.getString(1);
                     String transformerClassName = rs.getString(2);
 
-                    String implementationId = "MappingItemTransformer_" + itemId;
+                    String implementationId = "MappingItemTransformer_" + transformerClassName + "_" + itemId;
                     OUT.write("INSERT INTO Implementation(id,type,engine,body) VALUES("
                             + "'" + implementationId + "',"
                             + "'ITEM_TRANSFORMER',"