CLDSVCS-1481 amazon-tools-shared - SF

sez11a · Aug 11, 2015 · 6b0356f · 6b0356f
1 parent 3074745
commit 6b0356f
Showing 1 changed file with 40 additions and 39 deletions.
diff --git a/shared/amazon-tools-shared/src/com/liferay/amazontools/AMIBuilder.java b/shared/amazon-tools-shared/src/com/liferay/amazontools/AMIBuilder.java
@@ -235,48 +235,17 @@ protected void executeSessionCommand(SSHClient sshClient, String command)
 		}
 	}
 
-	protected String getKeyFileName() {
-		StringBuilder sb = new StringBuilder(6);
-
-		sb.append(System.getProperty("user.home"));
-		sb.append(File.separator);
-		sb.append(".ssh");
-		sb.append(File.separator);
-		sb.append(properties.getProperty("key.name"));
-		sb.append(".pem");
-
-		return sb.toString();
-	}
-
-	protected Map<String, String> getProvisioners(Properties properties) {
-		Map<String, String> provisioners = new TreeMap<>();
-
-		Set<String> names = properties.stringPropertyNames();
-
-		for (String name : names) {
-			if (!name.contains("provisioners")) {
-				continue;
-			}
-
-			String value = properties.getProperty(name);
-
-			provisioners.put(name, value);
-		}
-
-		return provisioners;
-	}
-
 	protected Instance getInstance(String instanceId, String state) {
 		DescribeInstancesRequest describeInstancesRequest =
 			new DescribeInstancesRequest();
 
-		List<Filter> filters = new ArrayList<>();
+		List<Filter> filters = new ArrayList<Filter>();
 
 		Filter filter = new Filter();
 
 		filter.setName("instance-state-name");
 
-		List<String> values = new ArrayList<>();
+		List<String> values = new ArrayList<String>();
 
 		values.add(state);
 
@@ -286,7 +255,7 @@ protected Instance getInstance(String instanceId, String state) {
 
 		describeInstancesRequest.setFilters(filters);
 
-		List<String> instanceIds = new ArrayList<>();
+		List<String> instanceIds = new ArrayList<String>();
 
 		instanceIds.add(instanceId);
 
@@ -309,17 +278,48 @@ protected Instance getInstance(String instanceId, String state) {
 		return instances.get(0);
 	}
 
+	protected String getKeyFileName() {
+		StringBuilder sb = new StringBuilder(6);
+
+		sb.append(System.getProperty("user.home"));
+		sb.append(File.separator);
+		sb.append(".ssh");
+		sb.append(File.separator);
+		sb.append(properties.getProperty("key.name"));
+		sb.append(".pem");
+
+		return sb.toString();
+	}
+
+	protected Map<String, String> getProvisioners(Properties properties) {
+		Map<String, String> provisioners = new TreeMap<String, String>();
+
+		Set<String> names = properties.stringPropertyNames();
+
+		for (String name : names) {
+			if (!name.contains("provisioners")) {
+				continue;
+			}
+
+			String value = properties.getProperty(name);
+
+			provisioners.put(name, value);
+		}
+
+		return provisioners;
+	}
+
 	protected boolean isImageCreated(String imageId) {
 		DescribeImagesRequest describeImagesRequest =
 			new DescribeImagesRequest();
 
-		List<Filter> filters = new ArrayList<>();
+		List<Filter> filters = new ArrayList<Filter>();
 
 		Filter filter = new Filter();
 
 		filter.setName("state");
 
-		List<String> values = new ArrayList<>();
+		List<String> values = new ArrayList<String>();
 
 		values.add("available");
 
@@ -329,7 +329,7 @@ protected boolean isImageCreated(String imageId) {
 
 		describeImagesRequest.setFilters(filters);
 
-		List<String> imageIds = new ArrayList<>();
+		List<String> imageIds = new ArrayList<String>();
 
 		imageIds.add(imageId);
 
@@ -476,7 +476,7 @@ protected void start() {
 
 		runInstancesRequest.setPlacement(placement);
 
-		List<String> securityGroupsIds = new ArrayList<>();
+		List<String> securityGroupsIds = new ArrayList<String>();
 
 		securityGroupsIds.add(properties.getProperty("security.group.id"));
 
@@ -532,7 +532,8 @@ protected void start() {
 			sleep(30);
 
 			instance = getInstance(_instanceId, "pending");
-		} while (instance != null);
+		}
+		while (instance != null);
 
 		instance = getInstance(_instanceId, "running");