You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2025/06/19 08:14:09 UTC

(syncope) branch 4_0_X updated (98067cb43a -> 5487a82be2)

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a change to branch 4_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git


    from 98067cb43a Upgrading Payara
     new cc4aed77bd Bump org.webjars:swagger-ui from 5.24.1-1 to 5.25.2
     new e567830970 Bump org.webjars.npm:bootbox from 6.0.0 to 6.0.4
     new 5487a82be2 Cleanup

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../client/console/implementations/MyReportJobDelegate.groovy     | 3 +--
 .../test/java/org/apache/syncope/core/logic/ReportLogicTest.java  | 5 ++---
 .../core/provisioning/api/job/report/ReportJobDelegate.java       | 2 --
 .../provisioning/java/job/report/AbstractReportJobDelegate.java   | 8 ++------
 .../syncope/core/provisioning/java/job/report/ReportJob.java      | 5 +----
 .../syncope/fit/core/reference/SampleReportJobDelegate.java       | 6 ++----
 pom.xml                                                           | 4 ++--
 7 files changed, 10 insertions(+), 23 deletions(-)


(syncope) 03/03: Cleanup

Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch 4_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git

commit 5487a82be27f54a07533a5afe1a379a6b6f1926f
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu Jun 19 10:13:26 2025 +0200

    Cleanup
---
 .../client/console/implementations/MyReportJobDelegate.groovy     | 3 +--
 .../test/java/org/apache/syncope/core/logic/ReportLogicTest.java  | 5 ++---
 .../core/provisioning/api/job/report/ReportJobDelegate.java       | 2 --
 .../provisioning/java/job/report/AbstractReportJobDelegate.java   | 8 ++------
 .../syncope/core/provisioning/java/job/report/ReportJob.java      | 5 +----
 .../syncope/fit/core/reference/SampleReportJobDelegate.java       | 6 ++----
 6 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/implementations/MyReportJobDelegate.groovy b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/implementations/MyReportJobDelegate.groovy
index 1d9a9b7f29..368166288a 100644
--- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/implementations/MyReportJobDelegate.groovy
+++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/implementations/MyReportJobDelegate.groovy
@@ -30,8 +30,7 @@ class MyReportJobDelegate implements ReportJobDelegate {
   }
   
   @Override
-  void execute(String reportKey, boolean dryRun, JobExecutionContext context)
-    throws JobExecutionException {
+  void execute(String reportKey, JobExecutionContext context) throws JobExecutionException {
    
   }
 }
diff --git a/core/idrepo/logic/src/test/java/org/apache/syncope/core/logic/ReportLogicTest.java b/core/idrepo/logic/src/test/java/org/apache/syncope/core/logic/ReportLogicTest.java
index 30d6926367..ff9234a5f6 100644
--- a/core/idrepo/logic/src/test/java/org/apache/syncope/core/logic/ReportLogicTest.java
+++ b/core/idrepo/logic/src/test/java/org/apache/syncope/core/logic/ReportLogicTest.java
@@ -55,9 +55,7 @@ public class ReportLogicTest extends AbstractTest {
 
         @Override
         protected String doExecute(
-                final boolean dryRun,
                 final OutputStream os,
-                final String executor,
                 final JobExecutionContext context) throws JobExecutionException {
 
             try {
@@ -114,10 +112,11 @@ public class ReportLogicTest extends AbstractTest {
 
         JobExecutionContext ctx = mock(JobExecutionContext.class);
         when(ctx.getExecutor()).thenReturn("test");
+        when(ctx.isDryRun()).thenReturn(false);
 
         ReportJobDelegate delegate =
                 ApplicationContextProvider.getBeanFactory().createBean(TestReportJobDelegate.class);
-        delegate.execute(report.getKey(), false, ctx);
+        delegate.execute(report.getKey(), ctx);
 
         report = logic.read(report.getKey());
         assertFalse(report.getExecutions().isEmpty());
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/job/report/ReportJobDelegate.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/job/report/ReportJobDelegate.java
index 11acf7a507..a8e686f586 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/job/report/ReportJobDelegate.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/job/report/ReportJobDelegate.java
@@ -37,12 +37,10 @@ public interface ReportJobDelegate {
      * Executes a Job to run the given Report.
      *
      * @param reportKey Report key to run
-     * @param dryRun indicates if execution shall be simulated with no actual changes
      * @param context execution context, can be used to pass parameters to the job
      * @throws JobExecutionException if anything goes wrong
      */
     void execute(
             String reportKey,
-            boolean dryRun,
             JobExecutionContext context) throws JobExecutionException;
 }
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/AbstractReportJobDelegate.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/AbstractReportJobDelegate.java
index dc7525c02b..3ae8f49882 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/AbstractReportJobDelegate.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/AbstractReportJobDelegate.java
@@ -100,7 +100,6 @@ public abstract class AbstractReportJobDelegate implements ReportJobDelegate {
     @Override
     public void execute(
             final String reportKey,
-            final boolean dryRun,
             final JobExecutionContext context) throws JobExecutionException {
 
         report = reportDAO.findById(reportKey).
@@ -133,7 +132,7 @@ public abstract class AbstractReportJobDelegate implements ReportJobDelegate {
 
         setStatus("Starting");
         try {
-            execution.setMessage(doExecute(dryRun, zos, executor, context));
+            execution.setMessage(doExecute(zos, context));
             execution.setStatus(ReportJob.Status.SUCCESS.name());
 
             result = OpEvent.Outcome.SUCCESS;
@@ -184,14 +183,11 @@ public abstract class AbstractReportJobDelegate implements ReportJobDelegate {
     /**
      * The actual execution, delegated to child classes.
      *
-     * @param dryRun whether to actually touch the data
      * @param os where to stream report execution's data
-     * @param executor the user executing this report
      * @param context job execution context, can be used to pass parameters to the job
      * @return the report execution status to be set
      * @throws JobExecutionException if anything goes wrong
      */
-    protected abstract String doExecute(
-            boolean dryRun, OutputStream os, String executor, JobExecutionContext context)
+    protected abstract String doExecute(OutputStream os, JobExecutionContext context)
             throws JobExecutionException;
 }
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/ReportJob.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/ReportJob.java
index d3d827fb19..92bf027012 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/ReportJob.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/ReportJob.java
@@ -81,10 +81,7 @@ public class ReportJob extends Job {
                                 instance -> perContextReportJobDelegates.put(impl.getKey(), instance)).
                                 orElseThrow(() -> new IllegalArgumentException(
                                 "Could not instantiate " + impl.getBody()));
-                        delegate.execute(
-                                reportKey,
-                                context.isDryRun(),
-                                context);
+                        delegate.execute(reportKey, context);
                     }
                 } catch (Exception e) {
                     LOG.error("While executing report {}", reportKey, e);
diff --git a/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/SampleReportJobDelegate.java b/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/SampleReportJobDelegate.java
index 91795218d0..84c1093310 100644
--- a/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/SampleReportJobDelegate.java
+++ b/fit/core-reference/src/main/java/org/apache/syncope/fit/core/reference/SampleReportJobDelegate.java
@@ -112,12 +112,10 @@ public class SampleReportJobDelegate extends AbstractReportJobDelegate {
 
     @Override
     protected String doExecute(
-            final boolean dryRun,
             final OutputStream os,
-            final String executor,
             final JobExecutionContext context) throws JobExecutionException {
 
-        if (!dryRun) {
+        if (!context.isDryRun()) {
             try {
                 switch (report.getMimeType()) {
                     case MediaType.APPLICATION_PDF_VALUE:
@@ -135,7 +133,7 @@ public class SampleReportJobDelegate extends AbstractReportJobDelegate {
             }
         }
 
-        return (dryRun
+        return (context.isDryRun()
                 ? "DRY "
                 : "") + "RUNNING";
     }


(syncope) 02/03: Bump org.webjars.npm:bootbox from 6.0.0 to 6.0.4

Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch 4_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git

commit e567830970125d0c18152baab299e5f26b84634e
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Jun 18 22:54:06 2025 +0000

    Bump org.webjars.npm:bootbox from 6.0.0 to 6.0.4
    
    Bumps [org.webjars.npm:bootbox](https://github.com/bootboxjs/bootbox) from 6.0.0 to 6.0.4.
    - [Release notes](https://github.com/bootboxjs/bootbox/releases)
    - [Changelog](https://github.com/bootboxjs/bootbox/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/bootboxjs/bootbox/compare/v6.0.0...v6.0.4)
    
    ---
    updated-dependencies:
    - dependency-name: org.webjars.npm:bootbox
      dependency-version: 6.0.4
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0c82800241..4e84531141 100644
--- a/pom.xml
+++ b/pom.xml
@@ -452,7 +452,7 @@ under the License.
     <jquery-slimscroll.version>1.3.8</jquery-slimscroll.version>
     <jquery-cookie.version>1.4.1-1</jquery-cookie.version>
 
-    <bootbox.version>6.0.0</bootbox.version>
+    <bootbox.version>6.0.4</bootbox.version>
     <bootstrap5-toggle.version>5.1.1</bootstrap5-toggle.version>
     <font-awesome.version>6.7.2</font-awesome.version>
     <ionicons.version>2.0.1</ionicons.version>


(syncope) 01/03: Bump org.webjars:swagger-ui from 5.24.1-1 to 5.25.2

Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch 4_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git

commit cc4aed77bdee979cc6eac8cc25756936056e5c7b
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Jun 18 22:40:51 2025 +0000

    Bump org.webjars:swagger-ui from 5.24.1-1 to 5.25.2
    
    Bumps [org.webjars:swagger-ui](https://github.com/swagger-api/swagger-ui) from 5.24.1-1 to 5.25.2.
    - [Release notes](https://github.com/swagger-api/swagger-ui/releases)
    - [Changelog](https://github.com/swagger-api/swagger-ui/blob/master/.releaserc)
    - [Commits](https://github.com/swagger-api/swagger-ui/commits/v5.25.2)
    
    ---
    updated-dependencies:
    - dependency-name: org.webjars:swagger-ui
      dependency-version: 5.25.2
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c2b6a20fe0..0c82800241 100644
--- a/pom.xml
+++ b/pom.xml
@@ -447,7 +447,7 @@ under the License.
     <cas-client.version>4.0.4</cas-client.version>
 
     <swagger-core.version>2.2.33</swagger-core.version>
-    <swagger-ui.version>5.24.1-1</swagger-ui.version>
+    <swagger-ui.version>5.25.2</swagger-ui.version>
 
     <jquery-slimscroll.version>1.3.8</jquery-slimscroll.version>
     <jquery-cookie.version>1.4.1-1</jquery-cookie.version>