Fix handling of null scope and try_construct (#196)

* Refs #23130. Fix handling of null scope.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #23130. Fix calculation of try construct.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #25500. Apply review.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

Author: MiguelCompany

src/main/java/com/eprosima/idl/parser/tree/Annotation.java

@@ -231,6 +231,16 @@ public String getValue() throws RuntimeGenerationException
         return ((AnnotationMember)m_members.values().toArray()[0]).getValue();
     }
 
+    public String getEnumStringValue() throws RuntimeGenerationException
+    {
+        if(m_members.size() != 1)
+        {
+            throw new RuntimeGenerationException("Error in annotation " + getName() +
+                    ": accessing value of a multiple parameter exception");
+        }
+        return ((AnnotationMember)m_members.values().toArray()[0]).getEnumStringValue();
+    }
+
     public String getValueFromAny(TypeCode typecode) throws RuntimeGenerationException
     {
         if(m_members.size() != 1)

src/main/java/com/eprosima/idl/parser/typecode/AliasTypeCode.java

@@ -170,7 +170,7 @@ public String getScopedname()
      */
     public String getFullScopedname()
     {
-        if(m_scope.isEmpty())
+        if((m_scope == null) || m_scope.isEmpty())
         {
             return m_name;
         }
@@ -180,7 +180,7 @@ public String getFullScopedname()
 
     public String getROS2Scopedname()
     {
-        if (m_scope.isEmpty())
+        if ((m_scope == null) || m_scope.isEmpty())
         {
             return m_name;
         }
@@ -190,7 +190,7 @@ public String getROS2Scopedname()
 
     public String getCScopedname()
     {
-        if(m_scope.isEmpty())
+        if((m_scope == null) || m_scope.isEmpty())
         {
             return m_name;
         }
@@ -205,7 +205,7 @@ public String getScope()
 
     public boolean getHasScope()
     {
-        return !m_scope.isEmpty();
+        return (m_scope != null) && !m_scope.isEmpty();
     }
 
     @Override

src/main/java/com/eprosima/idl/parser/typecode/BitfieldSpec.java

@@ -62,7 +62,7 @@ public String getScope()
 
     public boolean getHasScope()
     {
-        return !m_scope.isEmpty();
+        return (m_scope != null) && !m_scope.isEmpty();
     }
 
     public String getNamespace()

src/main/java/com/eprosima/idl/parser/typecode/MemberAppliedAnnotations.java

@@ -232,21 +232,22 @@ void calculate_try_construct() throws RuntimeGenerationException
         {
             if (isAnnotationTryConstruct())
             {
-                if (m_annotations.get(Annotation.try_construct_str).getValue().equals(Annotation.try_construct_discard_str))
+                String annotation_value = m_annotations.get(Annotation.try_construct_str).getEnumStringValue();
+                if (annotation_value.equals(Annotation.try_construct_discard_str))
                 {
                     try_construct_ = TryConstructFailAction.DISCARD;
                 }
-                else if (m_annotations.get(Annotation.try_construct_str).getValue().equals(Annotation.try_construct_use_default_str))
+                else if (annotation_value.equals(Annotation.try_construct_use_default_str))
                 {
                     try_construct_ = TryConstructFailAction.USE_DEFAULT;
                 }
-                else if (m_annotations.get(Annotation.try_construct_str).getValue().equals(Annotation.try_construct_trim_str))
+                else if (annotation_value.equals(Annotation.try_construct_trim_str))
                 {
                     try_construct_ = TryConstructFailAction.TRIM;
                 }
                 else
                 {
-                    throw new RuntimeGenerationException("try_construct annotation does not have a recognized value");
+                    throw new RuntimeGenerationException("try_construct annotation does not have a recognized value: '" + annotation_value + "'");
                 }
             }
             else

src/main/java/com/eprosima/idl/parser/typecode/MemberedTypeCode.java

@@ -81,7 +81,7 @@ public String getScopedname()
      */
     public String getFullScopedname()
     {
-        if(m_scope.isEmpty())
+        if((m_scope == null) || m_scope.isEmpty())
         {
             return m_name;
         }
@@ -91,7 +91,7 @@ public String getFullScopedname()
 
     public String getROS2Scopedname()
     {
-        if(m_scope.isEmpty())
+        if((m_scope == null) || m_scope.isEmpty())
         {
             return m_name;
         }
@@ -101,7 +101,7 @@ public String getROS2Scopedname()
 
     public String getCScopedname()
     {
-        if(m_scope.isEmpty())
+        if((m_scope == null) || m_scope.isEmpty())
         {
             return m_name;
         }
@@ -111,7 +111,7 @@ public String getCScopedname()
 
     public String getJavaScopedname()
     {
-        if(m_scope.isEmpty())
+        if((m_scope == null) || m_scope.isEmpty())
         {
             return m_name;
         }
@@ -121,7 +121,7 @@ public String getJavaScopedname()
 
     public String getJniScopedname()
     {
-        if(m_scope.isEmpty())
+        if((m_scope == null) || m_scope.isEmpty())
         {
             return m_name;
         }
@@ -136,7 +136,7 @@ public String getScope()
 
     public boolean getHasScope()
     {
-        return !m_scope.isEmpty();
+        return (m_scope != null) && !m_scope.isEmpty();
     }
 
     @Override

src/main/java/com/eprosima/idl/parser/typecode/TypeCode.java

@@ -86,6 +86,11 @@ public boolean isIsAnyTypeCode()
 
     protected String generate_namespace(String scope)
     {
+        if (scope == null || scope.isEmpty())
+        {
+            return "";
+        }
+
         String namespace = scope;
         // Remove last scope when declared inside an Interface
         if (isDeclaredInsideInterface())