Fix boolean expression

Author: Alexander Ben Nasrallah

pom.xml

@@ -15,7 +15,7 @@
   <groupId>org.verinice</groupId>
   <artifactId>verinice-rest-service</artifactId>
   <packaging>pom</packaging>
-  <version>0.2-beta4</version>
+  <version>0.2-beta5</version>
 
   <organization>
     <name>SerNet Service Network GmbH</name>

verinice-interface/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.verinice</groupId>
     <artifactId>verinice-rest-service</artifactId>
-    <version>0.2-beta4</version>
+    <version>0.2-beta5</version>
   </parent>
 
   <artifactId>verinice-interface</artifactId>

verinice-persistence/pom.xml

@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.verinice</groupId>
     <artifactId>verinice-rest-service</artifactId>
-    <version>0.2-beta4</version>
+    <version>0.2-beta5</version>
   </parent>
 
   <artifactId>verinice-persistence</artifactId>

verinice-persistence/src/main/java/org/verinice/persistence/entities/ElementConverter.java

@@ -25,6 +25,7 @@
 import org.verinice.model.Velement;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * This class provides methods to convert an instance of one class to an 
@@ -112,14 +113,16 @@ private static Map<String, List<String>> convertPropertyLists(CnaTreeElement dbE
         Map<String, List<String>> propertyMap = new HashMap<>();
         dbEntity.getEntity().getPropertyLists().forEach((listIdx, propertyList) -> {
             Set<Property> properties = propertyList.getProperties();
-            if (properties != null || !properties.isEmpty()) {
-                    List<String> values = new ArrayList<>();
-                    String type = properties.iterator().next().getPropertytype();
-                    properties.forEach(property -> values.add(property.getPropertyvalue()));
-                    propertyMap.put(type, values);
-
+            if (properties != null && !properties.isEmpty()) {
+                // We assume all properties have the save type. So the type of the list is
+                // is the type of the first element.
+                String type = properties.iterator().next().getPropertytype();
+                List<String> values = properties.stream().map(Property::getPropertyvalue)
+                        .collect(Collectors.toList());
+                propertyMap.put(type, values);
             } else {
-                LOG.error("properties are null or empty for propertyList : " + propertyList.getUuid());
+                LOG.error("properties are null or empty for propertyList : " + propertyList
+                        .getUuid());
             }
         });
         return propertyMap;

verinice-rest/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.verinice</groupId>
     <artifactId>verinice-rest-service</artifactId>
-    <version>0.2-beta4</version>
+    <version>0.2-beta5</version>
   </parent>
 
 

verinice-service/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.verinice</groupId>
     <artifactId>verinice-rest-service</artifactId>
-    <version>0.2-beta4</version>
+    <version>0.2-beta5</version>
   </parent>
 
   <artifactId>verinice-service</artifactId>