Class typing moved to the method

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

Hide file tree

Showing 27 changed files with 617 additions and 740 deletions.
diff --git a/...t/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ContextServiceManager.java b/...t/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ContextServiceManager.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -21,28 +22,35 @@
 import com.sun.enterprise.config.serverbeans.Resources;
 import com.sun.enterprise.config.serverbeans.ServerTags;
 import com.sun.enterprise.util.LocalStringManagerImpl;
+
+import jakarta.inject.Inject;
+import jakarta.resource.ResourceException;
+
+import java.beans.PropertyVetoException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
 import org.glassfish.api.I18n;
 import org.glassfish.api.admin.ServerEnvironment;
 import org.glassfish.concurrent.config.ContextService;
-import org.glassfish.resources.admin.cli.ResourceManager;
 import org.glassfish.resourcebase.resources.admin.cli.ResourceUtil;
 import org.glassfish.resourcebase.resources.api.ResourceStatus;
 import org.glassfish.resourcebase.resources.util.BindableResourcesHelper;
+import org.glassfish.resources.admin.cli.ResourceManager;
 import org.jvnet.hk2.annotations.Service;
 import org.jvnet.hk2.config.ConfigSupport;
 import org.jvnet.hk2.config.ConfiguredBy;
 import org.jvnet.hk2.config.SingleConfigCode;
 import org.jvnet.hk2.config.TransactionFailure;
 import org.jvnet.hk2.config.types.Property;
 
-import jakarta.inject.Inject;
-import jakarta.resource.ResourceException;
-import java.beans.PropertyVetoException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import static org.glassfish.resources.admin.cli.ResourceConstants.*;
+import static org.glassfish.resources.admin.cli.ResourceConstants.CONTEXT_INFO;
+import static org.glassfish.resources.admin.cli.ResourceConstants.CONTEXT_INFO_DEFAULT_VALUE;
+import static org.glassfish.resources.admin.cli.ResourceConstants.CONTEXT_INFO_ENABLED;
+import static org.glassfish.resources.admin.cli.ResourceConstants.ENABLED;
+import static org.glassfish.resources.admin.cli.ResourceConstants.JNDI_NAME;
+import static org.glassfish.resources.admin.cli.ResourceConstants.SYSTEM_ALL_REQ;
 
 /**
  *
@@ -74,10 +82,12 @@ public class ContextServiceManager implements ResourceManager {
     @Inject
     private BindableResourcesHelper resourcesHelper;
 
+    @Override
     public String getResourceType () {
         return ServerTags.CONTEXT_SERVICE;
     }
 
+    @Override
     public ResourceStatus create(Resources resources, HashMap attributes, final Properties properties,
                                  String target) throws Exception {
 
@@ -91,6 +101,7 @@ public ResourceStatus create(Resources resources, HashMap attributes, final Prop
         try {
             ConfigSupport.apply(new SingleConfigCode<Resources>() {
 
+                @Override
                 public Object run(Resources param) throws PropertyVetoException, TransactionFailure {
                     return createResource(param, properties);
                 }
@@ -162,19 +173,19 @@ private ContextService createConfigBean(Resources param, Properties properties)
         return contextService;
     }
 
+    @Override
     public Resource createConfigBean(final Resources resources, HashMap attributes, final Properties properties, boolean validate) throws Exception{
         setAttributes(attributes, null);
-        ResourceStatus status = null;
-        if(!validate){
-            status = new ResourceStatus(ResourceStatus.SUCCESS,"");
-        }else{
+        final ResourceStatus status;
+        if (validate) {
             status = isValid(resources, false, null);
+        } else {
+            status = new ResourceStatus(ResourceStatus.SUCCESS, "");
         }
-        if(status.getStatus() == ResourceStatus.SUCCESS){
+        if (status.getStatus() == ResourceStatus.SUCCESS) {
             return createConfigBean(resources, properties);
-        }else{
-            throw new ResourceException(status.getMessage());
         }
+        throw new ResourceException(status.getMessage());
     }
 
     public ResourceStatus delete (final Resources resources, final String jndiName, final String target)
@@ -224,8 +235,9 @@ public ResourceStatus delete (final Resources resources, final String jndiName,
 
             // delete context-service
             if (ConfigSupport.apply(new SingleConfigCode<Resources>() {
+                @Override
                 public Object run(Resources param) throws PropertyVetoException, TransactionFailure {
-                    ContextService resource = (ContextService) ConnectorsUtil.getResourceByName(resources, ContextService.class, jndiName);
+                    ContextService resource = ConnectorsUtil.getResourceByName(resources, ContextService.class, jndiName);
                     return param.getResources().remove(resource);
                 }
             }, resources) == null) {