Merge branch 'release/7.0.0' into NAE-2009

netgrif · Nov 11, 2024 · ad22de1 · ad22de1
2 parents bd50f35 + ea54563
commit ad22de1
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -801,7 +801,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.5</version>
+                <version>0.8.10</version>
                 <executions>
                     <execution>
                         <id>default-prepare-agent</id>

diff --git a/src/main/java/com/netgrif/application/engine/startup/ApplicationRunnerExecutor.java b/src/main/java/com/netgrif/application/engine/startup/ApplicationRunnerExecutor.java
@@ -74,6 +74,7 @@ protected ApplicationRunnerOrderResolver.SortedRunners<T> resolveRunners() {
         Map<String, T> customRunners = (Map<String, T>) ApplicationContextProvider.getAppContext().getBeansOfType(GenericTypeResolver.resolveTypeArgument(getClass(), ApplicationRunnerExecutor.class));
         ApplicationRunnerOrderResolver.SortedRunners<T> runners = orderResolver.sortByRunnerOrderAnnotation(customRunners.values());
         runners.sortUnresolvedRunners();
+        runners.resolveAllRunners();
         return runners;
     }
 

diff --git a/src/main/java/com/netgrif/application/engine/startup/ApplicationRunnerOrderResolver.java b/src/main/java/com/netgrif/application/engine/startup/ApplicationRunnerOrderResolver.java
@@ -90,7 +90,21 @@ public SortedRunners(List<T> sorted, List<T> unresolved) {
          * @return {@code true} if all unresolved runners have been successfully sorted and the unresolved list is empty;
          * {@code false} otherwise.
          */
-        public boolean sortUnresolvedRunners() {
+
+        public boolean resolveAllRunners() {
+            sortUnresolvedRunners();
+            replaced.values().forEach(this::removeRunner);
+            return unresolved.isEmpty();
+        }
+
+        protected void removeRunner(Class<?> runnerClass) {
+            int classIndex = indexOfClass(sorted, runnerClass);
+            if (classIndex == -1) return;
+            T runner = sorted.remove(classIndex);
+            if (runner != null) removeRunner(runnerClass);
+        }
+
+        protected boolean sortUnresolvedRunners() {
             boolean changed = false;
             changed = changed || resolveSortingAnnotation(BeforeRunner.class, this::insertBeforeRunner);
             changed = changed || resolveSortingAnnotation(AfterRunner.class, this::insertAfterRunner);

diff --git a/src/main/java/com/netgrif/application/engine/startup/runner/RuleEngineRunner.java b/src/main/java/com/netgrif/application/engine/startup/runner/RuleEngineRunner.java
@@ -73,4 +73,4 @@
 //        log.info("Generated template into file ");
 //    }
 //
-//}
+//}
diff --git a/src/test/groovy/com/netgrif/application/engine/petrinet/domain/dataset/FileFieldTest.groovy b/src/test/groovy/com/netgrif/application/engine/petrinet/domain/dataset/FileFieldTest.groovy
@@ -82,7 +82,7 @@ class FileFieldTest {
     private IPetriNetService petriNetService
 
     @Autowired
-    private SuperCreatorRunner superCreator;
+    private SuperCreatorRunner superCreator
 
     private MockMvc mockMvc
 

diff --git a/.../java/com/netgrif/application/engine/rules/service/RuleEvaluationScheduleServiceTest.java b/.../java/com/netgrif/application/engine/rules/service/RuleEvaluationScheduleServiceTest.java
@@ -98,4 +98,4 @@
 //        testHelper.truncateDbs();
 //    }
 //
-//}
+//}