Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 8 additions & 27 deletions src/main/java/org/dependencytrack/upgrade/v480/v480Updater.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@
import java.sql.Connection;
import java.sql.PreparedStatement;

import static org.dependencytrack.model.ConfigPropertyConstants.JIRA_URL;
import static org.dependencytrack.model.ConfigPropertyConstants.JIRA_USERNAME;
import static org.dependencytrack.model.ConfigPropertyConstants.JIRA_PASSWORD;

public class v480Updater extends AbstractUpgradeItem {

private static final Logger LOGGER = Logger.getLogger(v480Updater.class);
Expand All @@ -42,7 +38,7 @@ public String getSchemaVersion() {
@Override
public void executeUpgrade(final AlpineQueryManager qm, final Connection connection) throws Exception {
changeJdbcTypeOfComponentAuthorColumn(connection);
setJiraPropertyValuesFromJiraToIntegrationGroup(qm, connection);
setJiraPropertyValuesFromJiraToIntegrationGroup(connection);
}

private void changeJdbcTypeOfComponentAuthorColumn(Connection connection) throws Exception {
Expand All @@ -67,28 +63,13 @@ private void changeJdbcTypeOfComponentAuthorColumn(Connection connection) throws
}
}

private void setJiraPropertyValuesFromJiraToIntegrationGroup(AlpineQueryManager qm, Connection connection) throws Exception {
private void setJiraPropertyValuesFromJiraToIntegrationGroup(Connection connection) throws Exception {
LOGGER.info("Setting Jira property values from Groupname 'jira' to Groupname 'integrations'");
final PreparedStatement ps = connection.prepareStatement("""
UPDATE "CONFIGPROPERTY" SET "PROPERTYVALUE" = (
SELECT "PROPERTYVALUE" FROM "CONFIGPROPERTY"
WHERE "GROUPNAME" = 'jira' AND "PROPERTYNAME" = ?
) WHERE "GROUPNAME" = 'integrations' AND "PROPERTYNAME" = ?
""");

ps.setString(1, JIRA_URL.getPropertyName());
ps.setString(2, JIRA_URL.getPropertyName());
ps.executeUpdate();

ps.setString(1, JIRA_USERNAME.getPropertyName());
ps.setString(2, JIRA_USERNAME.getPropertyName());
ps.executeUpdate();

ps.setString(1, JIRA_PASSWORD.getPropertyName());
ps.setString(2, JIRA_PASSWORD.getPropertyName());
ps.executeUpdate();

LOGGER.info("Removing Groupname 'jira'");
DbUtil.executeUpdate(connection, "DELETE FROM \"CONFIGPROPERTY\" WHERE \"GROUPNAME\" = 'jira'");
try (final PreparedStatement ps = connection.prepareStatement("""
UPDATE "CONFIGPROPERTY" SET "GROUPNAME" = 'integrations'
WHERE "GROUPNAME" = 'jira' AND "PROPERTYNAME" LIKE 'jira.%'
""")) {
ps.executeUpdate();
}
}
}