From ca17f4543a13217c9f3ad6fe4e3c6de4ee8b0111 Mon Sep 17 00:00:00 2001
From: Kai Zimmermann <kai.zimmermann@bosch-si.com>
Date: Wed, 30 Mar 2016 09:29:09 +0200
Subject: [PATCH] Fixed wring metadata change in RSQL test

---
 .../repository/DistributionSetManagement.java      |  2 +-
 .../hawkbit/repository/model/DistributionSet.java  | 10 +---------
 .../hawkbit/repository/model/SoftwareModule.java   |  2 +-
 .../rsql/RSQLDistributionSetFieldTest.java         | 14 +++++++-------
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java
index 410021664..8bee7c703 100644
--- a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java
+++ b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java
@@ -762,7 +762,7 @@ public class DistributionSetManagement {
         if (distributionSetMetadataRepository.exists(metadata.getId())) {
             throwMetadataKeyAlreadyExists(metadata.getId().getKey());
         }
-        // merge base software module so optLockRevision gets updated and audit
+        // merge base distribution set so optLockRevision gets updated and audit
         // log written because
         // modifying metadata is modifying the base distribution set itself for
         // auditing purposes.
diff --git a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSet.java b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSet.java
index 4f2d6196c..76b1ab507 100644
--- a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSet.java
+++ b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSet.java
@@ -140,7 +140,7 @@ public class DistributionSet extends NamedVersionedEntity {
     }
 
     public List<DistributionSetMetadata> getMetadata() {
-        return metadata;
+        return Collections.unmodifiableList(metadata);
     }
 
     public List<Action> getActions() {
@@ -171,10 +171,6 @@ public class DistributionSet extends NamedVersionedEntity {
         return requiredMigrationStep;
     }
 
-    /**
-     * @param deleted
-     *            the deleted to set
-     */
     public DistributionSet setDeleted(final boolean deleted) {
         this.deleted = deleted;
         return this;
@@ -185,10 +181,6 @@ public class DistributionSet extends NamedVersionedEntity {
         return this;
     }
 
-    /**
-     * @param tags
-     *            the tags to set
-     */
     public DistributionSet setTags(final Set<DistributionSetTag> tags) {
         this.tags = tags;
         return this;
diff --git a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/SoftwareModule.java b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/SoftwareModule.java
index d53bd3fd5..d4ac6d629 100644
--- a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/SoftwareModule.java
+++ b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/SoftwareModule.java
@@ -221,7 +221,7 @@ public class SoftwareModule extends NamedVersionedEntity {
     }
 
     public List<SoftwareModuleMetadata> getMetadata() {
-        return metadata;
+        return Collections.unmodifiableList(metadata);
     }
 
     @Override
diff --git a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/rsql/RSQLDistributionSetFieldTest.java b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/rsql/RSQLDistributionSetFieldTest.java
index ea1db0ed8..6b1682820 100644
--- a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/rsql/RSQLDistributionSetFieldTest.java
+++ b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/rsql/RSQLDistributionSetFieldTest.java
@@ -35,18 +35,18 @@ public class RSQLDistributionSetFieldTest extends AbstractIntegrationTest {
     @Before
     public void seuptBeforeTest() {
 
-        final DistributionSet ds = TestDataUtil.generateDistributionSet("DS", softwareManagement,
-                distributionSetManagement);
+        DistributionSet ds = TestDataUtil.generateDistributionSet("DS", softwareManagement, distributionSetManagement);
         ds.setDescription("DS");
-        ds.getMetadata().add(new DistributionSetMetadata("metaKey", ds, "metaValue"));
-        distributionSetManagement.updateDistributionSet(ds);
+        ds = distributionSetManagement.updateDistributionSet(ds);
+        distributionSetManagement
+                .createDistributionSetMetadata(new DistributionSetMetadata("metaKey", ds, "metaValue"));
 
-        final DistributionSet ds2 = TestDataUtil
+        DistributionSet ds2 = TestDataUtil
                 .generateDistributionSets("NewDS", 3, softwareManagement, distributionSetManagement).get(0);
 
         ds2.setDescription("DS%");
-        ds2.getMetadata().add(new DistributionSetMetadata("metaKey", ds2, "value"));
-        distributionSetManagement.updateDistributionSet(ds2);
+        ds2 = distributionSetManagement.updateDistributionSet(ds2);
+        distributionSetManagement.createDistributionSetMetadata(new DistributionSetMetadata("metaKey", ds2, "value"));
 
         final DistributionSetTag targetTag = tagManagement.createDistributionSetTag(new DistributionSetTag("Tag1"));
         tagManagement.createDistributionSetTag(new DistributionSetTag("Tag2"));