Merge pull request #69 from hmcts/simplify

Merge types library into config generator
hmcts · Mar 5, 2021 · 9f2861e · 9f2861e
2 parents 4669d48 + ba9af19
commit 9f2861e
Show file tree

Hide file tree

Showing 110 changed files with 332 additions and 279 deletions.
diff --git a/build.gradle b/build.gradle
@@ -31,7 +31,7 @@ subprojects {
     }
 }
 
-def libraries = [project(":ccd-sdk-types"), project(":ccd-config-generator")]
+def libraries = [project(":ccd-config-generator")]
 
 configure(libraries) {
 

diff --git a/ccd-config-generator/build.gradle b/ccd-config-generator/build.gradle
@@ -43,7 +43,6 @@ dependencies {
     compile 'com.google.guava:guava:30.1-jre'
 
     compile 'com.fasterxml.jackson.core:jackson-databind:2.12.2'
-    compile project(':ccd-sdk-types')
 }
 
 compileJava {

diff --git a/...ator/AuthorisationCaseEventGenerator.java → .../sdk/AuthorisationCaseEventGenerator.java b/...ator/AuthorisationCaseEventGenerator.java → .../sdk/AuthorisationCaseEventGenerator.java
@@ -1,4 +1,4 @@
-package uk.gov.hmcts.ccd.sdk.generator;
+package uk.gov.hmcts.ccd.sdk;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -11,7 +11,7 @@
 import uk.gov.hmcts.ccd.sdk.JsonUtils;
 import uk.gov.hmcts.ccd.sdk.JsonUtils.AddMissing;
 
-public class AuthorisationCaseEventGenerator {
+class AuthorisationCaseEventGenerator {
 
   public static void generate(File root,
       Table<String, String, String> eventRolePermissions,

diff --git a/...ator/AuthorisationCaseFieldGenerator.java → .../sdk/AuthorisationCaseFieldGenerator.java b/...ator/AuthorisationCaseFieldGenerator.java → .../sdk/AuthorisationCaseFieldGenerator.java
@@ -1,4 +1,4 @@
-package uk.gov.hmcts.ccd.sdk.generator;
+package uk.gov.hmcts.ccd.sdk;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.HashBasedTable;
@@ -19,23 +19,22 @@
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.stream.Collectors;
-import uk.gov.hmcts.ccd.sdk.JsonUtils;
 import uk.gov.hmcts.ccd.sdk.JsonUtils.CRUDMerger;
-import uk.gov.hmcts.ccd.sdk.types.Event;
-import uk.gov.hmcts.ccd.sdk.types.Field;
-import uk.gov.hmcts.ccd.sdk.types.Field.FieldBuilder;
-import uk.gov.hmcts.ccd.sdk.types.HasRole;
-import uk.gov.hmcts.ccd.sdk.types.Search;
-import uk.gov.hmcts.ccd.sdk.types.Search.SearchBuilder;
-import uk.gov.hmcts.ccd.sdk.types.SearchField;
-import uk.gov.hmcts.ccd.sdk.types.Tab;
-import uk.gov.hmcts.ccd.sdk.types.Tab.TabBuilder;
-import uk.gov.hmcts.ccd.sdk.types.TabField;
-import uk.gov.hmcts.ccd.sdk.types.WorkBasket;
-import uk.gov.hmcts.ccd.sdk.types.WorkBasket.WorkBasketBuilder;
-import uk.gov.hmcts.ccd.sdk.types.WorkBasketField;
-
-public class AuthorisationCaseFieldGenerator {
+import uk.gov.hmcts.ccd.sdk.api.Event;
+import uk.gov.hmcts.ccd.sdk.api.Field;
+import uk.gov.hmcts.ccd.sdk.api.Field.FieldBuilder;
+import uk.gov.hmcts.ccd.sdk.api.HasRole;
+import uk.gov.hmcts.ccd.sdk.api.Search;
+import uk.gov.hmcts.ccd.sdk.api.Search.SearchBuilder;
+import uk.gov.hmcts.ccd.sdk.api.SearchField;
+import uk.gov.hmcts.ccd.sdk.api.Tab;
+import uk.gov.hmcts.ccd.sdk.api.Tab.TabBuilder;
+import uk.gov.hmcts.ccd.sdk.api.TabField;
+import uk.gov.hmcts.ccd.sdk.api.WorkBasket;
+import uk.gov.hmcts.ccd.sdk.api.WorkBasket.WorkBasketBuilder;
+import uk.gov.hmcts.ccd.sdk.api.WorkBasketField;
+
+class AuthorisationCaseFieldGenerator {
 
   public static void generate(File root, String caseType, List<Event> events,
       Table<String, String, String> eventRolePermissions, List<TabBuilder> tabs,

diff --git a/...ator/AuthorisationCaseStateGenerator.java → .../sdk/AuthorisationCaseStateGenerator.java b/...ator/AuthorisationCaseStateGenerator.java → .../sdk/AuthorisationCaseStateGenerator.java
@@ -1,4 +1,4 @@
-package uk.gov.hmcts.ccd.sdk.generator;
+package uk.gov.hmcts.ccd.sdk;
 
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Lists;
@@ -16,11 +16,10 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
-import uk.gov.hmcts.ccd.sdk.JsonUtils;
 import uk.gov.hmcts.ccd.sdk.JsonUtils.CRUDMerger;
-import uk.gov.hmcts.ccd.sdk.types.Event;
+import uk.gov.hmcts.ccd.sdk.api.Event;
 
-public class AuthorisationCaseStateGenerator {
+class AuthorisationCaseStateGenerator {
 
   public static void generate(File root, String caseType, List<Event> events,
       Table<String, String, String> eventRolePermissions) {

diff --git a/...rator/AuthorisationCaseTypeGenerator.java → ...d/sdk/AuthorisationCaseTypeGenerator.java b/...rator/AuthorisationCaseTypeGenerator.java → ...d/sdk/AuthorisationCaseTypeGenerator.java
@@ -1,15 +1,14 @@
-package uk.gov.hmcts.ccd.sdk.generator;
+package uk.gov.hmcts.ccd.sdk;
 
 import com.google.common.collect.Lists;
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Map;
-import uk.gov.hmcts.ccd.sdk.JsonUtils;
-import uk.gov.hmcts.ccd.sdk.types.HasRole;
+import uk.gov.hmcts.ccd.sdk.api.HasRole;
 
-public class AuthorisationCaseTypeGenerator {
+class AuthorisationCaseTypeGenerator {
   public static void generate(File root, String caseType, Class roleEnum) {
 
     List<Map<String, Object>> result = Lists.newArrayList();

diff --git a/...ccd/sdk/generator/CaseEventGenerator.java → ...gov/hmcts/ccd/sdk/CaseEventGenerator.java b/...ccd/sdk/generator/CaseEventGenerator.java → ...gov/hmcts/ccd/sdk/CaseEventGenerator.java
@@ -1,4 +1,4 @@
-package uk.gov.hmcts.ccd.sdk.generator;
+package uk.gov.hmcts.ccd.sdk;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableListMultimap;
@@ -11,12 +11,11 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import uk.gov.hmcts.ccd.sdk.JsonUtils;
 import uk.gov.hmcts.ccd.sdk.JsonUtils.AddMissing;
-import uk.gov.hmcts.ccd.sdk.types.Event;
-import uk.gov.hmcts.ccd.sdk.types.Webhook;
+import uk.gov.hmcts.ccd.sdk.api.Event;
+import uk.gov.hmcts.ccd.sdk.api.Webhook;
 
-public class CaseEventGenerator {
+class CaseEventGenerator {
 
   public static void writeEvents(File root, String caseType, List<Event> events) {
 

diff --git a/...tor/CaseEventToComplexTypesGenerator.java → ...sdk/CaseEventToComplexTypesGenerator.java b/...tor/CaseEventToComplexTypesGenerator.java → ...sdk/CaseEventToComplexTypesGenerator.java
@@ -1,4 +1,4 @@
-package uk.gov.hmcts.ccd.sdk.generator;
+package uk.gov.hmcts.ccd.sdk;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableListMultimap;
@@ -10,13 +10,12 @@
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Map;
-import uk.gov.hmcts.ccd.sdk.JsonUtils;
 import uk.gov.hmcts.ccd.sdk.JsonUtils.AddMissing;
-import uk.gov.hmcts.ccd.sdk.types.Event;
-import uk.gov.hmcts.ccd.sdk.types.Field;
-import uk.gov.hmcts.ccd.sdk.types.FieldCollection;
+import uk.gov.hmcts.ccd.sdk.api.Event;
+import uk.gov.hmcts.ccd.sdk.api.Field;
+import uk.gov.hmcts.ccd.sdk.api.FieldCollection;
 
-public class CaseEventToComplexTypesGenerator {
+class CaseEventToComplexTypesGenerator {
 
   public static void writeEvents(File root, List<Event> events) {
     for (Event event : events) {

diff --git a/...generator/CaseEventToFieldsGenerator.java → ...s/ccd/sdk/CaseEventToFieldsGenerator.java b/...generator/CaseEventToFieldsGenerator.java → ...s/ccd/sdk/CaseEventToFieldsGenerator.java
@@ -1,4 +1,4 @@
-package uk.gov.hmcts.ccd.sdk.generator;
+package uk.gov.hmcts.ccd.sdk;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -8,13 +8,12 @@
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Map;
-import uk.gov.hmcts.ccd.sdk.JsonUtils;
 import uk.gov.hmcts.ccd.sdk.JsonUtils.AddMissing;
-import uk.gov.hmcts.ccd.sdk.types.Event;
-import uk.gov.hmcts.ccd.sdk.types.Field;
-import uk.gov.hmcts.ccd.sdk.types.FieldCollection;
+import uk.gov.hmcts.ccd.sdk.api.Event;
+import uk.gov.hmcts.ccd.sdk.api.Field;
+import uk.gov.hmcts.ccd.sdk.api.FieldCollection;
 
-public class CaseEventToFieldsGenerator {
+class CaseEventToFieldsGenerator {
 
   public static void writeEvents(File root, List<Event> events, String caseType) {
 

diff --git a/...ccd/sdk/generator/CaseFieldGenerator.java → ...gov/hmcts/ccd/sdk/CaseFieldGenerator.java b/...ccd/sdk/generator/CaseFieldGenerator.java → ...gov/hmcts/ccd/sdk/CaseFieldGenerator.java
@@ -1,4 +1,4 @@
-package uk.gov.hmcts.ccd.sdk.generator;
+package uk.gov.hmcts.ccd.sdk;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -18,17 +18,15 @@
 import java.util.Set;
 import net.jodah.typetools.TypeResolver;
 import org.reflections.ReflectionUtils;
-import uk.gov.hmcts.ccd.sdk.ConfigBuilderImpl;
-import uk.gov.hmcts.ccd.sdk.JsonUtils;
 import uk.gov.hmcts.ccd.sdk.JsonUtils.OverwriteSpecific;
-import uk.gov.hmcts.ccd.sdk.types.CCD;
-import uk.gov.hmcts.ccd.sdk.types.ComplexType;
-import uk.gov.hmcts.ccd.sdk.types.Event;
-import uk.gov.hmcts.ccd.sdk.types.Field.FieldBuilder;
-import uk.gov.hmcts.ccd.sdk.types.FieldType;
-import uk.gov.hmcts.ccd.sdk.types.Label;
+import uk.gov.hmcts.ccd.sdk.api.CCD;
+import uk.gov.hmcts.ccd.sdk.api.ComplexType;
+import uk.gov.hmcts.ccd.sdk.api.Event;
+import uk.gov.hmcts.ccd.sdk.api.Field.FieldBuilder;
+import uk.gov.hmcts.ccd.sdk.api.FieldType;
+import uk.gov.hmcts.ccd.sdk.api.Label;
 
-public class CaseFieldGenerator {
+class CaseFieldGenerator {
 
   // The field type set from code always takes precedence,
   // so eg. if a field changes type it gets updated.
@@ -180,26 +178,26 @@ private static void inferFieldType(Class dataClass, Field field, Map<String, Obj
 
   private static List<Map<String, Object>> getExplicitFields(String caseType, List<Event> events,
       ConfigBuilderImpl builder) {
-    Map<String, uk.gov.hmcts.ccd.sdk.types.Field> explicitFields = Maps.newHashMap();
+    Map<String, uk.gov.hmcts.ccd.sdk.api.Field> explicitFields = Maps.newHashMap();
     for (Event event : events) {
-      List<uk.gov.hmcts.ccd.sdk.types.Field.FieldBuilder> fc = event.getFields().build()
+      List<uk.gov.hmcts.ccd.sdk.api.Field.FieldBuilder> fc = event.getFields().build()
           .getExplicitFields();
 
-      for (uk.gov.hmcts.ccd.sdk.types.Field.FieldBuilder fieldBuilder : fc) {
-        uk.gov.hmcts.ccd.sdk.types.Field field = fieldBuilder.build();
+      for (uk.gov.hmcts.ccd.sdk.api.Field.FieldBuilder fieldBuilder : fc) {
+        uk.gov.hmcts.ccd.sdk.api.Field field = fieldBuilder.build();
         explicitFields.put(field.getId(), field);
       }
     }
 
-    List<uk.gov.hmcts.ccd.sdk.types.Field.FieldBuilder> fs = builder.explicitFields;
+    List<uk.gov.hmcts.ccd.sdk.api.Field.FieldBuilder> fs = builder.explicitFields;
     for (FieldBuilder explicitField : fs) {
-      uk.gov.hmcts.ccd.sdk.types.Field field = explicitField.build();
+      uk.gov.hmcts.ccd.sdk.api.Field field = explicitField.build();
       explicitFields.put(field.getId(), field);
     }
 
     List<Map<String, Object>> result = Lists.newArrayList();
     for (String fieldId : explicitFields.keySet()) {
-      uk.gov.hmcts.ccd.sdk.types.Field field = explicitFields.get(fieldId);
+      uk.gov.hmcts.ccd.sdk.api.Field field = explicitFields.get(fieldId);
       Map<String, Object> fieldData = getField(caseType, fieldId);
       // Don't export inbuilt metadata fields.
       if (fieldId.matches("\\[.+\\]")) {

diff --git a/...d/sdk/generator/CaseTypeTabGenerator.java → ...v/hmcts/ccd/sdk/CaseTypeTabGenerator.java b/...d/sdk/generator/CaseTypeTabGenerator.java → ...v/hmcts/ccd/sdk/CaseTypeTabGenerator.java
@@ -1,4 +1,4 @@
-package uk.gov.hmcts.ccd.sdk.generator;
+package uk.gov.hmcts.ccd.sdk;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -7,15 +7,13 @@
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Map;
-import uk.gov.hmcts.ccd.sdk.ConfigBuilderImpl;
-import uk.gov.hmcts.ccd.sdk.JsonUtils;
 import uk.gov.hmcts.ccd.sdk.JsonUtils.AddMissing;
-import uk.gov.hmcts.ccd.sdk.types.HasRole;
-import uk.gov.hmcts.ccd.sdk.types.Tab;
-import uk.gov.hmcts.ccd.sdk.types.Tab.TabBuilder;
-import uk.gov.hmcts.ccd.sdk.types.TabField;
+import uk.gov.hmcts.ccd.sdk.api.HasRole;
+import uk.gov.hmcts.ccd.sdk.api.Tab;
+import uk.gov.hmcts.ccd.sdk.api.Tab.TabBuilder;
+import uk.gov.hmcts.ccd.sdk.api.TabField;
 
-public class CaseTypeTabGenerator {
+class CaseTypeTabGenerator {
 
   public static <T, R extends HasRole, S> void generate(File root, String caseType,
       ConfigBuilderImpl<T, S, R> builder) {

diff --git a/...d/sdk/generator/ComplexTypeGenerator.java → ...v/hmcts/ccd/sdk/ComplexTypeGenerator.java b/...d/sdk/generator/ComplexTypeGenerator.java → ...v/hmcts/ccd/sdk/ComplexTypeGenerator.java
@@ -1,16 +1,15 @@
-package uk.gov.hmcts.ccd.sdk.generator;
+package uk.gov.hmcts.ccd.sdk;
 
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import uk.gov.hmcts.ccd.sdk.JsonUtils;
 import uk.gov.hmcts.ccd.sdk.JsonUtils.AddMissing;
-import uk.gov.hmcts.ccd.sdk.types.ComplexType;
+import uk.gov.hmcts.ccd.sdk.api.ComplexType;
 
-public class ComplexTypeGenerator {
+class ComplexTypeGenerator {
 
   public static void generate(File root, String caseType, Map<Class, Integer> types) {
     File complexTypes = new File(root, "ComplexTypes");

diff --git a/ccd-config-generator/src/main/java/uk/gov/hmcts/ccd/sdk/ConfigBuilderImpl.java b/ccd-config-generator/src/main/java/uk/gov/hmcts/ccd/sdk/ConfigBuilderImpl.java
@@ -12,21 +12,21 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import uk.gov.hmcts.ccd.sdk.types.ConfigBuilder;
-import uk.gov.hmcts.ccd.sdk.types.Event;
-import uk.gov.hmcts.ccd.sdk.types.EventTypeBuilder;
-import uk.gov.hmcts.ccd.sdk.types.Field;
-import uk.gov.hmcts.ccd.sdk.types.Field.FieldBuilder;
-import uk.gov.hmcts.ccd.sdk.types.HasRole;
-import uk.gov.hmcts.ccd.sdk.types.RoleBuilder;
-import uk.gov.hmcts.ccd.sdk.types.Search.SearchBuilder;
-import uk.gov.hmcts.ccd.sdk.types.Tab;
-import uk.gov.hmcts.ccd.sdk.types.Tab.TabBuilder;
-import uk.gov.hmcts.ccd.sdk.types.Webhook;
-import uk.gov.hmcts.ccd.sdk.types.WebhookConvention;
-import uk.gov.hmcts.ccd.sdk.types.WorkBasket.WorkBasketBuilder;
-
-public class ConfigBuilderImpl<T, S, R extends HasRole> implements ConfigBuilder<T, S, R> {
+import uk.gov.hmcts.ccd.sdk.api.ConfigBuilder;
+import uk.gov.hmcts.ccd.sdk.api.Event;
+import uk.gov.hmcts.ccd.sdk.api.EventTypeBuilder;
+import uk.gov.hmcts.ccd.sdk.api.Field;
+import uk.gov.hmcts.ccd.sdk.api.Field.FieldBuilder;
+import uk.gov.hmcts.ccd.sdk.api.HasRole;
+import uk.gov.hmcts.ccd.sdk.api.RoleBuilder;
+import uk.gov.hmcts.ccd.sdk.api.Search.SearchBuilder;
+import uk.gov.hmcts.ccd.sdk.api.Tab;
+import uk.gov.hmcts.ccd.sdk.api.Tab.TabBuilder;
+import uk.gov.hmcts.ccd.sdk.api.Webhook;
+import uk.gov.hmcts.ccd.sdk.api.WebhookConvention;
+import uk.gov.hmcts.ccd.sdk.api.WorkBasket.WorkBasketBuilder;
+
+class ConfigBuilderImpl<T, S, R extends HasRole> implements ConfigBuilder<T, S, R> {
 
   public String caseType = "";
   public final Multimap<String, String> stateRoleHistoryAccess = ArrayListMultimap.create();

diff --git a/ccd-config-generator/src/main/java/uk/gov/hmcts/ccd/sdk/ConfigGenerator.java b/ccd-config-generator/src/main/java/uk/gov/hmcts/ccd/sdk/ConfigGenerator.java
@@ -9,6 +9,7 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Table;
 import com.google.common.io.MoreFiles;
+import com.google.common.io.RecursiveDeleteOption;
 import java.io.File;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -26,24 +27,10 @@
 import org.objenesis.ObjenesisStd;
 import org.reflections.ReflectionUtils;
 import org.reflections.Reflections;
-import uk.gov.hmcts.ccd.sdk.generator.AuthorisationCaseEventGenerator;
-import uk.gov.hmcts.ccd.sdk.generator.AuthorisationCaseFieldGenerator;
-import uk.gov.hmcts.ccd.sdk.generator.AuthorisationCaseStateGenerator;
-import uk.gov.hmcts.ccd.sdk.generator.AuthorisationCaseTypeGenerator;
-import uk.gov.hmcts.ccd.sdk.generator.CaseEventGenerator;
-import uk.gov.hmcts.ccd.sdk.generator.CaseEventToComplexTypesGenerator;
-import uk.gov.hmcts.ccd.sdk.generator.CaseEventToFieldsGenerator;
-import uk.gov.hmcts.ccd.sdk.generator.CaseFieldGenerator;
-import uk.gov.hmcts.ccd.sdk.generator.CaseTypeTabGenerator;
-import uk.gov.hmcts.ccd.sdk.generator.ComplexTypeGenerator;
-import uk.gov.hmcts.ccd.sdk.generator.FixedListGenerator;
-import uk.gov.hmcts.ccd.sdk.generator.SearchFieldAndResultGenerator;
-import uk.gov.hmcts.ccd.sdk.generator.StateGenerator;
-import uk.gov.hmcts.ccd.sdk.generator.WorkBasketGenerator;
-import uk.gov.hmcts.ccd.sdk.types.CCDConfig;
-import uk.gov.hmcts.ccd.sdk.types.Event;
-
-public class ConfigGenerator {
+import uk.gov.hmcts.ccd.sdk.api.CCDConfig;
+import uk.gov.hmcts.ccd.sdk.api.Event;
+
+class ConfigGenerator {
 
   private final Reflections reflections;
   private final String basePackage;
@@ -120,7 +107,7 @@ private void writeConfig(File outputfolder, ResolvedCCDConfig config) {
   @SneakyThrows
   private void initOutputDirectory(File outputfolder) {
     if (outputfolder.exists() && outputfolder.isDirectory()) {
-      MoreFiles.deleteRecursively(outputfolder.toPath());
+      MoreFiles.deleteRecursively(outputfolder.toPath(), RecursiveDeleteOption.ALLOW_INSECURE);
     }
     outputfolder.mkdirs();
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,7 @@ subprojects { @@
         }
     }
-    def libraries = [project(":ccd-sdk-types"), project(":ccd-config-generator")]
+    def libraries = [project(":ccd-config-generator")]
     configure(libraries) {
@@ Expand Down @@