Prevent deletion of default JDBC resource (#21770)

*Change the object type of jdbc/__default to system-all-req effectively preventing the deletion of this resource (Note: Preventing deletion of the default JMS connection factory already happens in a similar way)
*Add corresponding unit tests in devtests 
*Add logic to avoid deletion of the default JDBC and JMS resource-refs
Because of these changes, deleting the default JDBC or JMS resource on gui is also prevented

Author: mskdeepak-oracle

main/appserver/admin/template/src/main/resources/config/domain.xml

@@ -65,7 +65,7 @@
   <system-applications />
   <resources>
     <jdbc-resource pool-name="__TimerPool" jndi-name="jdbc/__TimerPool" object-type="system-admin" />
-    <jdbc-resource pool-name="DerbyPool" jndi-name="jdbc/__default" object-type="system-all" />
+    <jdbc-resource pool-name="DerbyPool" jndi-name="jdbc/__default" object-type="system-all-req" />
     <jdbc-connection-pool name="__TimerPool" datasource-classname="org.apache.derby.jdbc.EmbeddedXADataSource" res-type="javax.sql.XADataSource">
       <property value="${com.sun.aas.instanceRoot}/lib/databases/ejbtimer" name="databaseName" />
       <property value=";create=true" name="connectionAttributes" />

main/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/JDBCResourceManager.java

@@ -232,6 +232,15 @@ public ResourceStatus delete (final Resources resources, final String jndiName,
             return new ResourceStatus(ResourceStatus.FAILURE, msg);
         }
 
+        JdbcResource jdbcResource = (JdbcResource) ConnectorsUtil.getResourceByName(resources, JdbcResource.class, jndiName);
+        // ensure we are not deleting resource of the type system-all-req
+        if(ResourceConstants.SYSTEM_ALL_REQ.equals(jdbcResource.getObjectType())){
+            String msg = localStrings.getLocalString("delete.jdbc.resource.system-all-req.object-type",
+                    "The jdbc resource [ {0} ] cannot be deleted as it is required to be configured in the system.",
+                    jndiName);
+            return new ResourceStatus(ResourceStatus.FAILURE, msg);
+        }
+
         if (environment.isDas()) {
 
             if ("domain".equals(target)) {
@@ -262,14 +271,6 @@ public ResourceStatus delete (final Resources resources, final String jndiName,
 
         try {
 
-            JdbcResource jdbcResource = (JdbcResource) ConnectorsUtil.getResourceByName(resources, JdbcResource.class, jndiName);
-            if(ResourceConstants.SYSTEM_ALL_REQ.equals(jdbcResource.getObjectType())){
-                String msg = localStrings.getLocalString("delete.jdbc.resource.system-all-req.object-type",
-                        "The jdbc resource [ {0} ] cannot be deleted as it is required to be configured in the system.",
-                        jndiName);
-                return new ResourceStatus(ResourceStatus.FAILURE, msg);
-            }
-
             // delete resource-ref
             resourceUtil.deleteResourceRef(jndiName, target);
 

main/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/JdbcResourceTest.java

@@ -136,6 +136,9 @@ public void runTests() {
         testListJdbcResourceTargetServer();
         testDeleteJdbcResourceInServer();
 
+        testDeleteDefaultResource();
+        testDeleteDefaultResourceRef();
+
         testCreateJdbcesourceInCluster();
         testListJdbcResourceTargetCluster();
         testListJdbcResourceTargetInstance1();
@@ -557,6 +560,20 @@ public void testListJdbcResourceTargetStandaloneInstance() {
         reportUnexpectedResult(testName, result, INSTANCE1_NAME, INSTANCE2_NAME, CLUSTER_NAME);
     }
 
+    public void testDeleteDefaultResource() {
+        String testName = "testDeleteDefaultResource";
+        AsadminReturn result = asadminWithOutput(DELETE_JDBC_RESOURCE, DEFAULT_RESOURCE);
+        reportFailureResultStatus(testName, result);
+        reportExpectedFailureResult(testName, result, "jdbc resource [ jdbc/__default ] cannot be deleted");
+    }
+
+    public void testDeleteDefaultResourceRef() {
+        String testName = "testDeleteDefaultResourceRef";
+        AsadminReturn result = asadminWithOutput(DELETE_RESOURCE_REF, DEFAULT_RESOURCE);
+        reportFailureResultStatus(testName, result);
+        reportExpectedFailureResult(testName, result, "Default JDBC resource ref cannot be deleted");
+    }
+
     private void reportFailureResultStatus(String testName, AsadminReturn result) {
         report(testName, !result.returnValue);
         report(testName, !result.err.isEmpty());

main/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/DeleteResourceRef.java

@@ -138,6 +138,18 @@ public void execute(AdminCommandContext context) {
         final ActionReport report = context.getActionReport();
 
         try {
+            if (refName.equals("jdbc/__default")) {
+                report.setActionExitCode(ActionReport.ExitCode.FAILURE);
+                report.setMessage(localStrings.getLocalString("delete.resource.ref.jdbc.default",
+                        "Default JDBC resource ref cannot be deleted."));
+                return;
+            }
+            if (refName.equals("jms/__defaultConnectionFactory")) {
+                report.setActionExitCode(ActionReport.ExitCode.FAILURE);
+                report.setMessage(localStrings.getLocalString("delete.resource.ref.jms.default",
+                        "Default JMS connection factory ref cannot be deleted."));
+                return;
+            }
             deleteResourceRef();
             if (refContainer instanceof Cluster) {
 

main/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/LocalStrings.properties

@@ -50,6 +50,8 @@ delete.resource.ref.reference_name=The name or JNDI name of the resource.
 delete.resource.ref.doesNotExist=resource-ref {0} does not exist for target {1}.
 delete.resource.ref.failed=resource-ref {0} deletion failed.
 delete.resource.ref.success=resource-ref {0} deleted successfully.
+delete.resource.ref.jdbc.default=Default JDBC resource ref cannot be deleted.
+delete.resource.ref.jms.default=Default JMS connection factory ref cannot be deleted.
 list.resource.refs=lists the existing resource references
 list.resource.refs.success=Command list-resource-refs executed successfully.
 list.resource.refs.fail=Command list-resource-refs failed.