Fix create-mail-resource REST command

Signed-off-by: Alexander Pinchuk <alexander.v.pinchuk@gmail.com>
eclipse-ee4j · Mar 17, 2023 · c189312 · c189312
1 parent 2d5d090
commit c189312
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/JavaMailResourceTest.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/JavaMailResourceTest.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -37,9 +38,9 @@ public class JavaMailResourceTest extends AdminBaseDevTest {
     private static final String LIST_RESOURCE_REF = "list-resource-refs";
     private static final String LIST_JNDI_ENTRIES = "list-jndi-entries";
 
-    private static final String DELETE_MAIL_RESOURCE = "delete-javamail-resource";
-    private static final String CREATE_MAIL_RESOURCE = "create-javamail-resource";
-    private static final String LIST_MAIL_RESOURCES = "list-javamail-resources";
+    private static final String DELETE_MAIL_RESOURCE = "delete-mail-resource";
+    private static final String CREATE_MAIL_RESOURCE = "create-mail-resource";
+    private static final String LIST_MAIL_RESOURCES = "list-mail-resources";
     private static final String TARGET_OPTION = "--target";
 
     private static final String FROM_ADDRESS_OPTION = "--fromaddress";

diff --git a/...rest-service/src/main/java/org/glassfish/admin/rest/generator/ResourcesGeneratorBase.java b/...rest-service/src/main/java/org/glassfish/admin/rest/generator/ResourcesGeneratorBase.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -445,7 +446,7 @@ private boolean hasSingletonAnnotation(ConfigModel model) {
     //RESTREdirect currently only support automatically these deletes:
     /*
      * delete-admin-object delete-audit-module delete-auth-realm delete-connector-connection-pool delete-connector-resource
-     * delete-custom-resource delete-http-listener delete-iiop-listener delete-javamail-resource delete-jdbc-connection-pool
+     * delete-custom-resource delete-http-listener delete-iiop-listener delete-mail-resource delete-jdbc-connection-pool
      * delete-jdbc-resource delete-jms-host delete-message-security-provider delete-profiler delete-resource-adapter-config
      * delete-resource-ref delete-system-property delete-virtual-server What is missing is: delete-jms-resource delete-jmsdest
      * delete-jndi-resource delete-lifecycle-module delete-message-security-provider delete-connector-security-map
@@ -514,7 +515,7 @@ private boolean hasSingletonAnnotation(ConfigModel model) {
             put("ListJmsHost", "create-jms-host");
             put("ListLbConfig", "create-http-lb-config");
             put("ListLoadBalancer", "create-http-lb");
-            put("ListMailResource", "create-javamail-resource");
+            put("ListMailResource", "create-mail-resource");
             put("ListMessageSecurityConfig", "create-message-security-provider");
             put("ListNetworkListener", "create-network-listener");
             put("ListProtocol", "create-protocol");