Merge branch 'jira-wdt-855-model-help' into 'develop-4.0'

Changed model help MBean indicator to asterisk, cleaned up whitespace

See merge request weblogic-cloud/weblogic-deploy-tooling!1649

Author: robertpatrick

core/src/main/java/oracle/weblogic/deploy/util/WLSBeanHelp.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle Corporation and/or its affiliates.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 package oracle.weblogic.deploy.util;
@@ -8,10 +8,8 @@
 import java.beans.BeanInfo;
 import java.beans.FeatureDescriptor;
 import java.beans.PropertyDescriptor;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.HashMap;
 
 /**
@@ -57,7 +55,7 @@ public static String get(String beanName, String propName, int width, String pro
       if (limits.length() > 0) limits += EOL;
     }
 
-    return limits + prettyHTML(ds, width);
+    return limits + prettyHTML(ds, width).trim();
   }
 
   public static String get(String beanName, int width) {

core/src/main/python/wlsdeploy/tool/modelhelp/model_sample_printer.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 from wlsdeploy.aliases.location_context import LocationContext
@@ -262,12 +262,12 @@ def _get_att_short_help(self, model_location, attr_name):
 
         online_bean = self._aliases.get_online_bean_name(model_location)
 
-        # Instead of showing abbreviated help, use a trailing "+" to indicate
-        # that more help is avail for the attribute, and a "-" otherwise
+        # Instead of showing abbreviated help, use a trailing "*" to indicate
+        # that more help is avail for the attribute.
         if WLSBeanHelp.get(online_bean, attr_name, 100, ''):
-            return att_default + ' +'
+            return att_default + ' *'
         else:
-            return att_default + ' -'
+            return ''
 
     def _print_attributes_sample(self, model_location, indent_level):
         """
@@ -376,7 +376,6 @@ def _print_attribute_bean_help(self, model_location, indent_level, the_attribute
             if att_help:
                 self._output_buffer.add_output()
                 self._output_buffer.add_output(att_help)
-                self._output_buffer.add_output()
 
             return True
 

core/src/main/python/wlsdeploy/tool/util/attribute_setter.py

@@ -678,6 +678,7 @@ def set_encrypted(self, location, key, value, wlst_value):
         This is required when WLST does not encrypt a plain-text value during set() as it normally does.
         This can happen when offline WLST does not include an attribute in a hard-coded list of encrypted values.
         Currently, only OracleIdentityCloudIntegrator/ClientSecretEncrypted offline has this issue.
+        See bug 34195228.
         :param location: the location
         :param key: the attribute name
         :param value: the new attribute value

documentation/4.0/content/userguide/tools/model_help.md

@@ -20,14 +20,14 @@ Attributes and sub-folders for resources:/JDBCSystemResource
 resources:
     JDBCSystemResource:
         'JDBC-1':
-            CompatibilityName:       # string            +
-            DeploymentOrder:         # integer           (default=100) +
-            DeploymentPrincipalName: # string            +
-            DescriptorFileName:      # string            +
-            ModuleType:              # string            +
-            Notes:                   # string            +
-            SourcePath:              # string            +
-            Target:                  # delimited_string  +
+            CompatibilityName:       # string            *
+            DeploymentOrder:         # integer           (default=100) *
+            DeploymentPrincipalName: # string            *
+            DescriptorFileName:      # string            *
+            ModuleType:              # string            *
+            Notes:                   # string            *
+            SourcePath:              # string            *
+            Target:                  # delimited_string  *
 
             JdbcResource:
                 # see /JDBCSystemResource/JdbcResource
@@ -41,7 +41,8 @@ This bean defines a system-level JDBC resource.  It links a separate
 descriptor that specifies the definition.
 ```
 This output shows the eight attributes and two sub-folders available for the `JDBCSystemResource` folder in the `resources` section of the model. Each attribute includes a comment describing the type of the value to be added.
-A plus sign (`+`) on an attribute indicates that appending the attribute to the model path will yield more information about the attribute.
+
+An asterisk (`*`) next to an attribute indicates that the attribute has additional information available, possibly including a default value, valid range, and a description.   
 
 Folders that support multiple instances, such as `JDBCSystemResource` in this example, are shown with a derived name, such as `'JDBC-1'`.