Merge pull request #248 from eduardoraupp/master

Enum AwsPropertyKeys inserted instead of Constants
Netflix · May 21, 2014 · 424eb2f · 424eb2f
2 parents 9f3a246 + c11a512
commit 424eb2f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -63,3 +63,4 @@ atlassian-ide-plugin.xml
 
 # NetBeans specific files/directories
 .nbattrs
+/bin
diff --git a/servo-aws/src/main/java/com/netflix/servo/aws/AwsPropertyKeys.java b/servo-aws/src/main/java/com/netflix/servo/aws/AwsPropertyKeys.java
@@ -16,11 +16,25 @@
 package com.netflix.servo.aws;
 
 /**
- * Constant key values for setting aws related properties.
+ * Enum key values for setting aws related properties.
  */
-public class AwsPropertyKeys {
+public enum AwsPropertyKeys {
+
+	AWS_CREDENTIALS_FILE("com.netflix.servo.aws.credentialsFile"), 
+	AWS_AUTO_SCALING_END_POINT("com.netflix.servo.aws.endpoint.autoscaling"), 
+	AWS_CLOUD_WATCH_END_POINT("com.netflix.servo.aws.endpoint.cloudwatch");
 
-    public static final String awsCredentialsFile = "com.netflix.servo.aws.credentialsFile";
-    public static final String awsAutoScalingEndpoint = "com.netflix.servo.aws.endpoint.autoscaling";
-    public static final String awsCloudWatchEndpoint = "com.netflix.servo.aws.endpoint.cloudwatch";
+	private String bundle;
+
+	/**
+	 * Constructor responsible to instantiate the type of bundle
+	 */
+	private AwsPropertyKeys(String bundle) {
+       this.bundle = bundle;
+    }
+
+	public String getBundle() {
+		return bundle;
+	}
+
 }
diff --git a/servo-aws/src/main/java/com/netflix/servo/aws/AwsServiceClients.java b/servo-aws/src/main/java/com/netflix/servo/aws/AwsServiceClients.java
@@ -32,7 +32,7 @@ public class AwsServiceClients {
    */
   public static AmazonCloudWatch cloudWatch(AWSCredentialsProvider credentials ) {
     AmazonCloudWatch client = new AmazonCloudWatchClient(credentials);
-    client.setEndpoint( System.getProperty( AwsPropertyKeys.awsCloudWatchEndpoint, "monitoring.amazonaws.com" ) );
+    client.setEndpoint( System.getProperty( AwsPropertyKeys.AWS_CLOUD_WATCH_END_POINT.getBundle(), "monitoring.amazonaws.com" ) );
     return client;
   }
 
@@ -41,7 +41,7 @@ public static AmazonCloudWatch cloudWatch(AWSCredentialsProvider credentials ) {
    */
   public static AmazonAutoScaling autoScaling(AWSCredentials credentials) {
     AmazonAutoScaling client = new AmazonAutoScalingClient(credentials);
-    client.setEndpoint( System.getProperty( AwsPropertyKeys.awsAutoScalingEndpoint, "autoscaling.amazonaws.com" ) );
+    client.setEndpoint( System.getProperty( AwsPropertyKeys.AWS_AUTO_SCALING_END_POINT.getBundle(), "autoscaling.amazonaws.com" ) );
     return client;
   }
 }
diff --git a/servo-aws/src/main/java/com/netflix/servo/tag/aws/AwsInjectableTag.java b/servo-aws/src/main/java/com/netflix/servo/tag/aws/AwsInjectableTag.java
@@ -90,7 +90,7 @@ public String tagString() {
 
     static String getAutoScaleGroup() {
         try {
-            String credFileProperty = System.getProperties().getProperty(AwsPropertyKeys.awsCredentialsFile);
+            String credFileProperty = System.getProperties().getProperty(AwsPropertyKeys.AWS_CREDENTIALS_FILE.getBundle());
             AWSCredentials credentials;
 
             if (credFileProperty != null) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -63,3 +63,4 @@ atlassian-ide-plugin.xml

		# NetBeans specific files/directories
		.nbattrs
		/bin