Renames in dol+concurrency

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
eclipse-ee4j · Oct 17, 2022 · eadc976 · eadc976
1 parent cc80586
commit eadc976
Show file tree

Hide file tree

Showing 10 changed files with 117 additions and 121 deletions.
diff --git a/...ent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/ConcurrencyDeployer.java b/...ent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/ConcurrencyDeployer.java
@@ -58,17 +58,16 @@ public final boolean canDeploy(boolean postApplicationDeployment, Collection<Res
      * Does nothing
      */
     @Override
-    public final void validatePreservedResource(Application oldApp, Application newApp, Resource resource,
+    public void validatePreservedResource(Application oldApp, Application newApp, Resource resource,
         Resources allResources) throws ResourceConflictException {
-        // FIXME: remove finals
     }
 
 
     /**
      * Same as {@link #deployResource(Object)}
      */
     @Override
-    public final void enableResource(D resource) throws Exception {
+    public void enableResource(D resource) throws Exception {
         deployResource(resource);
     }
 
@@ -77,7 +76,7 @@ public final void enableResource(D resource) throws Exception {
      * Same as {@link #undeployResource(Object)}
      */
     @Override
-    public final void disableResource(D resource) throws Exception {
+    public void disableResource(D resource) throws Exception {
         undeployResource(resource);
     }
 
@@ -109,6 +108,13 @@ protected ResourceInfo toResourceInfo(final D descriptor) {
     }
 
 
+    /**
+     * Calls {@link ConnectorsUtil#deriveResourceName(String, String, JavaEEResourceType)} using
+     * descriptor attributes
+     *
+     * @param descriptor
+     * @return JNDI name
+     */
     protected String toResourceName(D descriptor) {
         return deriveResourceName(descriptor.getResourceId(), descriptor.getJndiName(), descriptor.getResourceType());
     }

diff --git a/...assfish/concurrent/runtime/deployer/ConcurrencyManagedScheduledExecutorServiceConfig.java b/...assfish/concurrent/runtime/deployer/ConcurrencyManagedScheduledExecutorServiceConfig.java
@@ -26,6 +26,8 @@
 import org.jvnet.hk2.config.TransactionFailure;
 import org.jvnet.hk2.config.types.Property;
 
+import static com.sun.enterprise.universal.collections.JavaLangUtils.nonNull;
+
 
 /**
  * @author David Matejcek
@@ -225,9 +227,7 @@ public String getHungAfterSeconds() {
 
     @Override
     public void setHungAfterSeconds(String value) throws PropertyVetoException {
-        if (value != null) {
-            descriptor.setHungTaskThreshold(Long.valueOf(value));
-        }
+        descriptor.setHungTaskThreshold(nonNull(value, Long::valueOf, null));
     }
 
 

diff --git a/...t/dol/src/main/java/com/sun/enterprise/deployment/ContextServiceDefinitionDescriptor.java b/...t/dol/src/main/java/com/sun/enterprise/deployment/ContextServiceDefinitionDescriptor.java
@@ -31,86 +31,84 @@ public class ContextServiceDefinitionDescriptor extends ResourceDescriptor {
 
     private static final long serialVersionUID = 2537143519647534821L;
 
-    private final ContextServiceDefinitionData definition;
+    private final ContextServiceDefinitionData data;
 
     public ContextServiceDefinitionDescriptor() {
-        this(new ContextServiceDefinitionData(), null);
+        this(new ContextServiceDefinitionData(), MetadataSource.XML);
     }
 
 
     public ContextServiceDefinitionDescriptor(ContextServiceDefinitionData data, MetadataSource source) {
-        this.definition = data;
+        this.data = data;
         setResourceType(JavaEEResourceType.CSDD);
-        if (source != null) {
-            setMetadataSource(source);
-        }
+        setMetadataSource(source);
     }
 
 
     @Override
     public String getName() {
-        return this.definition.getName();
+        return this.data.getName();
     }
 
 
     @Override
     public void setName(String name) {
-        this.definition.setName(name);
+        this.data.setName(name);
     }
 
 
     public Set<String> getCleared() {
-        return definition.getCleared();
+        return data.getCleared();
     }
 
 
     public void setCleared(Set<String> cleared) {
-        definition.setCleared(cleared);
+        data.setCleared(cleared);
     }
 
 
     public void addCleared(String clearedItem) {
-        definition.addCleared(clearedItem);
+        data.addCleared(clearedItem);
     }
 
 
     public Set<String> getPropagated() {
-        return definition.getPropagated();
+        return data.getPropagated();
     }
 
 
     public void setPropagated(Set<String> propagated) {
-        definition.setPropagated(propagated);
+        data.setPropagated(propagated);
     }
 
 
     public void addPropagated(String propagatedItem) {
-        definition.addPropagated(propagatedItem);
+        data.addPropagated(propagatedItem);
     }
 
 
     public Set<String> getUnchanged() {
-        return definition.getUnchanged();
+        return data.getUnchanged();
     }
 
 
     public void setUnchanged(Set<String> unchanged) {
-        definition.setUnchanged(unchanged);
+        data.setUnchanged(unchanged);
     }
 
 
     public void addUnchanged(String unchangedItem) {
-        definition.addUnchanged(unchangedItem);
+        data.addUnchanged(unchangedItem);
     }
 
 
     public Properties getProperties() {
-        return definition.getProperties();
+        return data.getProperties();
     }
 
 
     public void setProperties(Properties properties) {
-        definition.setProperties(properties);
+        data.setProperties(properties);
     }
 
 
@@ -120,17 +118,17 @@ public void addContextServiceExecutorDescriptor(ResourcePropertyDescriptor prope
 
 
     public void addContextServiceExecutorDescriptor(String name, String value) {
-        definition.addContextServiceExecutorDescriptor(name, value);
+        data.addContextServiceExecutorDescriptor(name, value);
     }
 
 
     public ContextServiceDefinitionData getData() {
-        return definition;
+        return data;
     }
 
 
     @Override
     public String toString() {
-        return "ContextServiceDefinitionDescriptor[definition=" + definition + ']';
+        return "ContextServiceDefinitionDescriptor[data=" + data + ']';
     }
 }
diff --git a/.../dol/src/main/java/com/sun/enterprise/deployment/ManagedExecutorDefinitionDescriptor.java b/.../dol/src/main/java/com/sun/enterprise/deployment/ManagedExecutorDefinitionDescriptor.java
@@ -31,78 +31,76 @@ public class ManagedExecutorDefinitionDescriptor extends ResourceDescriptor impl
 
     private static final long serialVersionUID = 1L;
 
-    private final ManagedExecutorDefinitionData definition;
+    private final ManagedExecutorDefinitionData data;
 
     public ManagedExecutorDefinitionDescriptor() {
-        this(new ManagedExecutorDefinitionData(), null);
+        this(new ManagedExecutorDefinitionData(), MetadataSource.XML);
     }
 
 
     public ManagedExecutorDefinitionDescriptor(ManagedExecutorDefinitionData data, MetadataSource source) {
-        this.definition = data;
+        this.data = data;
         setResourceType(JavaEEResourceType.MEDD);
-        if (source != null) {
-            setMetadataSource(source);
-        }
+        setMetadataSource(source);
     }
 
 
     @Override
     public String getName() {
-        return this.definition.getName();
+        return this.data.getName();
     }
 
 
     @Override
     public void setName(String name) {
-        this.definition.setName(name);
+        this.data.setName(name);
     }
 
 
     @Override
     public String getContext() {
-        return definition.getContext();
+        return data.getContext();
     }
 
 
     @Override
     public void setContext(String context) {
-        definition.setContext(context);
+        data.setContext(context);
     }
 
 
     public int getMaximumPoolSize() {
-        return definition.getMaximumPoolSize();
+        return data.getMaximumPoolSize();
     }
 
 
     public void setMaximumPoolSize(int maximumPoolSize) {
-        definition.setMaximumPoolSize(maximumPoolSize);
+        data.setMaximumPoolSize(maximumPoolSize);
     }
 
 
     public long getHungAfterSeconds() {
-        return definition.getHungAfterSeconds();
+        return data.getHungAfterSeconds();
     }
 
 
     public void setHungAfterSeconds(long hungAfterSeconds) {
-        definition.setHungAfterSeconds(hungAfterSeconds);
+        data.setHungAfterSeconds(hungAfterSeconds);
     }
 
 
     public void addProperty(String key, String value) {
-        definition.addProperty(key, value);
+        data.addProperty(key, value);
     }
 
 
     public String getProperty(String key) {
-        return definition.getProperty(key);
+        return data.getProperty(key);
     }
 
 
     public Properties getProperties() {
-        return definition.getProperties();
+        return data.getProperties();
     }
 
 
@@ -112,17 +110,17 @@ public void addManagedExecutorPropertyDescriptor(ResourcePropertyDescriptor prop
 
 
     public void addManagedExecutorPropertyDescriptor(String name, String value) {
-        this.definition.addManagedExecutorPropertyDescriptor(name, value);
+        this.data.addManagedExecutorPropertyDescriptor(name, value);
     }
 
 
     public ManagedExecutorDefinitionData getData() {
-        return definition;
+        return data;
     }
 
 
     @Override
     public String toString() {
-        return "ManagedExecutorDefinitionDescriptor{definition=" + definition + ')';
+        return "ManagedExecutorDefinitionDescriptor{data=" + data + ')';
     }
 }