From f3d1a1a949a254900c6f124dda96960ab369fad7 Mon Sep 17 00:00:00 2001 From: David Pascal Schmalzing Date: Wed, 12 Aug 2026 12:21:02 +0200 Subject: [PATCH] Remove outdated constructor decorator --- .../cd/codegen/ConstructorDecorator.java | 23 --------- .../de/monticore/CDGeneratorToolTest.java | 11 ----- .../cd/codegen/ConstructorDecoratorTest.java | 49 ------------------- .../cdgentool/DefaultCtorTemplate.ftl | 8 --- 4 files changed, 91 deletions(-) delete mode 100644 cdlang/src/main/java/de/monticore/cd/codegen/ConstructorDecorator.java delete mode 100644 cdlang/src/test/java/de/monticore/cd/codegen/ConstructorDecoratorTest.java delete mode 100644 cdlang/src/test/resources/de/monticore/cdgentool/DefaultCtorTemplate.ftl diff --git a/cdlang/src/main/java/de/monticore/cd/codegen/ConstructorDecorator.java b/cdlang/src/main/java/de/monticore/cd/codegen/ConstructorDecorator.java deleted file mode 100644 index 982782671..000000000 --- a/cdlang/src/main/java/de/monticore/cd/codegen/ConstructorDecorator.java +++ /dev/null @@ -1,23 +0,0 @@ -/* (c) https://github.com/MontiCore/monticore */ -package de.monticore.cd.codegen; - -import static de.monticore.cd.facade.CDModifier.PUBLIC; - -import de.monticore.cd.facade.CDConstructorFacade; -import de.monticore.cdbasis._ast.ASTCDClass; -import de.monticore.cdbasis._ast.ASTCDCompilationUnit; - -public class ConstructorDecorator { - - public ASTCDCompilationUnit decorate(ASTCDCompilationUnit compilationUnit) { - for (ASTCDClass c : compilationUnit.getCDDefinition().getCDClassesList()) { - c.addCDMember(CDConstructorFacade.getInstance().createDefaultConstructor(PUBLIC.build(), c)); - - if (!c.getCDAttributeList().isEmpty()) { - c.addCDMember(CDConstructorFacade.getInstance().createFullConstructor(PUBLIC.build(), c)); - } - } - return compilationUnit; - } - -} diff --git a/cdlang/src/test/java/de/monticore/CDGeneratorToolTest.java b/cdlang/src/test/java/de/monticore/CDGeneratorToolTest.java index 5320fb61d..7238cda0e 100644 --- a/cdlang/src/test/java/de/monticore/CDGeneratorToolTest.java +++ b/cdlang/src/test/java/de/monticore/CDGeneratorToolTest.java @@ -121,17 +121,6 @@ public void testGeneratorToolWithPkgSymTab() throws IOException { assertTrue(contents.contains("pkg")); } - @Test - @Disabled // The new generated uses a different set of decorators - public void testDefaultConstructorDecorator() { - new CDGenTool().run(new String[] { "-i", - "src/test/resources/de/monticore/cdgentool/model/Example.cd", "-c2mc", "-o", - "target/generated/example/defaultctor", "-ct", - "de.monticore.cdgentool.DefaultCtorTemplate", }); - - assertTrue(new File("target/generated/example/defaultctor/model/Example/A.java").isFile()); - } - @Test public void testImportStatements() { new CDGenTool().run(new String[] { "-i", diff --git a/cdlang/src/test/java/de/monticore/cd/codegen/ConstructorDecoratorTest.java b/cdlang/src/test/java/de/monticore/cd/codegen/ConstructorDecoratorTest.java deleted file mode 100644 index c71d98ae6..000000000 --- a/cdlang/src/test/java/de/monticore/cd/codegen/ConstructorDecoratorTest.java +++ /dev/null @@ -1,49 +0,0 @@ -/* (c) https://github.com/MontiCore/monticore */ -package de.monticore.cd.codegen; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import de.monticore.cd4code.CD4CodeMill; -import de.monticore.cd4code._parser.CD4CodeParser; -import de.monticore.cd4codebasis._ast.ASTCDConstructor; -import de.monticore.cdbasis._ast.ASTCDCompilationUnit; -import de.se_rwth.commons.logging.LogStub; -import java.io.IOException; -import java.util.Optional; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -public class ConstructorDecoratorTest { - - @BeforeEach - public void before() { - CD4CodeMill.globalScope().clear(); - CD4CodeMill.reset(); - CD4CodeMill.init(); - LogStub.init(); - } - - @Test - public void testDecorator() throws IOException { - CD4CodeParser parser = new CD4CodeParser(); - final Optional optAST = parser.parse( - "src/test/resources/de/monticore/cd/codegen/constructor/SimpleCD.cd"); - assertTrue(optAST.isPresent()); - final ASTCDCompilationUnit ast = optAST.get(); - - ConstructorDecorator decorator = new ConstructorDecorator(); - - assertEquals(2, ast.getCDDefinition().getCDClassesList().size()); - assertEquals(4, ast.getCDDefinition().getCDClassesList().get(0).getCDMemberList().size()); - assertTrue(ast.getCDDefinition().getCDClassesList().get(1).getCDConstructorList().isEmpty()); - decorator.decorate(ast); - assertEquals(6, ast.getCDDefinition().getCDClassesList().get(0).getCDMemberList().size()); - assertEquals(1, ast.getCDDefinition().getCDClassesList().get(1).getCDMemberList().size()); - assertEquals("x", ((ASTCDConstructor) (ast.getCDDefinition().getCDClassesList().get(0) - .getCDMemberList().get(5))).getCDParameterList().get(0).getName()); - assertEquals("isTrue", ((ASTCDConstructor) (ast.getCDDefinition().getCDClassesList().get(0) - .getCDMemberList().get(5))).getCDParameterList().get(1).getName()); - } - -} diff --git a/cdlang/src/test/resources/de/monticore/cdgentool/DefaultCtorTemplate.ftl b/cdlang/src/test/resources/de/monticore/cdgentool/DefaultCtorTemplate.ftl deleted file mode 100644 index 8b4023a1f..000000000 --- a/cdlang/src/test/resources/de/monticore/cdgentool/DefaultCtorTemplate.ftl +++ /dev/null @@ -1,8 +0,0 @@ -<#-- (c) https://github.com/MontiCore/monticore --> -${tc.signature("glex", "cdGenerator")} - -<#assign decorator = tc.instantiate("de.monticore.cd.codegen.ConstructorDecorator")> - -${decorator.decorate(ast)} - -${cdGenerator.generate(ast)}