This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch 4_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 3fa9c722725c3fb63ab2885c324623994110b008 Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Mon Aug 10 08:19:22 2026 +0200 Reflow --- .../jpa/upgrade/AbstractUpgradeStatements.java | 2 +- .../jpa/upgrade/GenerateUpgradeSQL.java | 25 +----------- .../jpa/upgrade/MariaDBUpgradeStatements.java | 4 +- .../jpa/upgrade/MySQLUpgradeStatements.java | 4 +- .../jpa/upgrade/OracleUpgradeStatements.java | 44 +++++++++++----------- .../jpa/upgrade/PostgreSQLUpgradeStatements.java | 4 +- .../persistence/jpa/upgrade/UpgradeStatements.java | 1 + .../jpa/upgrade/UpgradeStatementsFactory.java | 9 ++--- 8 files changed, 35 insertions(+), 58 deletions(-) diff --git a/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/AbstractUpgradeStatements.java b/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/AbstractUpgradeStatements.java index 2c3ef60ebc..dd129f93aa 100644 --- a/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/AbstractUpgradeStatements.java +++ b/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/AbstractUpgradeStatements.java @@ -20,7 +20,7 @@ package org.apache.syncope.core.persistence.jpa.upgrade; public abstract class AbstractUpgradeStatements implements UpgradeStatements { - protected String commonStatements() { + protected static String commonStatements() { return """ INSERT INTO GroupTypeExtension SELECT * FROM TypeExtension; INSERT INTO GroupTypeExtension_Class SELECT * FROM TypeExtension_AnyTypeClass; diff --git a/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/GenerateUpgradeSQL.java b/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/GenerateUpgradeSQL.java index ecba0b63b2..b9eda32fa9 100644 --- a/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/GenerateUpgradeSQL.java +++ b/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/GenerateUpgradeSQL.java @@ -26,29 +26,6 @@ import org.apache.openjpa.jdbc.schema.SchemaTool; public class GenerateUpgradeSQL { - private static final String INIT_SQL_STATEMENTS = - """ - INSERT INTO GroupTypeExtension SELECT * FROM TypeExtension; - INSERT INTO GroupTypeExtension_Class SELECT * FROM TypeExtension_AnyTypeClass; - DROP TABLE TypeExtension_AnyTypeClass; - DROP TABLE TypeExtension; - - UPDATE SyncopeGroup SET uManager_id=userOwner_id; - ALTER TABLE SyncopeGroup DROP COLUMN userOwner_id; - UPDATE SyncopeGroup SET gManager_id=groupOwner_id; - ALTER TABLE SyncopeGroup DROP COLUMN groupOwner_id; - - DROP TABLE SyncopeRole_DynRealm; - DROP TABLE DynRealmMembership; - DROP TABLE DynRealm; - DROP TABLE UDynGroupMembership; - DROP TABLE ADynGroupMembership; - DROP TABLE UDynGroupMembers; - DROP TABLE ADynGroupMembers; - DROP TABLE DynRoleMembers; - DROP TABLE DynRealmMembers; - """; - private final JDBCConfiguration jdbcConf; public GenerateUpgradeSQL(final JDBCConfiguration jdbcConf) { @@ -64,7 +41,7 @@ public class GenerateUpgradeSQL { // run OpenJPA's SchemaTool to get the update statements schemaTool.run(); - UpgradeStatements statements = UpgradeStatementsFactory.forDatabase(jdbcConf.getDBDictionaryInstance()); + UpgradeStatements statements = UpgradeStatementsFactory.getInstance(jdbcConf.getDBDictionaryInstance()); out.append('\n'); out.append(statements.getStatements()); diff --git a/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/MariaDBUpgradeStatements.java b/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/MariaDBUpgradeStatements.java index 929ee41871..058cfe7008 100644 --- a/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/MariaDBUpgradeStatements.java +++ b/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/MariaDBUpgradeStatements.java @@ -22,8 +22,8 @@ public class MariaDBUpgradeStatements extends AbstractUpgradeStatements { @Override public String getStatements() { - - String mariaDBUpgradeStatements = """ + String mariaDBUpgradeStatements = + """ UPDATE SyncopeGroup SET uManager_id=userOwner_id; SET @fk_name = ( diff --git a/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/MySQLUpgradeStatements.java b/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/MySQLUpgradeStatements.java index c9425cbc3b..95977d71d6 100644 --- a/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/MySQLUpgradeStatements.java +++ b/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/MySQLUpgradeStatements.java @@ -22,8 +22,8 @@ public class MySQLUpgradeStatements extends AbstractUpgradeStatements { @Override public String getStatements() { - - String mysqlUpgradeStatements = """ + String mysqlUpgradeStatements = + """ UPDATE SyncopeGroup SET uManager_id=userOwner_id; SET @fk_name = ( diff --git a/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/OracleUpgradeStatements.java b/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/OracleUpgradeStatements.java index 5f524ee8a2..fecfaf9d6f 100644 --- a/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/OracleUpgradeStatements.java +++ b/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/OracleUpgradeStatements.java @@ -20,28 +20,7 @@ package org.apache.syncope.core.persistence.jpa.upgrade; public class OracleUpgradeStatements extends AbstractUpgradeStatements { - @Override - public String getStatements() { - - String postgreSQLUpgradeStatements = """ - UPDATE SyncopeGroup SET uManager_id=userOwner_id; - ALTER TABLE SyncopeGroup DROP COLUMN userOwner_id; - - UPDATE SyncopeGroup SET gManager_id=groupOwner_id; - ALTER TABLE SyncopeGroup DROP COLUMN groupOwner_id; - - DELETE FROM ACCESSTOKEN; - ALTER TABLE ACCESSTOKEN MODIFY AUTHORITIES CLOB; - INSERT INTO OIDCOpEntity (id, jwks, customScopes) - SELECT id, clob_to_blob(json),'{}' FROM OIDCJWKS; - - DROP TABLE OIDCJWKS; - """; - - return convertCLOBToBLOBFunction() + commonStatements() + postgreSQLUpgradeStatements; - } - - private String convertCLOBToBLOBFunction() { + private static String convertCLOBToBLOBFunction() { return """ CREATE OR REPLACE FUNCTION clob_to_blob( p_clob IN CLOB @@ -74,4 +53,25 @@ public class OracleUpgradeStatements extends AbstractUpgradeStatements { """; } + + @Override + public String getStatements() { + String postgreSQLUpgradeStatements = + """ + UPDATE SyncopeGroup SET uManager_id=userOwner_id; + ALTER TABLE SyncopeGroup DROP COLUMN userOwner_id; + + UPDATE SyncopeGroup SET gManager_id=groupOwner_id; + ALTER TABLE SyncopeGroup DROP COLUMN groupOwner_id; + + DELETE FROM ACCESSTOKEN; + ALTER TABLE ACCESSTOKEN MODIFY AUTHORITIES CLOB; + INSERT INTO OIDCOpEntity (id, jwks, customScopes) + SELECT id, clob_to_blob(json),'{}' FROM OIDCJWKS; + + DROP TABLE OIDCJWKS; + """; + + return convertCLOBToBLOBFunction() + commonStatements() + postgreSQLUpgradeStatements; + } } diff --git a/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/PostgreSQLUpgradeStatements.java b/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/PostgreSQLUpgradeStatements.java index 417de71439..7f385f7d05 100644 --- a/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/PostgreSQLUpgradeStatements.java +++ b/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/PostgreSQLUpgradeStatements.java @@ -22,8 +22,8 @@ public class PostgreSQLUpgradeStatements extends AbstractUpgradeStatements { @Override public String getStatements() { - - String postgreSQLUpgradeStatements = """ + String postgreSQLUpgradeStatements = + """ UPDATE SyncopeGroup SET uManager_id=userOwner_id; ALTER TABLE SyncopeGroup DROP COLUMN userOwner_id; diff --git a/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/UpgradeStatements.java b/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/UpgradeStatements.java index 4c7b7bf846..0467f03a70 100644 --- a/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/UpgradeStatements.java +++ b/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/UpgradeStatements.java @@ -18,6 +18,7 @@ */ package org.apache.syncope.core.persistence.jpa.upgrade; +@FunctionalInterface public interface UpgradeStatements { String getStatements(); diff --git a/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/UpgradeStatementsFactory.java b/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/UpgradeStatementsFactory.java index dce3d26844..66a2502d29 100644 --- a/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/UpgradeStatementsFactory.java +++ b/core/persistence-jpa-upgrader/src/main/java/org/apache/syncope/core/persistence/jpa/upgrade/UpgradeStatementsFactory.java @@ -26,11 +26,7 @@ import org.apache.openjpa.jdbc.sql.PostgresDictionary; public final class UpgradeStatementsFactory { - private UpgradeStatementsFactory() { - } - - public static UpgradeStatements forDatabase(final DBDictionary dictionary) { - + public static UpgradeStatements getInstance(final DBDictionary dictionary) { if (dictionary instanceof PostgresDictionary) { return new PostgreSQLUpgradeStatements(); } @@ -46,4 +42,7 @@ public final class UpgradeStatementsFactory { throw new IllegalArgumentException(dictionary.platform); } + + private UpgradeStatementsFactory() { + } }
