fix: Pages inheritance

ICIJ · Oct 28, 2024 · 81705c5 · 81705c5
1 parent d741672
commit 81705c5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/main/java/org/icij/ftm/Model.java b/src/main/java/org/icij/ftm/Model.java
@@ -20,7 +20,7 @@ public class Model {
     private final static Logger logger = LoggerFactory.getLogger(Model.class);
     final Map<String, Model> parents;
     private final Map<String, Object> yaml;
-    private static final Set<String> mixins = new LinkedHashSet<>(List.of("Asset"));
+    private static final Set<String> mixins = new LinkedHashSet<>(List.of("Asset", "Folder", "PlainText", "HyperText"));
 
     public Model(Map<String, Object> modelMap, Map<String, Model> parents) {
         this.yaml = Collections.unmodifiableMap(modelMap);
@@ -92,7 +92,7 @@ public String label() {
     }
 
     public boolean isConcrete() {
-        return  !mixins.contains(name()) && !getRequired().isEmpty();
+        return  !(mixins.contains(name()) || (getRequired().isEmpty() && getConcreteParent().isEmpty()));
     }
 
     private Map<String, Object> getProperty(String prop, Model model) {

diff --git a/src/main/java/org/icij/ftm/SourceGenerator.java b/src/main/java/org/icij/ftm/SourceGenerator.java
@@ -61,7 +61,7 @@ public String generate(Path path) throws IOException {
 
             String parentsStringProperties = new AttributeHandlerForSignature(model).generateFor(parentsAttributes);
             String stringProperties = new AttributeHandlerForSignature(model).generateFor(modelAttributes);
-            String classAttributes = new AttributeHandlerForAttrs(model, parents).generateFor(modelAttributes);
+            String classAttributes = new AttributeHandlerForAttrs(model).generateFor(modelAttributes);
             String classAttributesAssignation = getConstructor(model);
 
             if (parents.containsKey(model.name()) || inheritanceString.contains("extends")) {
@@ -182,7 +182,7 @@ protected void addPropertyForNativeType(StringBuilder stringProperties, String p
     }
 
     static class AttributeHandlerForAttrs extends AttributeHandlerForSignature {
-        public AttributeHandlerForAttrs(Model model, Map<String, Model> parents) {
+        public AttributeHandlerForAttrs(Model model) {
             super(model);
         }
 

diff --git a/src/test/java/org/icij/ftm/SourceGeneratorTest.java b/src/test/java/org/icij/ftm/SourceGeneratorTest.java
@@ -168,7 +168,6 @@ public void test_license_bug() throws Exception {
     }
 
     @Test
-    @Ignore
     public void test_generate_class_if_extends_class_ex_Pages() throws Exception {
         Path path = getPath("Pages.yaml");
         SourceGenerator sourceGenerator = new SourceGenerator(propertiesFromMap(of("parents", Utils.findParents(new File[]{