updated Sitewise Java files

Author: scmacdon

javav2/example_code/iotsitewise/pom.xml

@@ -66,6 +66,10 @@
             <version>5.9.2</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>secretsmanager</artifactId>
+        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>netty-nio-client</artifactId>

javav2/example_code/iotsitewise/src/main/java/com/example/iotsitewise/HelloSitewise.java

@@ -32,20 +32,19 @@ public static void main(String[] args) {
         }
 
         String assetModelId = args[0];
-        IoTSiteWiseAsyncClient siteWiseAsyncClient = IoTSiteWiseAsyncClient.builder()
-            .region(Region.US_EAST_1)
-            .build();
-
-        fetchAssets(siteWiseAsyncClient, assetModelId);
+        fetchAssets(assetModelId);
     }
 
     /**
      * Fetches assets from AWS IoT SiteWise using the provided {@link IoTSiteWiseAsyncClient}.
      *
-     * @param siteWiseAsyncClient the AWS IoT SiteWise asynchronous client to use for the request
      * @param modelId the ID of the asset model to fetch assets for
      */
-    public static void fetchAssets(IoTSiteWiseAsyncClient siteWiseAsyncClient, String modelId) {
+    public static void fetchAssets(String modelId) {
+        IoTSiteWiseAsyncClient siteWiseAsyncClient = IoTSiteWiseAsyncClient.builder()
+            .region(Region.US_EAST_1)
+            .build();
+
         ListAssetsRequest assetsRequest = ListAssetsRequest.builder()
             .maxResults(10)
             .assetModelId(modelId)

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

@@ -92,7 +92,7 @@ public static Boolean describeStack(String stackName) {
         }
         return false;
     }
-    static void destroyCloudFormationStack(String stackName) {
+    public static void destroyCloudFormationStack(String stackName) {
         getCloudFormationClient().deleteStack(b -> b.stackName(stackName))
             .whenComplete((dsr, t) -> {
                 if (dsr != null) {

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

@@ -236,7 +236,7 @@ public void getAssetPropValueAsync(String propName, String propId, String assetI
      * @param assetModelId The Id of the asset model.
      * @return A map of the asset model properties when the CompletableFuture completes.
      */
-    CompletableFuture<Map<String, String>> getPropertyIds(String assetModelId){
+    public CompletableFuture<Map<String, String>> getPropertyIds(String assetModelId){
         ListAssetModelPropertiesRequest modelPropertiesRequest = ListAssetModelPropertiesRequest.builder().assetModelId(assetModelId).build();
         return getAsyncClient().listAssetModelProperties(modelPropertiesRequest)
                 .handle( (response, throwable) -> {

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

@@ -5,19 +5,11 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.services.iotsitewise.model.BatchPutAssetPropertyValueResponse;
 import software.amazon.awssdk.services.iotsitewise.model.CreateAssetModelResponse;
 import software.amazon.awssdk.services.iotsitewise.model.CreateAssetResponse;
-import software.amazon.awssdk.services.iotsitewise.model.CreateGatewayResponse;
-import software.amazon.awssdk.services.iotsitewise.model.DeleteAssetModelResponse;
-import software.amazon.awssdk.services.iotsitewise.model.DeleteAssetResponse;
-import software.amazon.awssdk.services.iotsitewise.model.DeletePortalResponse;
-import software.amazon.awssdk.services.iotsitewise.model.DescribeGatewayResponse;
 import software.amazon.awssdk.services.iotsitewise.model.IoTSiteWiseException;
 import software.amazon.awssdk.services.iotsitewise.model.ResourceAlreadyExistsException;
 import software.amazon.awssdk.services.iotsitewise.model.ResourceNotFoundException;
-
-import java.util.List;
 import java.util.Map;
 import java.util.Scanner;
 import java.util.concurrent.CompletableFuture;
@@ -48,18 +40,18 @@ public static void main(String[] args) throws Throwable {
                 myThing - The name of the IoT thing or device that is connected to the IoT SiteWise gateway.
             """;
 
-        //if (args.length != 6) {
-        //    logger.info(usage);
-        //    return;
-       // }
+        if (args.length != 6) {
+            logger.info(usage);
+            return;
+        }
 
         Scanner scanner = new Scanner(System.in);
-        String assetModelName = "MyAssetModel";
-        String assetName = "MyAsset";
-        String portalName = "MyPortal";
-        String contactEmail = "[email protected]";
-        String gatewayName = "myGateway11";
-        String myThing = "myThing78";
+        String assetModelName = args[0];
+        String assetName = args[1];
+        String portalName = args[2];
+        String contactEmail = args[3];
+        String gatewayName = args[4];
+        String myThing = args[5];
 
         logger.info("""
             AWS IoT SiteWise is a fully managed software-as-a-service (SaaS) that 
@@ -140,6 +132,8 @@ public static void runScenario(String assetModelName, String assetName,  String
              an asset from the asset model.
                     
             """);
+        logger.info("Let's wait 1 minute for the asset model to be ready.");
+        countdown(1);
         waitForInputToContinue(scanner);
         String assetId;
         try {
@@ -229,7 +223,7 @@ public static void runScenario(String assetModelName, String assetName,  String
             """);
         waitForInputToContinue(scanner);
         try {
-        sitewiseActions.getAssetPropValueAsync("Temperature property", tempPropId, assetId); // FIXME <------------------
+        sitewiseActions.getAssetPropValueAsync("Temperature property", tempPropId, assetId);
         waitForInputToContinue(scanner);
         } catch (RuntimeException rt) {
             Throwable cause = rt.getCause();
@@ -246,7 +240,7 @@ public static void runScenario(String assetModelName, String assetName,  String
             }
             throw cause;
         }
-        sitewiseActions.getAssetPropValueAsync("Humidity property", humPropId, assetId); // FIXME <------------------
+        sitewiseActions.getAssetPropValueAsync("Humidity property", humPropId, assetId);
         waitForInputToContinue(scanner);
         logger.info(DASHES);
 
@@ -257,7 +251,7 @@ public static void runScenario(String assetModelName, String assetName,  String
              such as sensors, equipment, and control systems, into a centralized platform.
             """);
         waitForInputToContinue(scanner);
-        String portalId = "";
+        String portalId;
         try {
             portalId = sitewiseActions.createPortalAsync(portalName, iamRole, contactEmail).join();
             logger.info("Portal created successfully. Portal ID {}", portalId);