[HAL-1952] Adding String constants have been used directly in the Enc…

…rypt Expression code in the ExpressionEncryptor class
michpetrov · Dec 4, 2023 · 106ed8a · 106ed8a
1 parent 3c5b1c1
commit 106ed8a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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
@@ -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
@@ -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";