Merge pull request diffblue#504 from diffblue/jd/enhancement/prettify_di_java_types

Turns DI raw type declaration into one you'd see in Java code [SEC-556]

Author: smowton

src/java-class-info/entry_point.cpp

@@ -28,10 +28,11 @@ entry_pointt::entry_pointt(
 
   for(const code_typet::parametert &parameter : signature_info.parameters())
   {
-    method.parameters.emplace_back(utilst::fetch_type_name(parameter.type()));
+    method.parameters.emplace_back(
+      utilst::get_java_type_name(parameter.type()));
   }
 
-  method.return_type = utilst::fetch_type_name(signature_info.return_type());
+  method.return_type = utilst::get_java_type_name(signature_info.return_type());
 
   std::string method_name;
   method.name = id2string(entry_point_method.name);

src/java-class-info/entry_point_detection.cpp

@@ -214,13 +214,13 @@ void entry_point_detectiont::find_entry_points(
             signature_info.parameters().end(),
             std::back_inserter(parameter_types),
             [](parsed_param param)
-            { return utilst::fetch_type_name(param.type()); });
+            { return utilst::get_java_type_name(param.type()); });
 
           if(!match_types(method_patterns.arguments, parameter_types))
             continue;
 
           std::string return_type =
-            utilst::fetch_type_name(signature_info.return_type());
+            utilst::get_java_type_name(signature_info.return_type());
           if(!return_type.empty())
           {
             std::vector<std::string> ret_vec = {return_type};

src/java-class-info/java_class_info.cpp

@@ -19,6 +19,7 @@
 #include <util/parse_options.h>
 #include <util/ui_message.h>
 #include <utility>
+#include <utils.h>
 
 class cmdline_optionst final:
   public parse_options_baset
@@ -300,11 +301,14 @@ int cmdline_optionst::doit()
           for(const java_bytecode_parse_treet::fieldt &field :
               parsed_class.fields)
           {
+            typet field_type = java_type_from_string(
+              field.signature.has_value() ? field.signature.value()
+                                          : field.descriptor,
+              id2string(parsed_class.name));
+
             if(has_annotation_in_list(field.annotations, autowire_annotation))
               bean.fields.emplace_back(
-                field.name,
-                field.signature.has_value() ? field.signature.value()
-                                            : field.descriptor);
+                field.name, utilst::get_java_type_name(field_type));
           }
 
           beans.push_back(std::move(bean));

src/java-class-info/utils.cpp

@@ -11,7 +11,7 @@
 /// Reconstruct the type declaration to match normal Java code.
 /// \param type: type to recursively reconstruct name from.
 /// \return human-friendly type name
-std::string utilst::fetch_type_name(const typet &type)
+std::string utilst::get_java_type_name(const typet &type)
 {
   if(type.id() == ID_pointer)
   {
@@ -25,7 +25,7 @@ std::string utilst::fetch_type_name(const typet &type)
       for(const reference_typet &type_arguments :
           to_java_generic_type(type).generic_type_arguments())
       {
-        type_argument_names.push_back(fetch_type_name(type_arguments));
+        type_argument_names.push_back(get_java_type_name(type_arguments));
       }
 
       if(!type_argument_names.empty())

src/java-class-info/utils.h

@@ -12,7 +12,7 @@ typedef code_typet::parametert parsed_param;
 class utilst
 {
 public:
-  static std::string fetch_type_name(const typet &type);
+  static std::string get_java_type_name(const typet &type);
 };
 
 #endif //SECURITY_SCANNER_UTILS_H