Java/Kotlin made some minor modifications to SDK examples (#7228)

Author: scmacdon

javav2/example_code/forecast/src/test/java/ForecastTest.java

@@ -45,29 +45,6 @@ public static void setUp() {
         predARN = values.getPredARN();
         forecastName = values.getForecastName() + randomNum;
         dataSet = values.getDataSet() + randomNum;
-
-        // Uncomment this code block if you prefer using a config.properties file to
-        // retrieve AWS values required for these tests.
-        /*
-         * 
-         * try (InputStream input =
-         * ForecastTest.class.getClassLoader().getResourceAsStream("config.properties"))
-         * {
-         * Properties prop = new Properties();
-         * if (input == null) {
-         * System.out.println("Sorry, unable to find config.properties");
-         * return;
-         * }
-         * 
-         * // Populate the data members required for all tests.
-         * predARN = "arn:aws:forecast:us-west-2:814548047983:predictor/ScottPredictor";
-         * forecastName = "forecast"+randomNum;
-         * dataSet = "dataSet"+randomNum;
-         * 
-         * } catch (IOException ex) {
-         * ex.printStackTrace();
-         * }
-         */
     }
 
     @Test

javav2/example_code/s3/src/main/java/com/example/s3/PutBucketLogging.java

@@ -33,26 +33,28 @@ public static void main(String[] args) {
         final String usage = """
 
             Usage:
-              <bucketName> <targetBucket> \s
+              <bucketName> <targetBucket> <accountId> \s
 
             Where:
               bucketName - The Amazon S3 bucket to upload an object into.
-              targetBucket - The target bucket .
+              targetBucket - The target bucket.
+              accountId - The account id.
             """;
 
-        if (args.length != 2) {
+        if (args.length != 3) {
             System.out.println(usage);
             System.exit(1);
         }
 
         String bucketName = args[0];
         String targetBucket = args[1];
+        String accountId = args[2];
         Region region = Region.US_EAST_1;
         S3Client s3 = S3Client.builder()
             .region(region)
             .build();
 
-        setlogRequest(s3, bucketName, targetBucket);
+        setlogRequest(s3, bucketName, targetBucket, accountId);
         s3.close();
     }
 
@@ -62,10 +64,11 @@ public static void main(String[] args) {
      * @param s3 an instance of the {@link S3Client} used to interact with the S3 service
      * @param bucketName the name of the bucket for which logging needs to be enabled
      * @param targetBucket the name of the target bucket where the logs will be stored
+     * @param accountId the account Id
      *
      * @throws S3Exception if an error occurs while enabling logging for the bucket
      */
-    public static void setlogRequest(S3Client s3, String bucketName, String targetBucket) {
+    public static void setlogRequest(S3Client s3, String bucketName, String targetBucket, String accountId) {
         try {
             GetBucketAclRequest aclRequest = GetBucketAclRequest.builder()
                 .bucket(targetBucket)
@@ -96,7 +99,7 @@ public static void setlogRequest(S3Client s3, String bucketName, String targetBu
 
             PutBucketLoggingRequest loggingRequest = PutBucketLoggingRequest.builder()
                 .bucket(bucketName)
-                .expectedBucketOwner("814548047983")
+                .expectedBucketOwner(accountId)
                 .bucketLoggingStatus(loggingStatus)
                 .build();
 

javav2/example_code/sns/src/main/java/com/example/sns/CreateFIFOTopic.java

@@ -35,8 +35,8 @@ public static void main(String[] args) {
             System.exit(1);
         }
 
-        String fifoTopicName = "PriceUpdatesTopic3.fifo";
-        String fifoQueueARN = "arn:aws:sqs:us-east-1:814548047983:MyPriceSQS.fifo";
+        String fifoTopicName = args[0];
+        String fifoQueueARN = args[1];
         SnsClient snsClient = SnsClient.builder()
                 .region(Region.US_EAST_1)
                 .build();

javav2/usecases/topics_and_queues/pom.xml

@@ -28,8 +28,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <source>8</source>
-                    <target>8</target>
+                    <source>15</source>
+                    <target>15</target>
                 </configuration>
             </plugin>
         </plugins>
@@ -39,7 +39,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.21.20</version>
+                <version>2.29.45</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -87,5 +87,13 @@
             <artifactId>gson</artifactId>
             <version>2.10.1</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>sso</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>ssooidc</artifactId>
+        </dependency>
     </dependencies>
 </project>