Dmf batch support changes. (#1273)

* Dmf batch support changes. Implement single batch message instead of multiple messages for assigment on multiple targets. Added system property to switch on/off.

Signed-off-by: Dimitar Shterev <dimitar.shterev@bosch.io>

* Dmf batch support changes. Implement single batch message instead of multiple messages for assigment on multiple targets. Added system property to switch on/off.

Signed-off-by: Dimitar Shterev <dimitar.shterev@bosch.io>

* Dmf batch support changes. Implement single batch message instead of multiple messages for assigment on multiple targets. Added system property to switch on/off.

Signed-off-by: Dimitar Shterev <dimitar.shterev@bosch.io>

* Dmf batch support changes. Implement single batch message instead of multiple messages for assigment on multiple targets. Added system property to switch on/off.

Signed-off-by: Dimitar Shterev <dimitar.shterev@bosch.io>

* Update hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageDispatcherServiceIntegrationTest.java

Co-authored-by: Bondar Bogdan <36962546+bogdan-bondar@users.noreply.github.com>

* Dmf batch support changes. Implement single batch message instead of multiple messages for assigment on multiple targets. Added system property to switch on/off.

Signed-off-by: Dimitar Shterev <dimitar.shterev@bosch.io>

* Dmf batch support changes. Implement single batch message instead of multiple messages for assigment on multiple targets. Added system property to switch on/off.

Signed-off-by: Dimitar Shterev <dimitar.shterev@bosch.io>

* Dmf batch support changes. Implement code review comments.

Signed-off-by: Dimitar Shterev <dimitar.shterev@bosch.io>

Signed-off-by: Dimitar Shterev <dimitar.shterev@bosch.io>
Co-authored-by: Bondar Bogdan <36962546+bogdan-bondar@users.noreply.github.com>

hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationProperties.java

@@ -147,6 +147,11 @@ public class TenantConfigurationProperties {
          */
         public static final String MULTI_ASSIGNMENTS_ENABLED = "multi.assignments.enabled";
 
+        /**
+         * Switch to enable/disable the batch-assignment feature.
+         */
+        public static final String BATCH_ASSIGNMENTS_ENABLED = "batch.assignments.enabled";
+
         private String keyName;
         private String defaultValue = "";
         private Class<?> dataType = String.class;

hawkbit-repository/hawkbit-repository-core/src/main/resources/hawkbit-repository-defaults.properties

@@ -96,5 +96,10 @@ hawkbit.server.tenant.configuration.multi-assignments-enabled.defaultValue=false
 hawkbit.server.tenant.configuration.multi-assignments-enabled.dataType=java.lang.Boolean
 hawkbit.server.tenant.configuration.multi-assignments-enabled.validator=org.eclipse.hawkbit.tenancy.configuration.validator.TenantConfigurationBooleanValidator
 
+hawkbit.server.tenant.configuration.batch-assignments-enabled.keyName=batch.assignments.enabled
+hawkbit.server.tenant.configuration.batch-assignments-enabled.defaultValue=false
+hawkbit.server.tenant.configuration.batch-assignments-enabled.dataType=java.lang.Boolean
+hawkbit.server.tenant.configuration.batch-assignments-enabled.validator=org.eclipse.hawkbit.tenancy.configuration.validator.TenantConfigurationBooleanValidator
+
 
 # Default tenant configuration - END

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTenantConfigurationManagement.java

@@ -8,6 +8,7 @@
  */
 package org.eclipse.hawkbit.repository.jpa;
 
+import static org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationProperties.TenantConfigurationKey.BATCH_ASSIGNMENTS_ENABLED;
 import static org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationProperties.TenantConfigurationKey.MULTI_ASSIGNMENTS_ENABLED;
 import static org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationProperties.TenantConfigurationKey.REPOSITORY_ACTIONS_AUTOCLOSE_ENABLED;
 
@@ -177,9 +178,9 @@ public class JpaTenantConfigurationManagement implements TenantConfigurationMana
      * Asserts that the requested configuration value change is allowed. Throws
      * a {@link TenantConfigurationValueChangeNotAllowedException} otherwise.
      * 
-     * @param configurationKeyName
+     * @param key
      *            The configuration key.
-     * @param tenantConfiguration
+     * @param valueChange
      *            The configuration to be validated.
      * 
      * @throws TenantConfigurationValueChangeNotAllowedException
@@ -188,6 +189,7 @@ public class JpaTenantConfigurationManagement implements TenantConfigurationMana
     private void assertValueChangeIsAllowed(final String key, final JpaTenantConfiguration valueChange) {
         assertMultiAssignmentsValueChange(key, valueChange);
         assertAutoCloseValueChange(key, valueChange);
+        assertBatchAssignmentValueChange(key, valueChange);
     }
 
     @SuppressWarnings("squid:S1172")
@@ -201,11 +203,30 @@ public class JpaTenantConfigurationManagement implements TenantConfigurationMana
         }
     }
 
-    private static void assertMultiAssignmentsValueChange(final String key, final JpaTenantConfiguration valueChange) {
+    private void assertMultiAssignmentsValueChange(final String key, final JpaTenantConfiguration valueChange) {
         if (MULTI_ASSIGNMENTS_ENABLED.equals(key) && !Boolean.parseBoolean(valueChange.getValue())) {
             LOG.debug("The Multi-Assignments '{}' feature cannot be disabled.", key);
             throw new TenantConfigurationValueChangeNotAllowedException();
         }
+        if (MULTI_ASSIGNMENTS_ENABLED.equals(key) && Boolean.parseBoolean(valueChange.getValue())) {
+            JpaTenantConfiguration batchConfig = tenantConfigurationRepository.findByKey(BATCH_ASSIGNMENTS_ENABLED);
+            if (batchConfig!=null && Boolean.parseBoolean(batchConfig.getValue())) {
+                LOG.debug("The Multi-Assignments '{}' feature cannot be enabled as it contradicts with " +
+                        "The Batch-Assignments feature, which is already enabled .", key);
+                throw new TenantConfigurationValueChangeNotAllowedException();
+            }
+        }
+    }
+
+    private void assertBatchAssignmentValueChange(final String key, final JpaTenantConfiguration valueChange) {
+        if (BATCH_ASSIGNMENTS_ENABLED.equals(key) && Boolean.parseBoolean(valueChange.getValue())) {
+            JpaTenantConfiguration multiConfig = tenantConfigurationRepository.findByKey(MULTI_ASSIGNMENTS_ENABLED);
+            if (multiConfig != null && Boolean.parseBoolean(multiConfig.getValue())) {
+                LOG.debug("The Batch-Assignments '{}' feature cannot be enabled as it contradicts with " +
+                        "The Multi-Assignments feature, which is already enabled .", key);
+                throw new TenantConfigurationValueChangeNotAllowedException();
+            }
+        }
     }
 
     @Override

hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/AbstractIntegrationTest.java

@@ -465,4 +465,12 @@ public abstract class AbstractIntegrationTest {
     protected static Comparator<Target> controllerIdComparator() {
         return (o1, o2) -> o1.getControllerId().equals(o2.getControllerId()) ? 0 : 1;
     }
+
+    protected void enableBatchAssignments() {
+        tenantConfigurationManagement.addOrUpdateConfiguration(TenantConfigurationKey.BATCH_ASSIGNMENTS_ENABLED, true);
+    }
+
+    protected void disableBatchAssignments() {
+        tenantConfigurationManagement.addOrUpdateConfiguration(TenantConfigurationKey.BATCH_ASSIGNMENTS_ENABLED, false);
+    }
 }