RequiredConfigNode - static write method

- didn't use anything from the object Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
eclipse-ee4j · Sep 18, 2022 · bd087ea · bd087ea
1 parent 5dd0e71
commit bd087ea
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 27 deletions.
diff --git a/...nt/dol/src/main/java/com/sun/enterprise/deployment/node/connector/ActivationSpecNode.java b/...nt/dol/src/main/java/com/sun/enterprise/deployment/node/connector/ActivationSpecNode.java
@@ -86,11 +86,7 @@ public void addDescriptor(Object descriptor) {
     public Node writeDescriptor(Node parent, MessageListener msgListener) {
         Node actSpecNode = appendChild(parent, ConnectorTagNames.ACTIVATION_SPEC);
         appendTextChild(actSpecNode, ConnectorTagNames.ACTIVATION_SPEC_CLASS, msgListener.getActivationSpecClass());
-
-        // required-config-property
-        RequiredConfigNode reqNode = new RequiredConfigNode();
-        actSpecNode = reqNode.writeDescriptor(actSpecNode, msgListener);
-
+        RequiredConfigNode.write(actSpecNode, msgListener);
         ConfigPropertyNode.write(actSpecNode, msgListener);
         return parent;
     }

diff --git a/...nt/dol/src/main/java/com/sun/enterprise/deployment/node/connector/RequiredConfigNode.java b/...nt/dol/src/main/java/com/sun/enterprise/deployment/node/connector/RequiredConfigNode.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -16,22 +17,21 @@
 
 package com.sun.enterprise.deployment.node.connector;
 
-import org.glassfish.deployment.common.Descriptor;
-import com.sun.enterprise.deployment.MessageListener;
 import com.sun.enterprise.deployment.EnvironmentProperty;
+import com.sun.enterprise.deployment.MessageListener;
 import com.sun.enterprise.deployment.node.DeploymentDescriptorNode;
 import com.sun.enterprise.deployment.node.DescriptorFactory;
 import com.sun.enterprise.deployment.xml.ConnectorTagNames;
-import org.w3c.dom.Node;
 
-import java.util.Iterator;
 import java.util.Map;
+import java.util.Set;
+
+import org.w3c.dom.Node;
 
 /**
  * This node is responsible for handling the Connector DTD related required-config-property XML tag
  *
- * @author  Sheetal Vartak
- * @version
+ * @author Sheetal Vartak
  */
 public class RequiredConfigNode extends DeploymentDescriptorNode<EnvironmentProperty> {
 
@@ -70,22 +70,12 @@ public EnvironmentProperty getDescriptor() {
      * @param descriptor the descriptor to write
      * @return the DOM tree top node
      */
-    public Node writeDescriptor(Node parent, Descriptor descriptor) {
-        if (!(descriptor instanceof MessageListener)) {
-            throw new IllegalArgumentException(
-                getClass() + " cannot handle descriptors of type " + descriptor.getClass());
-        }
-        Iterator<EnvironmentProperty> configProps = ((MessageListener) descriptor).getRequiredConfigProperties()
-            .iterator();
-
-        // config property info
-        if (configProps != null) {
-            while (configProps.hasNext()) {
-                EnvironmentProperty cfg = configProps.next();
-                Node configNode = appendChild(parent, ConnectorTagNames.REQUIRED_CONFIG_PROP);
-                writeLocalizedDescriptions(configNode, cfg);
-                appendTextChild(configNode, ConnectorTagNames.CONFIG_PROPERTY_NAME, cfg.getName());
-            }
+    public static Node write(Node parent, MessageListener descriptor) {
+        Set<EnvironmentProperty> configProps = descriptor.getRequiredConfigProperties();
+        for (EnvironmentProperty cfg : configProps) {
+            Node configNode = appendChild(parent, ConnectorTagNames.REQUIRED_CONFIG_PROP);
+            writeLocalizedDescriptions(configNode, cfg);
+            appendTextChild(configNode, ConnectorTagNames.CONFIG_PROPERTY_NAME, cfg.getName());
         }
         return parent;
     }