Refactor constructors for java_method_typet

Author: jeannielynnmoulton

jbmc/src/java_bytecode/java_types.h

@@ -252,25 +252,16 @@ class java_method_typet : public code_typet
   /// \param _parameters: the vector of method parameters
   /// \param _return_type: the return type
   java_method_typet(parameterst &&_parameters, typet &&_return_type)
+    : code_typet(std::move(_parameters), std::move(_return_type))
   {
     set(ID_C_java_method_type, true);
-    parameters().swap(_parameters);
-    return_type().swap(_return_type);
   }
 
   /// Constructs a new code type, i.e. method type
   /// \param _parameters: the vector of method parameters
   /// \param _return_type: the return type
   java_method_typet(parameterst &&_parameters, const typet &_return_type)
-  {
-    set(ID_C_java_method_type, true);
-    parameters().swap(_parameters);
-    return_type() = _return_type;
-  }
-
-  /// \deprecated
-  DEPRECATED("Use the two argument constructor instead")
-  java_method_typet()
+    : code_typet(std::move(_parameters), _return_type)
   {
     set(ID_C_java_method_type, true);
   }

jbmc/unit/solvers/refinement/string_refinement/string_symbol_resolution.cpp

@@ -64,7 +64,10 @@ SCENARIO("string_identifiers_resolution_from_equations",
 
     WHEN("There is a function call")
     {
-      symbol_exprt fun_sym("f", java_method_typet());
+      java_method_typet::parameterst parameters;
+      typet return_type;
+      symbol_exprt fun_sym(
+        "f", java_method_typet(std::move(parameters), return_type));
       function_application_exprt fun(fun_sym, bool_typet());
       fun.operands().push_back(c);
       symbol_exprt bool_sym("bool_b", bool_typet());