Make internalRuntime parametrized

eclipse-che · Apr 25, 2017 · 3badb2a · 3badb2a
1 parent 7d890b1
commit 3badb2a
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/...api-workspace/src/main/java/org/eclipse/che/api/workspace/server/spi/InternalRuntime.java b/...api-workspace/src/main/java/org/eclipse/che/api/workspace/server/spi/InternalRuntime.java
@@ -4,19 +4,19 @@
  * 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
- *
+ * <p>
  * Contributors:
- *   Codenvy, S.A. - initial API and implementation
+ * Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
 package org.eclipse.che.api.workspace.server.spi;
 
 import org.eclipse.che.api.core.model.workspace.Runtime;
 import org.eclipse.che.api.core.model.workspace.Warning;
 import org.eclipse.che.api.core.model.workspace.runtime.Machine;
 import org.eclipse.che.api.core.model.workspace.runtime.Server;
+import org.eclipse.che.api.workspace.server.URLRewriter;
 import org.eclipse.che.api.workspace.server.model.impl.MachineImpl;
 import org.eclipse.che.api.workspace.server.model.impl.ServerImpl;
-import org.eclipse.che.api.workspace.server.URLRewriter;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -30,18 +30,21 @@
  * Important to notice - no states in here, it is always RUNNING
  * @author gazarenkov
  */
-public abstract class InternalRuntime implements Runtime {
+public abstract class InternalRuntime <T extends RuntimeContext> implements Runtime {
 
-    private final RuntimeContext       context;
+    private final T                    context;
     private final URLRewriter          urlRewriter;
     private       Map<String, Machine> cachedExternalMachines;
     private final List<Warning> warnings = new ArrayList<>();
 
-    public InternalRuntime(RuntimeContext context, URLRewriter urlRewriter) {
+    public InternalRuntime(T context, URLRewriter urlRewriter) {
         this.context = context;
         this.urlRewriter = urlRewriter;
     }
 
+    /**
+     * @return Map name -> Machine. Implementation should not return null
+     */
     public abstract Map<String, ? extends Machine> getInternalMachines();
 
 
@@ -63,9 +66,11 @@ public List<? extends Warning> getWarnings() {
     @Override
     public Map<String, ? extends Machine> getMachines() {
 
-        if(cachedExternalMachines == null) {
+        if (cachedExternalMachines == null) {
             cachedExternalMachines = new HashMap<>();
-            for(Map.Entry<String, ? extends Machine> entry : getInternalMachines().entrySet()) {
+            // should not be null, replace with empty map in this case
+            Map<String, ? extends Machine> internalMachines = getInternalMachines() == null ? new HashMap<>() : getInternalMachines();
+            for (Map.Entry<String, ? extends Machine> entry : internalMachines.entrySet()) {
                 String key = entry.getKey();
                 Machine machine = entry.getValue();
                 Map<String, Server> newServers = rewriteExternalServers(machine.getServers());
@@ -82,7 +87,7 @@ public List<? extends Warning> getWarnings() {
     /**
      * @return some implementation specific properties if any
      */
-    public abstract Map <String, String> getProperties();
+    public abstract Map<String, String> getProperties();
 
     /**
      * @return the Context
@@ -96,9 +101,9 @@ public final RuntimeContext getContext() {
      * @param incoming servers
      * @return rewriten Map of Servers (name -> Server)
      */
-    private Map <String, Server> rewriteExternalServers(Map<String,? extends Server> incoming) {
-        Map <String, Server> outgoing = new HashMap<>();
-        for(Map.Entry<String, ? extends Server> entry : incoming.entrySet()) {
+    private Map<String, Server> rewriteExternalServers(Map<String, ? extends Server> incoming) {
+        Map<String, Server> outgoing = new HashMap<>();
+        for (Map.Entry<String, ? extends Server> entry : incoming.entrySet()) {
             String name = entry.getKey();
             String strUrl = entry.getValue().getUrl();
             try {