Avoid NPE at using MutableProjectConfig

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
eclipse-che · Aug 3, 2017 · 5661a37 · 5661a37
1 parent 2611194
commit 5661a37
Showing 1 changed file with 16 additions and 40 deletions.
diff --git a/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/MutableProjectConfig.java b/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/MutableProjectConfig.java
@@ -20,6 +20,7 @@
 import java.util.List;
 import java.util.Map;
 
+import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.collect.Lists.newArrayList;
 import static com.google.common.collect.Maps.newHashMap;
 
@@ -55,7 +56,7 @@ public MutableProjectConfig() {
 
     @Override
     public String getName() {
-        return name;
+        return firstNonNull(name, "");
     }
 
     public void setName(String name) {
@@ -64,7 +65,7 @@ public void setName(String name) {
 
     @Override
     public String getPath() {
-        return path;
+        return firstNonNull(path, "");
     }
 
     public void setPath(String path) {
@@ -73,7 +74,7 @@ public void setPath(String path) {
 
     @Override
     public String getDescription() {
-        return description;
+        return firstNonNull(description, "");
     }
 
     public void setDescription(String description) {
@@ -82,7 +83,7 @@ public void setDescription(String description) {
 
     @Override
     public String getType() {
-        return type;
+        return firstNonNull(type, "");
     }
 
     public void setType(String type) {
@@ -91,11 +92,7 @@ public void setType(String type) {
 
     @Override
     public List<String> getMixins() {
-        if (mixins == null) {
-            mixins = newArrayList();
-        }
-
-        return mixins;
+        return firstNonNull(mixins, newArrayList());
     }
 
     public void setMixins(List<String> mixins) {
@@ -104,11 +101,7 @@ public void setMixins(List<String> mixins) {
 
     @Override
     public Map<String, List<String>> getAttributes() {
-        if (attributes == null) {
-            attributes = newHashMap();
-        }
-
-        return attributes;
+        return firstNonNull(attributes, newHashMap());
     }
 
     public void setAttributes(Map<String, List<String>> attributes) {
@@ -117,35 +110,25 @@ public void setAttributes(Map<String, List<String>> attributes) {
 
     @Override
     public MutableSourceStorage getSource() {
-        if (sourceStorage == null) {
-            sourceStorage = new MutableSourceStorage();
-        }
-
-        return sourceStorage;
+        return firstNonNull(sourceStorage, new MutableSourceStorage());
     }
 
     public void setSource(SourceStorage sourceStorage) {
         this.sourceStorage = new MutableSourceStorage(sourceStorage);
     }
 
     public Map<String, String> getOptions() {
-        if (options == null) {
-            options = newHashMap();
-        }
-        return options;
+        return firstNonNull(options, newHashMap());
     }
 
     public void setOptions(Map<String, String> options) {
         this.options = options;
     }
-    
+
     public List<CommandDto> getCommands() {
-        if (commands == null) {
-            commands = newArrayList();
-        }
-        return commands;
+        return firstNonNull(commands, newArrayList());
     }
-    
+
     public void setCommands(List<CommandDto> commands) {
         this.commands = commands;
     }
@@ -156,10 +139,7 @@ public void setCommands(List<CommandDto> commands) {
      * @return the list of {@link NewProjectConfig} to creating projects
      */
     public List<NewProjectConfig> getProjects() {
-        if (projects == null) {
-            return newArrayList();
-        }
-        return projects;
+        return firstNonNull(projects, newArrayList());
     }
 
     /**
@@ -188,7 +168,7 @@ public MutableSourceStorage() {
 
         @Override
         public String getType() {
-            return type;
+            return firstNonNull(type, "");
         }
 
         public void setType(String type) {
@@ -197,7 +177,7 @@ public void setType(String type) {
 
         @Override
         public String getLocation() {
-            return location;
+            return firstNonNull(location, "");
         }
 
         public void setLocation(String location) {
@@ -206,11 +186,7 @@ public void setLocation(String location) {
 
         @Override
         public Map<String, String> getParameters() {
-            if (parameters == null) {
-                parameters = newHashMap();
-            }
-
-            return parameters;
+            return firstNonNull(parameters, newHashMap());
         }
 
         public void setParameters(Map<String, String> parameters) {