Fixed style errors.

Signed-off-by: AWSHurneyt <[email protected]>
opensearch-project · Aug 25, 2022 · 69369dc · 69369dc
1 parent 838659f
commit 69369dc
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 41 deletions.
diff --git a/src/main/java/org/opensearch/commons/destination/message/LegacySNSMessage.java b/src/main/java/org/opensearch/commons/destination/message/LegacySNSMessage.java
@@ -24,12 +24,12 @@ public class LegacySNSMessage extends LegacyBaseMessage {
     private final String clusterName;
 
     private LegacySNSMessage(
-            final String destinationName,
-            final String roleArn,
-            final String topicArn,
-            final String clusterName,
-            final String subject,
-            final String message
+        final String destinationName,
+        final String roleArn,
+        final String topicArn,
+        final String clusterName,
+        final String subject,
+        final String message
     ) {
         super(LegacyDestinationType.LEGACY_SNS, destinationName, message);
 
@@ -66,13 +66,20 @@ public LegacySNSMessage(StreamInput streamInput) throws java.io.IOException {
 
     @Override
     public String toString() {
-        return "DestinationType: " + getChannelType()
-                + ", DestinationName: " +  destinationName
-                + ", RoleARn: " + roleArn
-                + ", TopicArn: " + topicArn
-                + ", ClusterName: " + clusterName
-                + ", Subject: " + subject
-                + ", Message: " + message;
+        return "DestinationType: "
+            + getChannelType()
+            + ", DestinationName: "
+            + destinationName
+            + ", RoleARn: "
+            + roleArn
+            + ", TopicArn: "
+            + topicArn
+            + ", ClusterName: "
+            + clusterName
+            + ", Subject: "
+            + subject
+            + ", Message: "
+            + message;
     }
 
     public static class Builder {
@@ -113,14 +120,7 @@ public Builder withClusterName(String clusterName) {
         }
 
         public LegacySNSMessage build() {
-            return new LegacySNSMessage(
-                    this.destinationName,
-                    this.roleArn,
-                    this.topicArn,
-                    this.clusterName,
-                    this.subject,
-                    this.message
-            );
+            return new LegacySNSMessage(this.destinationName, this.roleArn, this.topicArn, this.clusterName, this.subject, this.message);
         }
     }
 

diff --git a/src/main/java/org/opensearch/commons/destination/util/Util.java b/src/main/java/org/opensearch/commons/destination/util/Util.java
@@ -5,15 +5,16 @@
 
 package org.opensearch.commons.destination.util;
 
+import java.util.regex.Pattern;
+
 import org.opensearch.common.Strings;
 import org.opensearch.common.ValidationException;
 
-import java.util.regex.Pattern;
-
 public class Util {
     private Util() {}
 
-    public static final Pattern SNS_ARN_REGEX = Pattern.compile("^arn:aws(-[^:]+)?:sns:([a-zA-Z0-9-]+):([0-9]{12}):([a-zA-Z0-9-_]+)(\\.fifo)?$");
+    public static final Pattern SNS_ARN_REGEX = Pattern
+        .compile("^arn:aws(-[^:]+)?:sns:([a-zA-Z0-9-]+):([0-9]{12}):([a-zA-Z0-9-_]+)(\\.fifo)?$");
     public static final Pattern IAM_ARN_REGEX = Pattern.compile("^arn:aws(-[^:]+)?:iam::([0-9]{12}):([a-zA-Z0-9-/_+=@.,]+)$");
 
     public static String getRegion(String arn) {

diff --git a/src/test/java/org/opensearch/commons/destination/message/LegacySNSMessageTest.java b/src/test/java/org/opensearch/commons/destination/message/LegacySNSMessageTest.java
@@ -5,10 +5,10 @@
 
 package org.opensearch.commons.destination.message;
 
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 
+import org.junit.Test;
+
 public class LegacySNSMessageTest {
 
     @Test
@@ -24,8 +24,10 @@ public void testCreateRoleArnMissingMessage() {
     @Test
     public void testCreateTopicArnMissingMessage() {
         try {
-            LegacySNSMessage message = new LegacySNSMessage.Builder("sms").withMessage("dummyMessage")
-                    .withRole("arn:aws:iam::853806060000:role/domain/abc").build();
+            LegacySNSMessage message = new LegacySNSMessage.Builder("sms")
+                .withMessage("dummyMessage")
+                .withRole("arn:aws:iam::853806060000:role/domain/abc")
+                .build();
         } catch (Exception ex) {
             assertEquals("Topic arn is missing/invalid: null", ex.getMessage());
             throw ex;
@@ -36,8 +38,9 @@ public void testCreateTopicArnMissingMessage() {
     public void testCreateContentMissingMessage() {
         try {
             LegacySNSMessage message = new LegacySNSMessage.Builder("sms")
-                    .withRole("arn:aws:iam::853806060000:role/domain/abc")
-                    .withTopicArn("arn:aws:sns:us-west-2:475313751589:test-notification").build();
+                .withRole("arn:aws:iam::853806060000:role/domain/abc")
+                .withTopicArn("arn:aws:sns:us-west-2:475313751589:test-notification")
+                .build();
         } catch (Exception ex) {
             assertEquals("Message content is missing", ex.getMessage());
             throw ex;
@@ -47,9 +50,11 @@ public void testCreateContentMissingMessage() {
     @Test
     public void testInValidRoleMessage() {
         try {
-            LegacySNSMessage message = new LegacySNSMessage.Builder("sms").withMessage("dummyMessage")
-                    .withRole("dummyRole")
-                    .withTopicArn("arn:aws:sns:us-west-2:475313751589:test-notification").build();
+            LegacySNSMessage message = new LegacySNSMessage.Builder("sms")
+                .withMessage("dummyMessage")
+                .withRole("dummyRole")
+                .withTopicArn("arn:aws:sns:us-west-2:475313751589:test-notification")
+                .build();
         } catch (Exception ex) {
             assertEquals("Role arn is missing/invalid: dummyRole", ex.getMessage());
             throw ex;
@@ -58,9 +63,11 @@ public void testInValidRoleMessage() {
 
     @Test
     public void testValidMessage() {
-        LegacySNSMessage message = new LegacySNSMessage.Builder("sms").withMessage("dummyMessage")
-                .withRole("arn:aws:iam::853806060000:role/domain/abc")
-                .withTopicArn("arn:aws:sns:us-west-2:475313751589:test-notification").build();
+        LegacySNSMessage message = new LegacySNSMessage.Builder("sms")
+            .withMessage("dummyMessage")
+            .withRole("arn:aws:iam::853806060000:role/domain/abc")
+            .withTopicArn("arn:aws:sns:us-west-2:475313751589:test-notification")
+            .build();
         assertEquals(LegacyDestinationType.LEGACY_SNS, message.getChannelType());
         assertEquals("sms", message.getChannelName());
         assertEquals("dummyMessage", message.getMessage());
@@ -71,9 +78,11 @@ public void testValidMessage() {
     @Test
     public void testInValidChannelName() {
         try {
-            LegacySNSMessage message = new LegacySNSMessage.Builder("").withMessage("dummyMessage")
-                    .withRole("arn:aws:iam::853806060000:role/domain/abc")
-                    .withTopicArn("arn:aws:sns:us-west-2:475313751589:test-notification").build();
+            LegacySNSMessage message = new LegacySNSMessage.Builder("")
+                .withMessage("dummyMessage")
+                .withRole("arn:aws:iam::853806060000:role/domain/abc")
+                .withTopicArn("arn:aws:sns:us-west-2:475313751589:test-notification")
+                .build();
         } catch (Exception ex) {
             assertEquals("Channel name must be defined", ex.getMessage());
             throw ex;

diff --git a/src/test/java/org/opensearch/commons/destination/util/UtilTest.java b/src/test/java/org/opensearch/commons/destination/util/UtilTest.java
@@ -5,12 +5,12 @@
 
 package org.opensearch.commons.destination.util;
 
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import org.junit.Test;
+
 public class UtilTest {
 
     @Test