Merge pull request #28 from andrerod/dev_3

Fix a few checkstyle errors
Azure · Jan 14, 2014 · e94143b · e94143b
2 parents ff3506d + 0a1b484
commit e94143b
Show file tree

Hide file tree

Showing 674 changed files with 45,944 additions and 27,864 deletions.
diff --git a/core/src/main/java/com/microsoft/windowsazure/Configuration.java b/core/src/main/java/com/microsoft/windowsazure/Configuration.java
@@ -26,94 +26,116 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-public class Configuration {
-
+public class Configuration
+{
     /**
-     * Property name for socket connection timeout used by services created with this configuration.
+     * Property name for socket connection timeout used by services created with
+     * this configuration.
      */
     public static final String PROPERTY_CONNECT_TIMEOUT = "com.microsoft.windowsazure.Configuration.connectTimeout";
 
     /**
-     * Property name for socket read timeout used by services created with this configuration.
+     * Property name for socket read timeout used by services created with this
+     * configuration.
      */
     public static final String PROPERTY_READ_TIMEOUT = "com.microsoft.windowsazure.Configuration.readTimeout";
 
     /**
-     * Property name to control if HTTP logging to console is on or off. If property is set, logging is on, regardless
-     * of value.
+     * Property name to control if HTTP logging to console is on or off. If
+     * property is set, logging is on, regardless of value.
      */
     public static final String PROPERTY_LOG_HTTP_REQUESTS = "com.microsoft.windowsazure.Configuration.logHttpRequests";
-    
+
     private static Configuration instance;
     Map<String, Object> properties;
     Builder builder;
 
     static Log log = LogFactory.getLog(Configuration.class);
 
-    public Configuration() {
+    public Configuration()
+    {
         this.properties = new HashMap<String, Object>();
         this.builder = DefaultBuilder.create();
     }
 
-    public Configuration(Builder builder) {
+    public Configuration(Builder builder)
+    {
         this.properties = new HashMap<String, Object>();
         this.builder = builder;
     }
 
-    public static Configuration getInstance() {
-        if (instance == null) {
-            try {
+    public static Configuration getInstance()
+    {
+        if (instance == null)
+        {
+            try
+            {
                 instance = Configuration.load();
-            }
-            catch (IOException e) {
-                log.error("Unable to load META-INF/com.microsoft.windowsazure.properties", e);
+            } catch (IOException e)
+            {
+                log.error(
+                        "Unable to load META-INF/com.microsoft.windowsazure.properties",
+                        e);
                 instance = new Configuration();
             }
         }
         return instance;
     }
 
-    public static void setInstance(Configuration instance) {
-        Configuration.instance = instance;
+    public static void setInstance(final Configuration configuration)
+    {
+        Configuration.instance = configuration;
     }
 
-    public static Configuration load() throws IOException {
-        Configuration config = new Configuration();
-
-        InputStream stream = Configuration.class.getClassLoader().getResourceAsStream(
-                "META-INF/com.microsoft.windowsazure.properties");
-        if (stream != null) {
-            Properties properties = new Properties();
+    public static Configuration load() throws IOException
+    {
+        final Configuration config = new Configuration();
+
+        final InputStream stream = Thread
+                .currentThread()
+                .getContextClassLoader()
+                .getResourceAsStream(
+                        "META-INF/com.microsoft.windowsazure.properties");
+        if (stream != null)
+        {
+            final Properties properties = new Properties();
             properties.load(stream);
-            for (Object key : properties.keySet()) {
-                config.setProperty(key.toString(), properties.get(key));
+            for (Map.Entry<Object, Object> key : properties.entrySet())
+            {
+                config.setProperty(key.getKey().toString(), key.getValue());
             }
         }
 
         return config;
     }
 
-    public <T> T create(Class<T> service) {
+    public <T> T create(Class<T> service)
+    {
         return builder.build("", service, service, properties);
     }
 
-    public <T> T create(String profile, Class<T> service) {
+    public <T> T create(String profile, Class<T> service)
+    {
         return builder.build(profile, service, service, properties);
     }
 
-    public Builder getBuilder() {
+    public Builder getBuilder()
+    {
         return builder;
     }
 
-    public Object getProperty(String name) {
+    public Object getProperty(String name)
+    {
         return properties.get(name);
     }
 
-    public void setProperty(String name, Object value) {
+    public void setProperty(String name, Object value)
+    {
         properties.put(name, value);
     }
 
-    public Map<String, Object> getProperties() {
+    public Map<String, Object> getProperties()
+    {
         return properties;
     }
 }
diff --git a/core/src/main/java/com/microsoft/windowsazure/ConfigurationException.java b/core/src/main/java/com/microsoft/windowsazure/ConfigurationException.java
@@ -15,22 +15,27 @@
 
 package com.microsoft.windowsazure;
 
-public class ConfigurationException extends RuntimeException {
+public class ConfigurationException extends RuntimeException
+{
 
     private static final long serialVersionUID = -5570476914992165380L;
 
-    public ConfigurationException() {
+    public ConfigurationException()
+    {
     }
 
-    public ConfigurationException(String message) {
+    public ConfigurationException(String message)
+    {
         super(message);
     }
 
-    public ConfigurationException(Throwable cause) {
+    public ConfigurationException(Throwable cause)
+    {
         super(cause);
     }
 
-    public ConfigurationException(String message, Throwable cause) {
+    public ConfigurationException(String message, Throwable cause)
+    {
         super(message, cause);
     }
 }
diff --git a/core/src/main/java/com/microsoft/windowsazure/core/Builder.java b/core/src/main/java/com/microsoft/windowsazure/core/Builder.java
@@ -16,29 +16,38 @@
 
 import java.util.Map;
 
-public interface Builder {
+public interface Builder
+{
 
-    public abstract <S, T> T build(String profile, Class<S> service, Class<T> instance, Map<String, Object> properties);
+    public abstract <S, T> T build(String profile, Class<S> service,
+            Class<T> instance, Map<String, Object> properties);
 
-    public interface Factory<T> {
-        <S> T create(String profile, Class<S> service, Builder builder, Map<String, Object> properties);
+    public interface Factory<T>
+    {
+        <S> T create(String profile, Class<S> service, Builder builder,
+                Map<String, Object> properties);
     }
 
-    public interface Alteration<T> {
-        T alter(String profile, T instance, Builder builder, Map<String, Object> properties);
+    public interface Alteration<T>
+    {
+        T alter(String profile, T instance, Builder builder,
+                Map<String, Object> properties);
     }
 
-    public interface Registry {
+    public interface Registry
+    {
         <T> Registry add(Class<T> service);
 
         <T, TImpl> Registry add(Class<T> service, Class<TImpl> implementation);
 
         <T> Registry add(Factory<T> factory);
 
-        <S, T> void alter(Class<S> service, Class<T> instance, Alteration<T> alteration);
+        <S, T> void alter(Class<S> service, Class<T> instance,
+                Alteration<T> alteration);
     }
 
-    public interface Exports {
+    public interface Exports
+    {
         void register(Registry registry);
     }
 }