Cleanup merge conflicts after rebasing

Graylog2 · Jun 11, 2019 · ded9498 · ded9498
1 parent c9c0586
commit ded9498
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/org/graylog/integrations/aws/cloudwatch/CloudWatchService.java b/src/main/java/org/graylog/integrations/aws/cloudwatch/CloudWatchService.java
@@ -1,4 +1,4 @@
-package org.graylog.integrations.aws;
+package org.graylog.integrations.aws.cloudwatch;
 
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.cloudwatchlogs.CloudWatchLogsClient;
@@ -39,4 +39,4 @@ public ArrayList<String> getLogGroupNames(String region) {
         }
         return groupNameList;
     }
-}
+}
diff --git a/src/main/java/org/graylog/integrations/aws/resources/AWSResource.java b/src/main/java/org/graylog/integrations/aws/resources/AWSResource.java
@@ -5,8 +5,8 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
-import org.graylog.integrations.aws.cloudwatch.CloudWatchService;
 import org.graylog.integrations.aws.KinesisService;
+import org.graylog.integrations.aws.cloudwatch.CloudWatchService;
 import org.graylog.integrations.aws.resources.requests.KinesisHealthCheckRequest;
 import org.graylog.integrations.aws.resources.responses.KinesisHealthCheckResponse;
 import org.graylog.integrations.aws.resources.responses.RegionResponse;

diff --git a/...ain/java/org/graylog/integrations/aws/resources/responses/KinesisHealthCheckResponse.java b/...ain/java/org/graylog/integrations/aws/resources/responses/KinesisHealthCheckResponse.java
@@ -35,6 +35,6 @@ public static KinesisHealthCheckResponse create(@JsonProperty("success") boolean
                                                     @JsonProperty("log_type") String logType,
                                                     @JsonProperty("explanation") String explanation,
                                                     @JsonProperty("json_message") String jsonMessage) {
-        return new AutoValue_KinesisHealthCheckResponse(success, logType, explanation);
+        return new AutoValue_KinesisHealthCheckResponse(success, logType, explanation, jsonMessage);
     }
 }
diff --git a/...tegrations/aws/CloudWatchServiceTest.java → ...aws/cloudwatch/CloudWatchServiceTest.java b/...tegrations/aws/CloudWatchServiceTest.java → ...aws/cloudwatch/CloudWatchServiceTest.java
@@ -1,6 +1,5 @@
-package org.graylog.integrations.aws;
+package org.graylog.integrations.aws.cloudwatch;
 
-import org.graylog.integrations.aws.cloudwatch.CloudWatchService;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -19,6 +18,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.when;
@@ -69,8 +69,8 @@ public void testLogGroupNames() {
         ArrayList<String> logGroupNames = cloudWatchService.getLogGroupNames("us-east-1");
 
         // Inspect the log groups returned and verify the contents and size.
-        Assert.assertEquals("The number of groups should be because the two responses " +
-                                    "with 3 groups each were provided.", 6, logGroupNames.size());
+        assertEquals("The number of groups should be because the two responses " +
+                     "with 3 groups each were provided.", 6, logGroupNames.size());
 
         // Loop example to verify presence of a specific log group.
         boolean foundGroup = false;

diff --git a/src/test/java/org.graylog.integrations/aws/resources/AWSResourceTest.java b/src/test/java/org.graylog.integrations/aws/resources/AWSResourceTest.java
@@ -1,8 +1,8 @@
 package org.graylog.integrations.aws.resources;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.graylog.integrations.aws.cloudwatch.CloudWatchService;
 import org.graylog.integrations.aws.KinesisService;
+import org.graylog.integrations.aws.cloudwatch.CloudWatchService;
 import org.graylog.integrations.aws.service.AWSService;
 import org.graylog2.plugin.configuration.Configuration;
 import org.junit.Before;