diff --git a/builder/src/main/java/cz/xtf/builder/db/AbstractDatabase.java b/builder/src/main/java/cz/xtf/builder/db/AbstractDatabase.java index 7d88e8a4..d95e8983 100644 --- a/builder/src/main/java/cz/xtf/builder/db/AbstractDatabase.java +++ b/builder/src/main/java/cz/xtf/builder/db/AbstractDatabase.java @@ -80,12 +80,6 @@ public AbstractDatabase(String symbolicName, String dataDir, boolean withLivenes this.withReadinessProbe = withReadinessProbe; } - public AbstractDatabase(String symbolicName, String dataDir, boolean withLivenessProbe, boolean withReadinessProbe, - boolean configureEnvironment) { - this(symbolicName, dataDir, withLivenessProbe, withReadinessProbe); - this.configureEnvironment = configureEnvironment; - } - public AbstractDatabase(String symbolicName, String dataDir, boolean withLivenessProbe, boolean withReadinessProbe, boolean withStartupProbe, boolean configureEnvironment) { @@ -144,21 +138,6 @@ public AbstractDatabase(String username, String password, String dbName, String this.withReadinessProbe = withReadinessProbe; } - public AbstractDatabase(String username, String password, String dbName, String symbolicName, String dataDir, - boolean withLivenessProbe, boolean withReadinessProbe, boolean configureEnvironment) { - this(username, password, dbName, symbolicName, dataDir, withLivenessProbe, withReadinessProbe); - this.configureEnvironment = configureEnvironment; - } - - public AbstractDatabase(String username, String password, String dbName, String symbolicName, String dataDir, - boolean withLivenessProbe, boolean withReadinessProbe, boolean withStartupProbe, boolean configureEnvironment) { - this(username, password, dbName, symbolicName, dataDir); - this.configureEnvironment = configureEnvironment; - this.withLivenessProbe = withLivenessProbe; - this.withReadinessProbe = withReadinessProbe; - this.withStartupProbe = withStartupProbe; - } - public abstract String getImageName(); public abstract int getPort(); diff --git a/builder/src/main/java/cz/xtf/builder/db/AbstractSQLDatabase.java b/builder/src/main/java/cz/xtf/builder/db/AbstractSQLDatabase.java index 048b9405..5e753292 100644 --- a/builder/src/main/java/cz/xtf/builder/db/AbstractSQLDatabase.java +++ b/builder/src/main/java/cz/xtf/builder/db/AbstractSQLDatabase.java @@ -45,11 +45,6 @@ public AbstractSQLDatabase(String symbolicName, String dataDir, boolean withLive super(symbolicName, dataDir, withLivenessProbe, withReadinessProbe); } - public AbstractSQLDatabase(String symbolicName, String dataDir, boolean withLivenessProbe, boolean withReadinessProbe, - boolean configureEnvironment) { - super(symbolicName, dataDir, withLivenessProbe, withReadinessProbe, configureEnvironment); - } - public AbstractSQLDatabase(String symbolicName, String dataDir, boolean withLivenessProbe, boolean withReadinessProbe, boolean withStartupProbe, boolean configureEnvironment) { @@ -61,17 +56,6 @@ public AbstractSQLDatabase(String username, String password, String dbName, Stri super(username, password, dbName, symbolicName, dataDir, withLivenessProbe, withReadinessProbe); } - public AbstractSQLDatabase(String username, String password, String dbName, String symbolicName, String dataDir, - boolean withLivenessProbe, boolean withReadinessProbe, boolean configureEnvironment) { - super(username, password, dbName, symbolicName, dataDir, withLivenessProbe, withReadinessProbe, configureEnvironment); - } - - public AbstractSQLDatabase(String username, String password, String dbName, String symbolicName, String dataDir, - boolean withLivenessProbe, boolean withReadinessProbe, boolean withStartupProbe, boolean configureEnvironment) { - super(username, password, dbName, symbolicName, dataDir, withLivenessProbe, withReadinessProbe, withStartupProbe, - configureEnvironment); - } - public AbstractSQLDatabase(String symbolicName, String dataDir, PersistentVolumeClaim pvc, boolean withLivenessProbe, boolean withReadinessProbe) { super(symbolicName, dataDir, pvc, withLivenessProbe, withReadinessProbe); diff --git a/builder/src/main/java/cz/xtf/builder/db/PostgreSQL.java b/builder/src/main/java/cz/xtf/builder/db/PostgreSQL.java index 3eb77bdd..74a8a79c 100644 --- a/builder/src/main/java/cz/xtf/builder/db/PostgreSQL.java +++ b/builder/src/main/java/cz/xtf/builder/db/PostgreSQL.java @@ -135,212 +135,6 @@ public void setArgs(List args) { this.args = args; } - public PostgreSQL( - String symbolicName, - String dataDir, - PersistentVolumeClaim pvc, - String username, - String password, - String dbName, - boolean configureEnvironment, - boolean withLivenessProbe, - boolean withReadinessProbe, - boolean withStartupProbe, - Map vars, - List args, - Supplier deploymentConfigName, - Supplier envVarPrefix) { - super( - (symbolicName == null || symbolicName.isEmpty()) ? DEFAULT_SYMBOLIC_NAME : symbolicName, - (dataDir == null || dataDir.isEmpty()) ? DEFAULT_DATA_DIR : dataDir, - pvc, - username, - password, - dbName, - configureEnvironment, - withLivenessProbe, - withReadinessProbe, - withStartupProbe, - deploymentConfigName, - envVarPrefix); - this.vars = vars; - if (vars == null) { - this.vars = DEFAULT_VARS; - } - this.args = args; - } - - public PostgreSQL() { - //super("POSTGRESQL", DEFAULT_DATA_DIR); - super( - DEFAULT_SYMBOLIC_NAME, - DEFAULT_DATA_DIR, - null, - null, - null, - null, - true, - false, - false, - false, - null, - null); - } - - public PostgreSQL(String dataDir) { - //super("POSTGRESQL", dataDir); - super( - DEFAULT_SYMBOLIC_NAME, - dataDir, - null, - null, - null, - null, - true, - false, - false, - false, - null, - null); - } - - public PostgreSQL(boolean withLivenessProbe, boolean withReadinessProbe) { - //super("POSTGRESQL", DEFAULT_DATA_DIR, withLivenessProbe, withReadinessProbe); - super( - DEFAULT_SYMBOLIC_NAME, - DEFAULT_DATA_DIR, - null, - null, - null, - null, - true, - withLivenessProbe, - withReadinessProbe, - false, - null, - null); - } - - public PostgreSQL(boolean withLivenessProbe, boolean withReadinessProbe, boolean withStartupProbe) { - //super("POSTGRESQL", DEFAULT_DATA_DIR, withLivenessProbe, withReadinessProbe, withStartupProbe, true); - super( - DEFAULT_SYMBOLIC_NAME, - DEFAULT_DATA_DIR, - null, - null, - null, - null, - true, - withLivenessProbe, - withReadinessProbe, - withStartupProbe, - null, - null); - } - - public PostgreSQL(PersistentVolumeClaim pvc) { - //super("POSTGRESQL", DEFAULT_DATA_DIR, pvc); - super( - DEFAULT_SYMBOLIC_NAME, - DEFAULT_DATA_DIR, - pvc, - null, - null, - null, - true, - false, - false, - false, - null, - null); - } - - public PostgreSQL(PersistentVolumeClaim pvc, boolean withLivenessProbe, boolean withReadinessProbe) { - //super("POSTGRESQL", DEFAULT_DATA_DIR, pvc, withLivenessProbe, withReadinessProbe); - super( - DEFAULT_SYMBOLIC_NAME, - DEFAULT_DATA_DIR, - pvc, - null, - null, - null, - true, - withLivenessProbe, - withReadinessProbe, - false, - null, - null); - } - - public PostgreSQL(PersistentVolumeClaim pvc, boolean withLivenessProbe, boolean withReadinessProbe, - boolean withStartupProbe) { - //super("POSTGRESQL", DEFAULT_DATA_DIR, pvc, withLivenessProbe, withReadinessProbe, withStartupProbe); - super( - DEFAULT_SYMBOLIC_NAME, - DEFAULT_DATA_DIR, - pvc, - null, - null, - null, - true, - withLivenessProbe, - withReadinessProbe, - withStartupProbe, - null, - null); - } - - public PostgreSQL(String username, String password, String dbName) { - //super(username, password, dbName, "POSTGRESQL", DEFAULT_DATA_DIR); - super( - DEFAULT_SYMBOLIC_NAME, - DEFAULT_DATA_DIR, - null, - username, - password, - dbName, - true, - false, - false, - false, - null, - null); - } - - public PostgreSQL(String symbolicName, boolean withLivenessProbe, boolean withReadinessProbe) { - //super(symbolicName, DEFAULT_DATA_DIR, withLivenessProbe, withReadinessProbe); - super( - symbolicName, - DEFAULT_DATA_DIR, - null, - null, - null, - null, - true, - withLivenessProbe, - withReadinessProbe, - false, - null, - null); - } - - public PostgreSQL(String symbolicName, boolean withLivenessProbe, boolean withReadinessProbe, boolean withStartupProbe) { - //super(symbolicName, DEFAULT_DATA_DIR, withLivenessProbe, withReadinessProbe, withStartupProbe, true); - super( - symbolicName, - DEFAULT_DATA_DIR, - null, - null, - null, - null, - true, - withLivenessProbe, - withReadinessProbe, - withStartupProbe, - null, - null); - } - @Override public String getImageName() { return Image.resolve("postgresql").getUrl();