Merge branch 'main' into jonathan/codegen_map_java

Signed-off-by: Jonathan-Casey <[email protected]>

package.json

@@ -45,7 +45,6 @@
     "author": "accordproject.org",
     "license": "Apache-2.0",
     "devDependencies": {
-        "@accordproject/concerto-cto": "3.14.2",
         "@accordproject/concerto-cto": "3.14.2",
         "@babel/preset-env": "7.16.11",
         "babel-loader": "8.2.3",

test/codegen/__snapshots__/codegen.js.snap

@@ -1071,11 +1071,11 @@ import com.fasterxml.jackson.annotation.*;
 public class Company extends Concept {
    private String name;
    private Address headquarters;
-   private Map<String, String> companyProperties = new HashMap<>();
-   private Map<SSN, Employee> employeeDirectory = new HashMap<>();
-   private Map<SSN, TShirtSizeType> employeeTShirtSizes = new HashMap<>();
-   private Map<String, Concept> employeeProfiles = new HashMap<>();
-   private Map<String, SSN> employeeSocialSecurityNumbers = new HashMap<>();
+   private CompanyProperties companyProperties;
+   private EmployeeDirectory employeeDirectory;
+   private EmployeeTShirtSizes employeeTShirtSizes;
+   private EmployeeProfiles employeeProfiles;
+   private EmployeeSocialSecurityNumbers employeeSocialSecurityNumbers;
    public String getName() {
       return this.name;
    }
@@ -1273,6 +1273,7 @@ public abstract class Person extends Participant {
    private double height;
    private java.util.Date dob;
    private Map<KinName, KinTelephone> nextOfKin = new HashMap<>();
+
    public String getEmail() {
       return this.email;
    }
@@ -6619,11 +6620,12 @@ import com.fasterxml.jackson.annotation.*;
 public class Company extends Concept {
    private String name;
    private Address headquarters;
-   private Map<String, String> companyProperties = new HashMap<>();
-   private Map<SSN, Employee> employeeDirectory = new HashMap<>();
-   private Map<SSN, TShirtSizeType> employeeTShirtSizes = new HashMap<>();
-   private Map<String, Concept> employeeProfiles = new HashMap<>();
-   private Map<String, SSN> employeeSocialSecurityNumbers = new HashMap<>();
+   private CompanyProperties companyProperties;
+   private EmployeeDirectory employeeDirectory;
+   private EmployeeTShirtSizes employeeTShirtSizes;
+   private EmployeeProfiles employeeProfiles;
+   private EmployeeSocialSecurityNumbers employeeSocialSecurityNumbers;
+
    public String getName() {
       return this.name;
    }
@@ -6821,6 +6823,7 @@ public abstract class Person extends Participant {
    private double height;
    private java.util.Date dob;
    private Map<KinName, KinTelephone> nextOfKin = new HashMap<>();
+
    public String getEmail() {
       return this.email;
    }