fix: resolve rebase conflicts with create_log_group_and_stream

- Remove duplicate @test annotations from auto-merge
- Add Hamcrest imports for entity assertion matchers
- Update EXPECTED_DISPATCHER_ARITY to 11 (entity field added)

Signed-off-by: Nikhil Bagmar <nikhilbagmar73@gmail.com>

Author: bagmarnikhil

data-prepper-plugins/cloudwatch-logs/src/test/java/org/opensearch/dataprepper/plugins/sink/cloudwatch_logs/CloudWatchLogsSinkTest.java

@@ -295,7 +295,6 @@ void WHEN_sink_has_dlq_config_THEN_retries_set_to_user_configured_value() {
         assertThat(numRetries, equalTo(TEST_MAX_RETRIES));
     }
 
-    @Test
     @Test
     void WHEN_create_log_group_and_stream_flags_are_set_THEN_flags_passed_to_dispatcher() {
         when(mockCloudWatchLogsSinkConfig.getCreateLogGroup()).thenReturn(true);

data-prepper-plugins/cloudwatch-logs/src/test/java/org/opensearch/dataprepper/plugins/sink/cloudwatch_logs/client/CloudWatchLogsDispatcherTest.java

@@ -33,6 +33,10 @@
 import java.util.List;
 import java.util.concurrent.Executor;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;

data-prepper-plugins/cloudwatch-logs/src/test/java/org/opensearch/dataprepper/plugins/sink/cloudwatch_logs/config/CloudWatchLogsSinkConfigTest.java

@@ -328,7 +328,6 @@ void GIVEN_endpoint_configured_SHOULD_return_the_configured_value() throws NoSuc
         assertThat(cloudWatchLogsSinkConfig.getEndpoint(), equalTo(testEndpoint));
     }
 
-    @Test
     @Test
     void GIVEN_new_sink_config_WHEN_get_create_log_group_called_SHOULD_return_false() {
         assertThat(new CloudWatchLogsSinkConfig().getCreateLogGroup(), equalTo(false));