From cef84d34b9c4d2afd3cef8545ac75c7b8f2086f4 Mon Sep 17 00:00:00 2001 From: Sarfaraz Ahamad Date: Mon, 4 Dec 2023 17:39:58 +0530 Subject: [PATCH 1/3] [HAL-1952] Adding String constants have been used directly in the Encrypt Expression code in the ExpressionEncryptor class --- .../org/jboss/hal/core/expression/ExpressionEncryptor.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/jboss/hal/core/expression/ExpressionEncryptor.java b/core/src/main/java/org/jboss/hal/core/expression/ExpressionEncryptor.java index 9627168f9e..0b1d3db4b7 100644 --- a/core/src/main/java/org/jboss/hal/core/expression/ExpressionEncryptor.java +++ b/core/src/main/java/org/jboss/hal/core/expression/ExpressionEncryptor.java @@ -46,6 +46,9 @@ public class ExpressionEncryptor implements EncryptExpressionEvent.EncryptExpres private static final ResourceAddress EXPRESSION_ADDRESS = ResourceAddress.from("subsystem=elytron/expression=encryption"); + private static final String DEFAULT_RESOLVER = "default-resolver"; + private static final String CREATE_EXPRESSION = "create-expression"; + private final EventBus eventBus; private final Environment environment; private final Dispatcher dispatcher; @@ -86,7 +89,7 @@ public void onEncryptExpression(final EncryptExpressionEvent event) { List resolverNames = result.get(ENCRYPTION).get(RESOLVERS) .asList().stream().map(r -> r.get(NAME).asString()) .collect(Collectors.toList()); - boolean hasDefaultResolver = result.hasDefined("default-resolver"); + boolean hasDefaultResolver = result.hasDefined(DEFAULT_RESOLVER); showDialog(resolverNames, hasDefaultResolver); }, (op1, error) -> showEmptyDialog()); @@ -102,7 +105,7 @@ private void showEmptyDialog() { void saveEncryption(ModelNode payload) { - Operation operation = new Operation.Builder(EXPRESSION_ADDRESS, "create-expression") + Operation operation = new Operation.Builder(EXPRESSION_ADDRESS, CREATE_EXPRESSION) .payload(payload) .build(); dispatcher.execute(operation, From 3c5b1c1ca128c689d61bdd4216a81172e56e0150 Mon Sep 17 00:00:00 2001 From: Sarfaraz Ahamad Date: Mon, 4 Dec 2023 22:11:56 +0530 Subject: [PATCH 2/3] [HAL-1952] Adding String constants have been used directly in the Encrypt Expression code in the ExpressionEncryptor class --- .../org/jboss/hal/core/expression/ExpressionEncryptor.java | 6 ++---- .../java/org/jboss/hal/dmr/ModelDescriptionConstants.java | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/org/jboss/hal/core/expression/ExpressionEncryptor.java b/core/src/main/java/org/jboss/hal/core/expression/ExpressionEncryptor.java index 0b1d3db4b7..8898b1a049 100644 --- a/core/src/main/java/org/jboss/hal/core/expression/ExpressionEncryptor.java +++ b/core/src/main/java/org/jboss/hal/core/expression/ExpressionEncryptor.java @@ -39,16 +39,14 @@ import static org.jboss.hal.dmr.ModelDescriptionConstants.NAME; import static org.jboss.hal.dmr.ModelDescriptionConstants.READ_CHILDREN_RESOURCES_OPERATION; import static org.jboss.hal.dmr.ModelDescriptionConstants.RESOLVERS; +import static org.jboss.hal.dmr.ModelDescriptionConstants.DEFAULT_RESOLVER; +import static org.jboss.hal.dmr.ModelDescriptionConstants.CREATE_EXPRESSION; public class ExpressionEncryptor implements EncryptExpressionEvent.EncryptExpressionHandler { private static final ResourceAddress ELYTRON_ADDRESS = ResourceAddress.from("subsystem=elytron"); - private static final ResourceAddress EXPRESSION_ADDRESS = ResourceAddress.from("subsystem=elytron/expression=encryption"); - private static final String DEFAULT_RESOLVER = "default-resolver"; - private static final String CREATE_EXPRESSION = "create-expression"; - private final EventBus eventBus; private final Environment environment; private final Dispatcher dispatcher; diff --git a/dmr/src/main/java/org/jboss/hal/dmr/ModelDescriptionConstants.java b/dmr/src/main/java/org/jboss/hal/dmr/ModelDescriptionConstants.java index aedf18d75c..bdefd42368 100644 --- a/dmr/src/main/java/org/jboss/hal/dmr/ModelDescriptionConstants.java +++ b/dmr/src/main/java/org/jboss/hal/dmr/ModelDescriptionConstants.java @@ -236,6 +236,8 @@ public interface ModelDescriptionConstants { String CUSTOM_ROLE_DECODER = "custom-role-decoder"; String CUSTOM_ROLE_MAPPER = "custom-role-mapper"; String CUSTOM_SECURITY_EVENT_LISTENER = "custom-security-event-listener"; + String DEFAULT_RESOLVER = "default-resolver"; + String CREATE_EXPRESSION = "create-expression"; String DATA_COLUMN = "data-column"; String DATA_SOURCE = "data-source"; String DATASOURCE_CLASS = "datasource-class"; From 106ed8a1409ac3ff7aaa1fd1607c6ee7e572aaa2 Mon Sep 17 00:00:00 2001 From: Sarfaraz Ahamad Date: Mon, 4 Dec 2023 22:27:19 +0530 Subject: [PATCH 3/3] [HAL-1952] Adding String constants have been used directly in the Encrypt Expression code in the ExpressionEncryptor class --- .../org/jboss/hal/core/expression/ExpressionEncryptor.java | 6 ++++-- .../java/org/jboss/hal/dmr/ModelDescriptionConstants.java | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/org/jboss/hal/core/expression/ExpressionEncryptor.java b/core/src/main/java/org/jboss/hal/core/expression/ExpressionEncryptor.java index 8898b1a049..7f5a708084 100644 --- a/core/src/main/java/org/jboss/hal/core/expression/ExpressionEncryptor.java +++ b/core/src/main/java/org/jboss/hal/core/expression/ExpressionEncryptor.java @@ -34,13 +34,15 @@ import com.google.web.bindery.event.shared.EventBus; import static org.jboss.hal.dmr.ModelDescriptionConstants.CHILD_TYPE; +import static org.jboss.hal.dmr.ModelDescriptionConstants.CREATE_EXPRESSION; +import static org.jboss.hal.dmr.ModelDescriptionConstants.DEFAULT_RESOLVER; import static org.jboss.hal.dmr.ModelDescriptionConstants.ENCRYPTION; import static org.jboss.hal.dmr.ModelDescriptionConstants.EXPRESSION; import static org.jboss.hal.dmr.ModelDescriptionConstants.NAME; import static org.jboss.hal.dmr.ModelDescriptionConstants.READ_CHILDREN_RESOURCES_OPERATION; import static org.jboss.hal.dmr.ModelDescriptionConstants.RESOLVERS; -import static org.jboss.hal.dmr.ModelDescriptionConstants.DEFAULT_RESOLVER; -import static org.jboss.hal.dmr.ModelDescriptionConstants.CREATE_EXPRESSION; + + public class ExpressionEncryptor implements EncryptExpressionEvent.EncryptExpressionHandler { diff --git a/dmr/src/main/java/org/jboss/hal/dmr/ModelDescriptionConstants.java b/dmr/src/main/java/org/jboss/hal/dmr/ModelDescriptionConstants.java index bdefd42368..2ac6a8cc0b 100644 --- a/dmr/src/main/java/org/jboss/hal/dmr/ModelDescriptionConstants.java +++ b/dmr/src/main/java/org/jboss/hal/dmr/ModelDescriptionConstants.java @@ -213,6 +213,7 @@ public interface ModelDescriptionConstants { String CREATE_ACCOUNT = "create-account"; String CREATE_ADDRESS = "createAddress"; // no typo! String CREATE_DURABLE_QUEUE = "create-durable-queue"; + String CREATE_EXPRESSION = "create-expression"; String CREATE_NON_DURABLE_QUEUE = "create-non-durable-queue"; String CREATE_TIME = "create-time"; String CREATION_TIME = "creation-time"; @@ -236,8 +237,6 @@ public interface ModelDescriptionConstants { String CUSTOM_ROLE_DECODER = "custom-role-decoder"; String CUSTOM_ROLE_MAPPER = "custom-role-mapper"; String CUSTOM_SECURITY_EVENT_LISTENER = "custom-security-event-listener"; - String DEFAULT_RESOLVER = "default-resolver"; - String CREATE_EXPRESSION = "create-expression"; String DATA_COLUMN = "data-column"; String DATA_SOURCE = "data-source"; String DATASOURCE_CLASS = "datasource-class"; @@ -253,6 +252,7 @@ public interface ModelDescriptionConstants { String DEFAULT_JOB_REPOSITORY = "default-job-repository"; String DEFAULT_REALM = "default-realm"; String DEFAULT_REMOTE_CLUSTER = "default-remote-cluster"; + String DEFAULT_RESOLVER = "default-resolver"; String DEFAULT_SECURITY_DOMAIN = "default-security-domain"; String DEFAULT_SFSB_CACHE = "default-sfsb-cache"; String DEFAULT_SFSB_PASSIVATION_DISABLED_CACHE = "default-sfsb-passivation-disabled-cache";