Use description and long description annotations for Java

Author: MIchaelMainer

Templates/Java/BaseJavaModel.template.tt

@@ -1082,7 +1082,7 @@ public {1} {2}{3}{4} {{";
                 property.Name,
                 propertyType,
                 property.Name.SanitizePropertyName(property).ToLowerFirstChar(),
-				ReplaceInvalidCharacters(property.LongDescription));
+				GetSanitizedDescription(property));
         }
         return sb.ToString();
     }
@@ -1260,4 +1260,14 @@ public {1} {2}{3}{4} {{";
 		}
 		return null;
 	}
-#>
+
+    /**
+    * Get the description from the LongDescription or Description annotation and then return the sanitized string.
+    */
+    public string GetSanitizedDescription(OdcmProperty property)
+    {
+        var description = property.LongDescription ?? property.Description;
+
+        return ReplaceInvalidCharacters(description);
+    }
+#>