rolled in review comments

Author: scmacdon

javav2/example_code/iotsitewise/src/main/java/com/example/iotsitewise/scenario/CloudFormationHelper.java

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 package com.example.iotsitewise.scenario;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
@@ -16,6 +17,7 @@
 import software.amazon.awssdk.services.cloudformation.model.Output;
 import software.amazon.awssdk.services.cloudformation.model.Stack;
 import software.amazon.awssdk.services.cloudformation.waiters.CloudFormationAsyncWaiter;
+
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
@@ -26,11 +28,13 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
+
 public class CloudFormationHelper {
     private static final String CFN_TEMPLATE = "SitewiseRoles-template.yaml";
     private static final Logger logger = LoggerFactory.getLogger(CloudFormationHelper.class);
 
     private static CloudFormationAsyncClient cloudFormationClient;
+
     private static CloudFormationAsyncClient getCloudFormationClient() {
         if (cloudFormationClient == null) {
             SdkAsyncHttpClient httpClient = NettyNioAsyncHttpClient.builder()
@@ -99,8 +103,8 @@ public static Boolean describeStack(String stackName) {
             CompletableFuture<?> future = getCloudFormationClient().describeStacks();
             DescribeStacksResponse stacksResponse = (DescribeStacksResponse) future.join();
             List<Stack> stacks = stacksResponse.stacks();
-            for (Stack myStack :stacks) {
-                if (myStack.stackName().compareTo(stackName)==0){
+            for (Stack myStack : stacks) {
+                if (myStack.stackName().compareTo(stackName) == 0) {
                     return true;
                 }
             }
@@ -109,6 +113,7 @@ public static Boolean describeStack(String stackName) {
         }
         return false;
     }
+
     public static void destroyCloudFormationStack(String stackName) {
         getCloudFormationClient().deleteStack(b -> b.stackName(stackName))
             .whenComplete((dsr, t) -> {

javav2/example_code/iotsitewise/src/test/java/SitewiseTests.java

@@ -26,6 +26,7 @@
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
+
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -34,14 +35,14 @@
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class SitewiseTests {
 
-    private static final String assetModelName = "MyAssetModel"+ UUID.randomUUID();
+    private static final String assetModelName = "MyAssetModel" + UUID.randomUUID();
     private static final String assetName = "MyAsset";
 
     private static String assetId = "";
     private static final String portalName = "MyPortal";
     private static String contactEmail = "";
-    private static final String gatewayName = "myGateway"+ UUID.randomUUID();
-    private static final String myThing = "myThing"+ UUID.randomUUID();
+    private static final String gatewayName = "myGateway" + UUID.randomUUID();
+    private static final String myThing = "myThing" + UUID.randomUUID();
 
     private static String assetModelId = "";
 
@@ -80,7 +81,6 @@ public static void setUp() {
     @Order(1)
     public void testHelloService() {
         assertDoesNotThrow(HelloSitewise::fetchAssetModels);
-        System.out.println(" Test 1 passed");
     }
 
     @Test
@@ -97,8 +97,6 @@ public void testCreateAssetModel() {
             assetModelId = response.assetModelId();
             assertNotNull(assetModelId);
         });
-
-        System.out.println("Test 2 passed");
     }
 
     @Test
@@ -112,7 +110,6 @@ public void testCreateAsset() throws InterruptedException {
             assetId = response.assetId();
             assertNotNull(assetId);
         });
-        System.out.println("Test 3 passed");
     }
 
     @Test
@@ -121,12 +118,11 @@ public void testCreateAsset() throws InterruptedException {
     public void testGetPropIds() {
         assertDoesNotThrow(() -> {
             propertyIds = sitewiseActions.getPropertyIds(assetModelId).join();
-            humPropId =  propertyIds.get("Humidity");
-            System.out.println("The Humidity property Id is "+ humPropId);
+            humPropId = propertyIds.get("Humidity");
+            System.out.println("The Humidity property Id is " + humPropId);
             tempPropId = propertyIds.get("Temperature");
             System.out.println("The Temperature property Id is " + tempPropId);
         });
-        System.out.println("Test 4 passed");
     }
 
     @Test
@@ -136,7 +132,6 @@ public void testSendProps() {
         assertDoesNotThrow(() -> {
             sitewiseActions.sendDataToSiteWiseAsync(assetId, tempPropId, humPropId).join();
         });
-        System.out.println("Test 5 passed");
     }
 
     @Test
@@ -146,7 +141,6 @@ public void testGETHumValue() {
         assertDoesNotThrow(() -> {
             sitewiseActions.getAssetPropValueAsync(humPropId, assetId);
         });
-        System.out.println("Test 6 passed");
     }
 
     @Test
@@ -157,7 +151,6 @@ public void testCreatePortal() {
             portalId = sitewiseActions.createPortalAsync(portalName, iamRole, contactEmail).join();
             assertNotNull(portalId);
         });
-        System.out.println("Test 7 passed");
     }
 
     @Test
@@ -168,7 +161,6 @@ public void testDescribePortal() {
             String portalUrl = sitewiseActions.describePortalAsync(portalId).join();
             assertNotNull(portalUrl);
         });
-        System.out.println("Test 8 passed");
     }
 
     @Test
@@ -179,7 +171,6 @@ public void testCreateGateway() {
             gatewayId = sitewiseActions.createGatewayAsync(gatewayName, myThing).join();
             assertNotNull(gatewayId);
         });
-        System.out.println("Test 9 passed");
     }
 
     @Test
@@ -189,7 +180,6 @@ public void testDescribeGateway() {
         assertDoesNotThrow(() -> {
             sitewiseActions.describeGatewayAsync(gatewayId).join();
         });
-        System.out.println("Test 10 passed");
     }
 
     @Test
@@ -199,8 +189,7 @@ public void testDeletePortal() throws InterruptedException {
         Thread.sleep(30000);
         assertDoesNotThrow(() -> {
             sitewiseActions.deletePortalAsync(portalId).join();
-                });
-        System.out.println("Test 11 passed");
+        });
     }
 
     @Test
@@ -211,7 +200,6 @@ public void testDeleteAsset() throws InterruptedException {
         assertDoesNotThrow(() -> {
             sitewiseActions.deleteAssetAsync(assetId).join();
         });
-        System.out.println("Test 11 passed");
     }
 
     @Test
@@ -223,7 +211,6 @@ public void testDeleteAssetModel() throws InterruptedException {
             sitewiseActions.deleteAssetModelAsync(assetModelId).join();
         });
         CloudFormationHelper.destroyCloudFormationStack(ROLES_STACK);
-        System.out.println("Test 11 passed");
     }