fix tabs/spaces issue, remove currently unused proxy settings userNam…

…e and password
Netflix · Sep 18, 2012 · 3b448c7 · 3b448c7
1 parent ad7a0c3
commit 3b448c7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 27 deletions.
diff --git a/grails-app/services/com/netflix/asgard/AwsClientService.groovy b/grails-app/services/com/netflix/asgard/AwsClientService.groovy
@@ -44,8 +44,8 @@ class AwsClientService implements InitializingBean {
     static transactional = false
 
     def grailsApplication
-    def secretService                  
-	def configService
+    def secretService
+    def configService
 
     /**
      * Interface names mapped to ClientTypes wrapper objects. For each interface name, a real and fake concrete class
@@ -68,14 +68,14 @@ class AwsClientService implements InitializingBean {
                 AmazonSNS: concrete(AmazonSNSClient, MockAmazonSnsClient),
                 AmazonSQS: concrete(AmazonSQSClient, MockAmazonSqsClient)
         ]
-		clientConfiguration = new ClientConfiguration()
-		clientConfiguration.proxyHost = configService.proxyHost
-		clientConfiguration.proxyPort = configService.proxyPort
+        clientConfiguration = new ClientConfiguration()
+        clientConfiguration.proxyHost = configService.proxyHost
+        clientConfiguration.proxyPort = configService.proxyPort
     }
 
     public <T> T create(Class<T> interfaceType) {
         Class implementationType = interfaceSimpleNamesToAwsClientClasses[interfaceType.simpleName]
-		implementationType.newInstance(secretService.awsCredentials, clientConfiguration) as T
+        implementationType.newInstance(secretService.awsCredentials, clientConfiguration) as T
     }
 
     Class concrete(Class real, Class fake) {

diff --git a/grails-app/services/com/netflix/asgard/ConfigService.groovy b/grails-app/services/com/netflix/asgard/ConfigService.groovy
@@ -252,25 +252,16 @@ class ConfigService {
      */
     int getHttpConnPoolMaxForRoute() {
         grailsApplication.config.httpConnPool?.maxSize ?: 5
-    }                 
+    }
 
     /** HTTP proxy settings */
+    String getProxyHost() {
+        grailsApplication.config.proxy?.host ?: null
+    }
 
-	String getProxyHost() {
-		grailsApplication.config.proxy?.host ?: null
-	}     
-
-	int getProxyPort() {
-		grailsApplication.config.proxy?.port ?: -1
-	}   
-
-	String getProxyUserName() {
-		grailsApplication.config.proxy?.userName ?: null
-	}
-
-	String getProxyPassword() {
-		grailsApplication.config.proxy?.password ?: null
-	}
+    int getProxyPort() {
+        grailsApplication.config.proxy?.port ?: -1
+    }
 
     /**
      * @return Default Security Groups.

diff --git a/grails-app/services/com/netflix/asgard/RestClientService.groovy b/grails-app/services/com/netflix/asgard/RestClientService.groovy
@@ -51,11 +51,11 @@ class RestClientService implements InitializingBean {
     final ThreadSafeClientConnManager connectionManager = new ThreadSafeClientConnManager()
     final HttpClient httpClient = new DefaultHttpClient(connectionManager)
 
-    public void afterPropertiesSet() throws Exception {                           
-	    if (configService.proxyHost) {
-			final HttpHost proxy = new HttpHost(configService.proxyHost, configService.proxyPort, "http")  
-		    httpClient.params.setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy)
-	    }
+    public void afterPropertiesSet() throws Exception {
+        if (configService.proxyHost) {
+            final HttpHost proxy = new HttpHost(configService.proxyHost, configService.proxyPort, "http")
+            httpClient.params.setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy)
+        }
         // Switch to ClientPNames.CONN_MANAGER_TIMEOUT when upgrading http-client 4.2
         httpClient.params.setLongParameter(ConnManagerPNames.TIMEOUT, configService.httpConnPoolTimeout)
         connectionManager.maxTotal = configService.httpConnPoolMaxSize