Fixing conflict and updated tests.

Author: andreas-grafenberger

services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/DefaultMethodsUnsupportedOperationTest.java

@@ -55,7 +55,7 @@ Stream<DynamicTest> testDefaultMethodsThrowUnsupportedOperation() {
             .stream()
             .flatMap(this::createTestsForInterface)
             .collect(toList());
-        assertEquals(100, dynamicTestList.size());
+        assertEquals(102, dynamicTestList.size());
         return dynamicTestList.stream();
     }
 

services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/EqualsAndHashCodeTest.java

@@ -177,6 +177,10 @@ private void verifyEqualsAndHashCode(Class<?> type) {
                                    .usingGetClass();
                 break;
             }
+            case "software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableMetadata" : {
+                verifier = verifier.withIgnoredFields("partitionKeyCache", "sortKeyCache");
+                break;
+            }
             case "software.amazon.awssdk.enhanced.dynamodb.model.UpdateItemEnhancedRequest": {
                 verifier = verifier.withIgnoredFields("ignoreNullsMode");
                 break;