Completed migration to ConfigurationProperties annotation. Added boot metadata generation to build.

hawkbit-repository/src/main/java/org/eclipse/hawkbit/RolloutProperties.java

@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * Rollout Management properties.
+ *
+ */
+@Component
+@ConfigurationProperties("hawkbit.rollout")
+public class RolloutProperties {
+    private final Scheduler scheduler = new Scheduler();
+
+    public Scheduler getScheduler() {
+        return scheduler;
+    }
+
+    /**
+     * Rollout scheduler configuration.
+     */
+    public static class Scheduler {
+        // used by @Scheduled annotation which needs constant
+        public static final String PROP_SCHEDULER_DELAY_PLACEHOLDER = "${hawkbit.rollout.scheduler.fixedDelay:30000}";
+
+        /**
+         * Schedule where the rollout scheduler looks necessary state changes in
+         * milliseconds.
+         */
+        private long fixedDelay = 30000L;
+
+        public long getFixedDelay() {
+            return fixedDelay;
+        }
+
+        public void setFixedDelay(final long fixedDelay) {
+            this.fixedDelay = fixedDelay;
+        }
+
+    }
+
+}

hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/ControllerManagement.java

@@ -33,7 +33,7 @@ import org.eclipse.hawkbit.repository.model.Target;
 import org.eclipse.hawkbit.repository.model.TargetInfo;
 import org.eclipse.hawkbit.repository.model.TargetUpdateStatus;
 import org.eclipse.hawkbit.repository.model.Target_;
-import org.eclipse.hawkbit.security.SecurityProperties;
+import org.eclipse.hawkbit.security.HawkbitSecurityProperties;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -84,7 +84,7 @@ public class ControllerManagement {
     private ActionStatusRepository actionStatusRepository;
 
     @Autowired
-    private SecurityProperties securityProperties;
+    private HawkbitSecurityProperties securityProperties;
 
     /**
      * Refreshes the time of the last time the controller has been connected to

hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutScheduler.java

@@ -10,14 +10,13 @@ package org.eclipse.hawkbit.repository;
 
 import java.util.List;
 
+import org.eclipse.hawkbit.RolloutProperties;
 import org.eclipse.hawkbit.security.SystemSecurityContext;
 import org.eclipse.hawkbit.tenancy.TenantAware;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.EnvironmentAware;
 import org.springframework.context.annotation.Profile;
-import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -31,15 +30,10 @@ import org.springframework.stereotype.Component;
 // don't active the rollout scheduler in test, otherwise it is hard to test
 // rolloutmanagement and leads weird side-effects maybe.
 @Profile("!test")
-public class RolloutScheduler implements EnvironmentAware {
+public class RolloutScheduler {
 
     private static final Logger logger = LoggerFactory.getLogger(RolloutScheduler.class);
 
-    private static final String PROP_SCHEDULER_DELAY = "hawkbit.rollout.scheduler.fixedDelay";
-    private static final long DEFAULT_SCHEDULER_DELAY = 30000L;
-    private static final String PROP_SCHEDULER_DELAY_PLACEHOLDER = "${" + PROP_SCHEDULER_DELAY + ":"
-            + DEFAULT_SCHEDULER_DELAY + "}";
-
     @Autowired
     private TenantAware tenantAware;
 
@@ -52,7 +46,8 @@ public class RolloutScheduler implements EnvironmentAware {
     @Autowired
     private SystemSecurityContext systemSecurityContext;
 
-    private long fixedDelay = DEFAULT_SCHEDULER_DELAY;
+    @Autowired
+    private RolloutProperties rolloutProperties;
 
     /**
      * Scheduler method called by the spring-async mechanism. Retrieves all
@@ -60,7 +55,7 @@ public class RolloutScheduler implements EnvironmentAware {
      * tenant the {@link RolloutManagement#checkRunningRollouts(long)} in the
      * {@link SystemSecurityContext}.
      */
-    @Scheduled(initialDelayString = PROP_SCHEDULER_DELAY_PLACEHOLDER, fixedDelayString = PROP_SCHEDULER_DELAY_PLACEHOLDER)
+    @Scheduled(initialDelayString = RolloutProperties.Scheduler.PROP_SCHEDULER_DELAY_PLACEHOLDER, fixedDelayString = RolloutProperties.Scheduler.PROP_SCHEDULER_DELAY_PLACEHOLDER)
     public void rolloutScheduler() {
         logger.debug("rollout schedule checker has been triggered.");
         // run this code in system code privileged to have the necessary
@@ -76,16 +71,11 @@ public class RolloutScheduler implements EnvironmentAware {
             logger.info("Checking rollouts for {} tenants", tenants.size());
             for (final String tenant : tenants) {
                 tenantAware.runAsTenant(tenant, () -> {
-                    rolloutManagement.checkRunningRollouts(fixedDelay);
+                    rolloutManagement.checkRunningRollouts(rolloutProperties.getScheduler().getFixedDelay());
                     return null;
                 });
             }
             return null;
         });
     }
-
-    @Override
-    public void setEnvironment(final Environment environment) {
-        fixedDelay = environment.getProperty(PROP_SCHEDULER_DELAY, Long.class, DEFAULT_SCHEDULER_DELAY);
-    }
 }

hawkbit-repository/src/test/java/org/eclipse/hawkbit/TestConfiguration.java

@@ -18,12 +18,10 @@ import org.eclipse.hawkbit.repository.model.helper.EventBusHolder;
 import org.eclipse.hawkbit.repository.utils.RepositoryDataGenerator;
 import org.eclipse.hawkbit.repository.utils.RepositoryDataGenerator.DatabaseCleanupUtil;
 import org.eclipse.hawkbit.security.SecurityContextTenantAware;
-import org.eclipse.hawkbit.security.DdiSecurityProperties;
 import org.eclipse.hawkbit.security.SpringSecurityAuditorAware;
 import org.eclipse.hawkbit.tenancy.TenantAware;
 import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
 import org.springframework.aop.interceptor.SimpleAsyncUncaughtExceptionHandler;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cache.Cache;
 import org.springframework.cache.guava.GuavaCacheManager;
 import org.springframework.context.annotation.AdviceMode;
@@ -47,7 +45,8 @@ import com.mongodb.MongoClientOptions;
  */
 @Configuration
 @EnableGlobalMethodSecurity(prePostEnabled = true, mode = AdviceMode.ASPECTJ, proxyTargetClass = true, securedEnabled = true)
-@EnableConfigurationProperties({ DdiSecurityProperties.class, ControllerPollProperties.class })
+// @EnableConfigurationProperties({ DdiSecurityProperties.class,
+// ControllerPollProperties.class })
 @Profile("test")
 public class TestConfiguration implements AsyncConfigurer {
 

hawkbit-repository/src/test/resources/application-test.properties

@@ -10,7 +10,7 @@
 spring.data.mongodb.uri=mongodb://localhost/spArtifactRepository${random.value}
 spring.data.mongodb.port=28017
 
-hawkbit.server.controller.security.authentication.header.enabled=true
+hawkbit.server.ddi.security.authentication.header.enabled=true
 
 hawkbit.server.artifact.repo.upload.maxFileSize=5MB
 
@@ -29,11 +29,6 @@ flyway.initOnMigrate=true
 flyway.sqlMigrationSuffix=${spring.jpa.database}.sql
 #spring.jpa.show-sql=true
 
-# SP Controller configuration
+# DDI configuration
 hawkbit.controller.pollingTime=00:01:00
-hawkbit.controller.pollingOverdueTime=00:01:00
-
-## Configuration for RabbitMQ integration
-hawkbit.dmf.rabbitmq.deadLetterQueue=dmf_connector_deadletter
-hawkbit.dmf.rabbitmq.deadLetterExchange=dmf.connector.deadletter
-hawkbit.dmf.rabbitmq.receiverQueue=dmf_receiver
+hawkbit.controller.pollingOverdueTime=00:01:00