add qualifier for navbar items and fix component scan in edison job tests

Co-authored-by: Frank Bregulla <[email protected]>
Co-authored-by: Matthias Geißendörfer <[email protected]>

Author: mgeissen

edison-core/src/main/java/de/otto/edison/navigation/configuration/NavBarConfiguration.java

@@ -36,12 +36,15 @@
 @EnableConfigurationProperties(EdisonApplicationProperties.class)
 public class NavBarConfiguration {
 
-    @Bean
+    public static final String MAIN_NAV_BAR = "mainNavBar";
+    public static final String RIGHT_NAV_BAR = "rightNavBar";
+
+    @Bean(name = MAIN_NAV_BAR)
     public NavBar mainNavBar() {
         return emptyNavBar();
     }
 
-    @Bean
+    @Bean(name = RIGHT_NAV_BAR)
     public NavBar rightNavBar(final EdisonApplicationProperties properties) {
         final String href = properties.getManagement().getBasePath() + "/status";
         return navBar(asList(

edison-jobs/src/main/java/de/otto/edison/jobs/controller/JobDefinitionsController.java

@@ -6,8 +6,10 @@
 import de.otto.edison.jobs.service.JobDefinitionService;
 import de.otto.edison.jobs.service.JobMetaService;
 import de.otto.edison.navigation.NavBar;
+import de.otto.edison.navigation.configuration.NavBarConfiguration;
 import de.otto.edison.status.domain.Link;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Controller;
@@ -18,6 +20,7 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+
 import java.io.IOException;
 import java.time.Duration;
 import java.util.*;
@@ -46,7 +49,7 @@ public class JobDefinitionsController {
     @Autowired
     public JobDefinitionsController(final JobDefinitionService definitionService,
                                     final JobMetaService jobMetaService,
-                                    final NavBar rightNavBar,
+                                    @Qualifier(NavBarConfiguration.RIGHT_NAV_BAR) final NavBar rightNavBar,
                                     final EdisonApplicationProperties applicationProperties) {
         this.jobDefinitionService = definitionService;
         this.jobMetaService = jobMetaService;
@@ -147,7 +150,7 @@ private String frequencyOf(final JobDefinition def) {
     private String fixedDelayFrequency(Optional<Duration> duration) {
         if (duration.isPresent()) {
             if (duration.get().toMinutes() < 1) {
-                return "Every " + duration.get().toMillis()/1000 + " Seconds";
+                return "Every " + duration.get().toMillis() / 1000 + " Seconds";
             } else {
                 return "Every " + duration.get().toMinutes() + " Minutes";
             }

edison-jobs/src/test/java/de/otto/edison/jobs/TestServer.java

@@ -11,7 +11,8 @@
 @Configuration
 @ComponentScan(basePackages = {"de.otto.edison"}, excludeFilters = {
         @ComponentScan.Filter(type = FilterType.REGEX, pattern = "de.otto.edison.mongo.*"),
-        @ComponentScan.Filter(type = FilterType.REGEX, pattern = "de.otto.edison.status.*Controller")
+        @ComponentScan.Filter(type = FilterType.REGEX, pattern = "de.otto.edison.status.*Controller"),
+        @ComponentScan.Filter(type = FilterType.REGEX, pattern = "de.otto.edison.testsupport.TestServer")
 })
 @SpringBootApplication
 public class TestServer {