keycloak-uncached
Changes
integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/AbstractAuthOptionsCmd.java 7(+4 -3)
integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/AbstractGlobalOptionsCmd.java 2(+1 -1)
integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigCmd.java 16(+12 -4)
integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigCredentialsCmd.java 5(+0 -5)
integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigInitialTokenCmd.java 5(+2 -3)
Details
diff --git a/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/AbstractAuthOptionsCmd.java b/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/AbstractAuthOptionsCmd.java
index 8ad0430..d088f0b 100644
--- a/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/AbstractAuthOptionsCmd.java
+++ b/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/AbstractAuthOptionsCmd.java
@@ -71,9 +71,9 @@ public abstract class AbstractAuthOptionsCmd extends AbstractGlobalOptionsCmd {
@Option(shortName = 't', name = "token", description = "Initial / Registration access token to use)", hasValue = true)
protected String token;
- protected void init(AbstractAuthOptionsCmd parent) {
+ protected void initFromParent(AbstractAuthOptionsCmd parent) {
- super.init(parent);
+ super.initFromParent(parent);
noconfig = parent.noconfig;
config = parent.config;
@@ -159,7 +159,8 @@ public abstract class AbstractAuthOptionsCmd extends AbstractGlobalOptionsCmd {
initConfigData(config);
ConfigUtil.setupInMemoryHandler(config);
- ConfigCredentialsCmd login = new ConfigCredentialsCmd(this);
+ ConfigCredentialsCmd login = new ConfigCredentialsCmd();
+ login.initFromParent(this);
login.init(config);
login.process(commandInvocation);
diff --git a/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/AbstractGlobalOptionsCmd.java b/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/AbstractGlobalOptionsCmd.java
index 0183eee..d1b0db2 100644
--- a/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/AbstractGlobalOptionsCmd.java
+++ b/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/AbstractGlobalOptionsCmd.java
@@ -17,7 +17,7 @@ public abstract class AbstractGlobalOptionsCmd implements Command {
@Option(name = "help", description = "Print command specific help", hasValue = false)
protected boolean help;
- protected void init(AbstractGlobalOptionsCmd parent) {
+ protected void initFromParent(AbstractGlobalOptionsCmd parent) {
dumpTrace = parent.dumpTrace;
help = parent.help;
}
diff --git a/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigCmd.java b/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigCmd.java
index b4be107..4fb5e34 100644
--- a/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigCmd.java
+++ b/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigCmd.java
@@ -53,16 +53,24 @@ public class ConfigCmd extends AbstractAuthOptionsCmd implements Command {
String cmd = args.get(0);
switch (cmd) {
case "credentials": {
- return new ConfigCredentialsCmd(this).execute(commandInvocation);
+ ConfigCredentialsCmd command = new ConfigCredentialsCmd();
+ command.initFromParent(this);
+ return command.execute(commandInvocation);
}
case "truststore": {
- return new ConfigTruststoreCmd(this).execute(commandInvocation);
+ ConfigTruststoreCmd command = new ConfigTruststoreCmd();
+ command.initFromParent(this);
+ return command.execute(commandInvocation);
}
case "initial-token": {
- return new ConfigInitialTokenCmd(this).execute(commandInvocation);
+ ConfigInitialTokenCmd command = new ConfigInitialTokenCmd();
+ command.initFromParent(this);
+ return command.execute(commandInvocation);
}
case "registration-token": {
- return new ConfigRegistrationTokenCmd(this).execute(commandInvocation);
+ ConfigRegistrationTokenCmd command = new ConfigRegistrationTokenCmd();
+ command.initFromParent(this);
+ return command.execute(commandInvocation);
}
default: {
if (printHelp()) {
diff --git a/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigCredentialsCmd.java b/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigCredentialsCmd.java
index 4cc050f..20f7d88 100644
--- a/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigCredentialsCmd.java
+++ b/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigCredentialsCmd.java
@@ -36,11 +36,6 @@ public class ConfigCredentialsCmd extends AbstractAuthOptionsCmd implements Comm
private int sigLifetime = 600;
- public ConfigCredentialsCmd() {}
-
- public ConfigCredentialsCmd(AbstractAuthOptionsCmd parent) {
- init(parent);
- }
public void init(ConfigData configData) {
if (server == null) {
diff --git a/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigInitialTokenCmd.java b/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigInitialTokenCmd.java
index 937787e..5610858 100644
--- a/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigInitialTokenCmd.java
+++ b/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigInitialTokenCmd.java
@@ -33,11 +33,10 @@ public class ConfigInitialTokenCmd extends AbstractAuthOptionsCmd implements Com
private boolean delete;
private boolean keepDomain;
- public ConfigInitialTokenCmd() {}
- public ConfigInitialTokenCmd(ConfigCmd parent) {
+ protected void initFromParent(ConfigCmd parent) {
this.parent = parent;
- init(parent);
+ super.initFromParent(parent);
}
@Override
diff --git a/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigRegistrationTokenCmd.java b/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigRegistrationTokenCmd.java
index 761affd..af6b984 100644
--- a/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigRegistrationTokenCmd.java
+++ b/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigRegistrationTokenCmd.java
@@ -30,11 +30,10 @@ public class ConfigRegistrationTokenCmd extends AbstractAuthOptionsCmd implement
private boolean delete;
- public ConfigRegistrationTokenCmd() {}
- public ConfigRegistrationTokenCmd(ConfigCmd parent) {
+ protected void initFromParent(ConfigCmd parent) {
this.parent = parent;
- init(parent);
+ super.initFromParent(parent);
}
@Override
diff --git a/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigTruststoreCmd.java b/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigTruststoreCmd.java
index 49d8975..7ae668a 100644
--- a/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigTruststoreCmd.java
+++ b/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigTruststoreCmd.java
@@ -30,11 +30,10 @@ public class ConfigTruststoreCmd extends AbstractAuthOptionsCmd implements Comma
private boolean delete;
- public ConfigTruststoreCmd() {}
- public ConfigTruststoreCmd(ConfigCmd parent) {
+ protected void initFromParent(ConfigCmd parent) {
this.parent = parent;
- init(parent);
+ super.initFromParent(parent);
}
@Override