source formatting

Author: gondor

core/src/main/java/org/openstack4j/openstack/heat/utils/Template.java

@@ -44,7 +44,7 @@ private void getFileContents() {
         @SuppressWarnings("unchecked")
         Map<String, Object> content = (Map<String, Object>) yaml.load(getTplContent());
         try {
-            resolveTempalteGetFiles(content);
+            resolveTemplateGetFiles(content);
             resolveTemplateType(content);
         } catch (IOException e) {
             e.printStackTrace();
@@ -79,7 +79,6 @@ private void resolveTemplateType(Map<?,?> map) throws MalformedURLException, IOE
                 }
             }
 
-            
             if (value instanceof Map<?,?>){
                 resolveTemplateType((Map<?,?>)value);
             } else if (value instanceof List<?>) {
@@ -92,7 +91,7 @@ private void resolveTemplateType(Map<?,?> map) throws MalformedURLException, IOE
         }
     }
 
-    private void resolveTempalteGetFiles(Map<?,?> map) throws IOException  {
+    private void resolveTemplateGetFiles(Map<?,?> map) throws IOException  {
         for(Object key : map.keySet()){
             // Ignore if the key is not string. Actually not happening
             if(!(key instanceof String)) {
@@ -111,11 +110,11 @@ private void resolveTempalteGetFiles(Map<?,?> map) throws IOException  {
 
             Object subMap = map.get(skey);
             if (subMap instanceof Map<?,?>){
-                resolveTempalteGetFiles((Map<?,?>)subMap);
+                resolveTemplateGetFiles((Map<?,?>)subMap);
             } else if (subMap instanceof List<?>) {
                 for (Object item : (List<?>) subMap) {
                     if (item instanceof Map<?, ?>) {
-                        resolveTempalteGetFiles((Map<?, ?>) item);
+                        resolveTemplateGetFiles((Map<?, ?>) item);
                     }
                 }
             }
@@ -158,5 +157,4 @@ public Map<String, String> getFiles() {
     public void setFiles(Map<String, String> files) {
         this.files = files;
     }
-       
 }

core/src/main/java/org/openstack4j/openstack/heat/utils/TemplateUtils.java

@@ -1,12 +1,16 @@
 package org.openstack4j.openstack.heat.utils;
 
+import static org.openstack4j.core.transport.ClientConstants.URI_SEP;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 
+import org.openstack4j.core.transport.ClientConstants;
+
 import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
 
@@ -21,9 +25,9 @@ public static String readToString(URL url) throws IOException {
     }
 
     public static URL baseUrl(String url) throws MalformedURLException {
-        String baseUrl =  url.substring(0, url.lastIndexOf("/") + 1);
-        if(! baseUrl.endsWith("/")) {
-            baseUrl += "/";
+        String baseUrl =  url.substring(0, url.lastIndexOf(URI_SEP) + 1);
+        if(! baseUrl.endsWith(URI_SEP)) {
+            baseUrl += URI_SEP;
         }
         return new URL(baseUrl);
     }