Remove double imports and fix rebase

Author: Nicole Schmidt

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42010to42100.java

@@ -27,8 +27,6 @@
 import java.util.UUID;
 import java.io.InputStream;
 import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
 import java.util.List;
 
 import org.apache.cloudstack.framework.config.ConfigKey;
@@ -62,7 +60,7 @@ public InputStream[] getPrepareScripts() {
         return new InputStream[] {script};
     }
 
-    private void performKeyPairMigration(Connection conn) throws SQLException {
+    protected void performKeyPairMigration(Connection conn) throws SQLException {
         try {
             logger.debug("Performing keypair migration from user table to api_keypair table.");
             PreparedStatement pstmt = conn.prepareStatement("SELECT u.id, u.api_key, u.secret_key, a.domain_id, u.id FROM `cloud`.`user` AS u JOIN `cloud`.`account` AS a " +

engine/schema/src/test/java/com/cloud/upgrade/dao/Upgrade42010to42100Test.java

@@ -47,6 +47,7 @@ public void testPerformDataMigration() throws SQLException {
             when(dbUpgradeUtils.getTableColumnType(conn, "configuration", "scope")).thenReturn("varchar(255)");
 
             try (MockedStatic<TransactionLegacy> ignored2 = Mockito.mockStatic(TransactionLegacy.class)) {
+                Mockito.doNothing().when(upgrade).performKeyPairMigration(conn);
                 TransactionLegacy txn = Mockito.mock(TransactionLegacy.class);
                 when(TransactionLegacy.currentTxn()).thenReturn(txn);
                 PreparedStatement pstmt = Mockito.mock(PreparedStatement.class);