Feature Reset Target Attributes (#664)

* Enhance DDI putConfigData REST entry point with update mode

Signed-off-by: stefbehl <stefan.behl@bosch-si.com>

* ControllerManagement unit tests for new target attribute update modes

Signed-off-by: stefbehl <stefan.behl@bosch-si.com>

* Added DdiRootControllerRestApi test for new update mode

Signed-off-by: stefbehl <stefan.behl@bosch-si.com>

* Enhance DMF UPDATE_ATTRIBUTES message with update mode

Signed-off-by: stefbehl <stefan.behl@bosch-si.com>

* Enhance DMF integration tests

Signed-off-by: stefbehl <stefan.behl@bosch-si.com>

* Enhance DMF integration tests

Signed-off-by: stefbehl <stefan.behl@bosch-si.com>

* Fix DMF integration tests

* Fix failing tests

Signed-off-by: stefbehl <stefan.behl@bosch-si.com>

* Fix failing tests

Signed-off-by: stefbehl <stefan.behl@bosch-si.com>

* Fix Sonar findings

Signed-off-by: stefbehl <stefan.behl@bosch-si.com>

* Javadoc improvements

Signed-off-by: stefbehl <stefan.behl@bosch-si.com>

* Fix codacy findings

Signed-off-by: Stefan Behl <stefan.behl@bosch-si.com>

* Fix PR review findings

Signed-off-by: Stefan Behl <stefan.behl@bosch-si.com>

* Fix PR review findings

Signed-off-by: Stefan Behl <stefan.behl@bosch-si.com>

* Fix PR review findings

Signed-off-by: Stefan Behl <stefan.behl@bosch-si.com>

* Fix PR review findings

Signed-off-by: Stefan Behl <stefan.behl@bosch-si.com>

* Fix PR review findings

Signed-off-by: Stefan Behl <stefan.behl@bosch-si.com>

* Fix PR review findings

Signed-off-by: Stefan Behl <stefan.behl@bosch-si.com>

* Fix PR review findings

Signed-off-by: Stefan Behl <stefan.behl@bosch-si.com>

hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiConfigData.java

@@ -23,6 +23,8 @@ public class DdiConfigData extends DdiActionFeedback {
     @NotEmpty
     private final Map<String, String> data;
 
+    private final DdiUpdateMode mode;
+
     /**
      * Constructor.
      *
@@ -38,18 +40,24 @@ public class DdiConfigData extends DdiActionFeedback {
     @JsonCreator
     public DdiConfigData(@JsonProperty(value = "id") final Long id, @JsonProperty(value = "time") final String time,
             @JsonProperty(value = "status") final DdiStatus status,
-            @JsonProperty(value = "data") final Map<String, String> data) {
+            @JsonProperty(value = "data") final Map<String, String> data,
+            @JsonProperty(value = "mode") final DdiUpdateMode mode) {
         super(id, time, status);
         this.data = data;
+        this.mode = mode;
     }
 
     public Map<String, String> getData() {
         return data;
     }
 
+    public DdiUpdateMode getMode() {
+        return mode;
+    }
+
     @Override
     public String toString() {
-        return "ConfigData [data=" + data + ", toString()=" + super.toString() + "]";
+        return "ConfigData [data=" + data + ", mode=" + mode + ", toString()=" + super.toString() + "]";
     }
 
 }

hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiUpdateMode.java

@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) 2018 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.ddi.json.model;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Enumerates the supported update modes. Each mode represents an attribute
+ * update strategy.
+ * 
+ * @see DdiConfigData
+ */
+public enum DdiUpdateMode {
+
+    /**
+     * Merge update strategy
+     */
+    MERGE("merge"),
+
+    /**
+     * Replacement update strategy
+     */
+    REPLACE("replace"),
+
+    /**
+     * Removal update strategy
+     */
+    REMOVE("remove");
+
+    private String name;
+
+    DdiUpdateMode(final String name) {
+        this.name = name;
+    }
+
+    @JsonValue
+    public String getName() {
+        return name;
+    }
+
+}