From 4fafa75f906be0f1e84976bf3ab30d7613121746 Mon Sep 17 00:00:00 2001 From: Ioannis Rousochatzakis Date: Mon, 2 Jun 2025 11:23:17 +0200 Subject: [PATCH 1/2] Removed an unnecessary parameter as spotted by copilot code review --- .../java/eu/europa/ted/efx/interfaces/MarkupGenerator.java | 3 +-- .../java/eu/europa/ted/efx/model/templates/ContentBlock.java | 2 +- .../eu/europa/ted/efx/model/templates/TemplateInvocation.java | 2 +- src/test/java/eu/europa/ted/efx/mock/MarkupGeneratorMock.java | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/eu/europa/ted/efx/interfaces/MarkupGenerator.java b/src/main/java/eu/europa/ted/efx/interfaces/MarkupGenerator.java index 7f37b524..145d5f88 100644 --- a/src/main/java/eu/europa/ted/efx/interfaces/MarkupGenerator.java +++ b/src/main/java/eu/europa/ted/efx/interfaces/MarkupGenerator.java @@ -291,13 +291,12 @@ default Markup renderFragmentInvocation(final String name, final PathExpression * In EFX to XSLT translation, this method would generate the xsl:for-each that will loop * over the context path expression and invoke the fragment for each item in the loop. * - * @param name the name of the fragment. * @param context the context path expression for the loop. * @param content the content of the fragment. * @param arguments the arguments to pass to the fragment. * @return the code that invokes (uses) the fragment in a context loop. */ - Markup renderContextLoop(final String name, final PathExpression context, final Markup content, + Markup renderContextLoop(final PathExpression context, final Markup content, final Set arguments); /** diff --git a/src/main/java/eu/europa/ted/efx/model/templates/ContentBlock.java b/src/main/java/eu/europa/ted/efx/model/templates/ContentBlock.java index 550f7f93..d664e317 100644 --- a/src/main/java/eu/europa/ted/efx/model/templates/ContentBlock.java +++ b/src/main/java/eu/europa/ted/efx/model/templates/ContentBlock.java @@ -265,7 +265,7 @@ public Markup renderInvocation(MarkupGenerator markupGenerator) { args.addAll(this.getOwnArguments().stream().map(a -> new Argument.Impl(a.name, markupGenerator.getEfxDataTypeEquivalent(a.dataType), a.value)) .collect(Collectors.toCollection(LinkedHashSet::new))); var invocation = markupGenerator.renderFragmentInvocation(this.id, args); - return markupGenerator.renderContextLoop(this.id, this.context.relativePath(), invocation, args); + return markupGenerator.renderContextLoop(this.context.relativePath(), invocation, args); } // #endregion Render -------------------------------------------------------- diff --git a/src/main/java/eu/europa/ted/efx/model/templates/TemplateInvocation.java b/src/main/java/eu/europa/ted/efx/model/templates/TemplateInvocation.java index 7c795262..9eeb75b4 100644 --- a/src/main/java/eu/europa/ted/efx/model/templates/TemplateInvocation.java +++ b/src/main/java/eu/europa/ted/efx/model/templates/TemplateInvocation.java @@ -40,6 +40,6 @@ public Markup renderInvocation(MarkupGenerator markupGenerator) { Set arguments = this.getOwnArguments().stream().map(a -> new Argument.Impl(a.name, markupGenerator.getEfxDataTypeEquivalent(a.dataType), a.value)) .collect(Collectors.toCollection(LinkedHashSet::new)); var content = markupGenerator.renderFragmentInvocation(this.id, arguments); - return markupGenerator.renderContextLoop(this.id, this.context.relativePath(), content, arguments); + return markupGenerator.renderContextLoop(this.context.relativePath(), content, arguments); } } \ No newline at end of file diff --git a/src/test/java/eu/europa/ted/efx/mock/MarkupGeneratorMock.java b/src/test/java/eu/europa/ted/efx/mock/MarkupGeneratorMock.java index 28d0b71b..146b8ea6 100644 --- a/src/test/java/eu/europa/ted/efx/mock/MarkupGeneratorMock.java +++ b/src/test/java/eu/europa/ted/efx/mock/MarkupGeneratorMock.java @@ -138,7 +138,7 @@ public Markup composeFragmentDefinition(String name, String number, Set arguments) { return new Markup(String.format("for-each(%s).%s", context.getScript(), content.script)); } From 8ded80a8661a73e25cbc6d66dcc72fcec131ba06 Mon Sep 17 00:00:00 2001 From: Ioannis Rousochatzakis Date: Mon, 2 Jun 2025 11:33:58 +0200 Subject: [PATCH 2/2] Fixed a Javadoc comment in MarkupGenerator.java --- .../java/eu/europa/ted/efx/interfaces/MarkupGenerator.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/eu/europa/ted/efx/interfaces/MarkupGenerator.java b/src/main/java/eu/europa/ted/efx/interfaces/MarkupGenerator.java index 145d5f88..601e89ae 100644 --- a/src/main/java/eu/europa/ted/efx/interfaces/MarkupGenerator.java +++ b/src/main/java/eu/europa/ted/efx/interfaces/MarkupGenerator.java @@ -271,16 +271,15 @@ default Markup renderFragmentInvocation(final String name, final PathExpression Markup renderFragmentInvocation(final String name, final Set arguments); /** - * Given a fragment name (identifier), an evaluation context, and some - * pre-rendered content, this method returns the code that invokes (uses) the - * fragment in a context loop. + * Given an evaluation context, and some pre-rendered content, this method returns the code that + * iterates over the context and repeats the content for each item in the context. * * As of version 2.0.0-alpha.4, the method composeFragmentInvocation(String, Set) * has been split into two methods: * 1. {@link #renderFragmentInvocation(String, Set)} * for rendering the fragment invocation itself, which is the used by the * context loop. - * 2. {@link #renderContextLoop(String, PathExpression, Markup, Set)} + * 2. {@link #renderContextLoop(PathExpression, Markup, Set)} * for rendering the context loop that invokes the fragment. * * The EfxTemplateTranslator will call these two methods in sequence to generate the