[dynamodb] AWS SDK updated to 2.17.102 (#11914)

* [dynamodb] Update guide for updating the SDK

Some steps were obsolete and required corrections.

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [dynamodb] Update AWS SDK to 2.17.102

- Added NOTICE with all compiled dependencies. Dependencies listed in
  feature.xml are omitted.
- jackson dependency is now provided by AWS SDK as a 'shaded' copy
- log4j version used in tests updated
- Specifying DefaultsMode=STANDARD to make the SDK utilize latest
  recommended parameters. RetryMode is also controlled by DefaultsMode,
  so we avoid setting it explicitly unless overridden by the user.
- Fixed test regressions due to SDK changes

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

bundles/org.openhab.persistence.dynamodb/src/main/feature/feature.xml

@@ -4,7 +4,6 @@
 
 	<feature name="openhab-persistence-dynamodb" description="DynamoDB Persistence" version="${project.version}">
 		<feature>openhab-runtime-base</feature>
-		<feature dependency="true">openhab.tp-jackson</feature>
 		<feature dependency="true">openhab.tp-netty</feature>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.persistence.dynamodb/${project.version}</bundle>
 		<configfile finalname="${openhab.conf}/services/dynamodb.cfg" override="false">mvn:org.openhab.addons.features.karaf/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/dynamodb</configfile>

bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/DynamoDBConfig.java

@@ -49,14 +49,13 @@ public class DynamoDBConfig {
     public static final String DEFAULT_TABLE_NAME = "openhab";
     public static final long DEFAULT_READ_CAPACITY_UNITS = 1;
     public static final long DEFAULT_WRITE_CAPACITY_UNITS = 1;
-    public static final RetryMode DEFAULT_RETRY_MODE = RetryMode.STANDARD;
     private static final Logger LOGGER = LoggerFactory.getLogger(DynamoDBConfig.class);
 
     private long readCapacityUnits;
     private long writeCapacityUnits;
     private Region region;
     private AwsCredentials credentials;
-    private RetryPolicy retryPolicy;
+    private Optional<RetryPolicy> retryPolicy;
     private ExpectedTableSchema tableRevision;
     private String table;
     private String tablePrefixLegacy;
@@ -81,7 +80,7 @@ public class DynamoDBConfig {
             }
             region = Region.of(regionName);
 
-            RetryMode retryMode = RetryMode.STANDARD;
+            Optional<RetryMode> retryMode = Optional.empty();
             AwsCredentials credentials;
             String accessKey = (String) config.get("accessKey");
             String secretKey = (String) config.get("secretKey");
@@ -110,11 +109,12 @@ public class DynamoDBConfig {
                                     return Optional.of(value);
                                 }
                             }
-                            LOGGER.warn("Unknown retry_mode '{}' in profile. Ignoring and using default {} retry mode.",
-                                    retry_mode, DEFAULT_RETRY_MODE);
+                            LOGGER.warn(
+                                    "Unknown retry_mode '{}' in profile. Ignoring and using SDK default retry mode.",
+                                    retry_mode);
                             return Optional.empty();
 
-                        }).orElse(DEFAULT_RETRY_MODE);
+                        });
                 LOGGER.debug("Retry mode {}", retryMode);
             }
 
@@ -169,18 +169,19 @@ public class DynamoDBConfig {
             switch (tableRevision) {
                 case NEW:
                     LOGGER.debug("Using new DynamoDB table schema");
-                    return DynamoDBConfig.newSchema(region, credentials, AwsRetryPolicy.forRetryMode(retryMode), table,
-                            readCapacityUnits, writeCapacityUnits, expireDays);
+                    return DynamoDBConfig.newSchema(region, credentials, retryMode.map(AwsRetryPolicy::forRetryMode),
+                            table, readCapacityUnits, writeCapacityUnits, expireDays);
                 case LEGACY:
                     LOGGER.warn(
                             "Using legacy DynamoDB table schema. It is recommended to transition to new schema by defining 'table' parameter and not configuring 'tablePrefix'");
-                    return DynamoDBConfig.legacySchema(region, credentials, AwsRetryPolicy.forRetryMode(retryMode),
+                    return DynamoDBConfig.legacySchema(region, credentials, retryMode.map(AwsRetryPolicy::forRetryMode),
                             tablePrefixLegacy, readCapacityUnits, writeCapacityUnits);
                 case MAYBE_LEGACY:
                     LOGGER.debug(
                             "Unclear whether we should use new legacy DynamoDB table schema. It is recommended to explicitly define new 'table' parameter. The correct table schema will be detected at runtime.");
-                    return DynamoDBConfig.maybeLegacySchema(region, credentials, AwsRetryPolicy.forRetryMode(retryMode),
-                            table, tablePrefixLegacy, readCapacityUnits, writeCapacityUnits, expireDays);
+                    return DynamoDBConfig.maybeLegacySchema(region, credentials,
+                            retryMode.map(AwsRetryPolicy::forRetryMode), table, tablePrefixLegacy, readCapacityUnits,
+                            writeCapacityUnits, expireDays);
                 default:
                     throw new IllegalStateException("Unhandled enum. Bug");
             }
@@ -190,26 +191,28 @@ public class DynamoDBConfig {
         }
     }
 
-    private static DynamoDBConfig newSchema(Region region, AwsCredentials credentials, RetryPolicy retryPolicy,
-            String table, long readCapacityUnits, long writeCapacityUnits, @Nullable Integer expireDays) {
+    private static DynamoDBConfig newSchema(Region region, AwsCredentials credentials,
+            Optional<RetryPolicy> retryPolicy, String table, long readCapacityUnits, long writeCapacityUnits,
+            @Nullable Integer expireDays) {
         return new DynamoDBConfig(region, credentials, retryPolicy, table, "", ExpectedTableSchema.NEW,
                 readCapacityUnits, writeCapacityUnits, expireDays);
     }
 
-    private static DynamoDBConfig legacySchema(Region region, AwsCredentials credentials, RetryPolicy retryPolicy,
-            String tablePrefixLegacy, long readCapacityUnits, long writeCapacityUnits) {
+    private static DynamoDBConfig legacySchema(Region region, AwsCredentials credentials,
+            Optional<RetryPolicy> retryPolicy, String tablePrefixLegacy, long readCapacityUnits,
+            long writeCapacityUnits) {
         return new DynamoDBConfig(region, credentials, retryPolicy, "", tablePrefixLegacy, ExpectedTableSchema.LEGACY,
                 readCapacityUnits, writeCapacityUnits, null);
     }
 
-    private static DynamoDBConfig maybeLegacySchema(Region region, AwsCredentials credentials, RetryPolicy retryPolicy,
-            String table, String tablePrefixLegacy, long readCapacityUnits, long writeCapacityUnits,
-            @Nullable Integer expireDays) {
+    private static DynamoDBConfig maybeLegacySchema(Region region, AwsCredentials credentials,
+            Optional<RetryPolicy> retryPolicy, String table, String tablePrefixLegacy, long readCapacityUnits,
+            long writeCapacityUnits, @Nullable Integer expireDays) {
         return new DynamoDBConfig(region, credentials, retryPolicy, table, tablePrefixLegacy,
                 ExpectedTableSchema.MAYBE_LEGACY, readCapacityUnits, writeCapacityUnits, expireDays);
     }
 
-    private DynamoDBConfig(Region region, AwsCredentials credentials, RetryPolicy retryPolicy, String table,
+    private DynamoDBConfig(Region region, AwsCredentials credentials, Optional<RetryPolicy> retryPolicy, String table,
             String tablePrefixLegacy, ExpectedTableSchema tableRevision, long readCapacityUnits,
             long writeCapacityUnits, @Nullable Integer expireDays) {
         this.region = region;
@@ -251,7 +254,7 @@ public class DynamoDBConfig {
         return writeCapacityUnits;
     }
 
-    public RetryPolicy getRetryPolicy() {
+    public Optional<RetryPolicy> getRetryPolicy() {
         return retryPolicy;
     }
 

bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/DynamoDBPersistenceService.java

@@ -63,6 +63,7 @@ import org.slf4j.LoggerFactory;
 
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
+import software.amazon.awssdk.awscore.defaultsmode.DefaultsMode;
 import software.amazon.awssdk.core.async.SdkPublisher;
 import software.amazon.awssdk.core.client.config.ClientAsyncConfiguration;
 import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
@@ -125,7 +126,7 @@ public class DynamoDBPersistenceService implements QueryablePersistenceService {
         DynamoDBConfig localDbConfig = dbConfig;
         config.apiCallAttemptTimeout(TIMEOUT_API_CALL_ATTEMPT).apiCallTimeout(TIMEOUT_API_CALL);
         if (localDbConfig != null) {
-            config.retryPolicy(localDbConfig.getRetryPolicy());
+            localDbConfig.getRetryPolicy().ifPresent(config::retryPolicy);
         }
     }
 
@@ -220,6 +221,7 @@ public class DynamoDBPersistenceService implements QueryablePersistenceService {
                         return true;
                     }
                     DynamoDbAsyncClientBuilder lowlevelClientBuilder = DynamoDbAsyncClient.builder()
+                            .defaultsMode(DefaultsMode.STANDARD)
                             .credentialsProvider(StaticCredentialsProvider.create(localDbConfig.getCredentials()))
                             .httpClient(NettyNioAsyncHttpClient.builder().maxConcurrency(MAX_CONCURRENCY).build())
                             .asyncConfiguration(