From 84af2bdc71a84e5183ace9216807c731803dab07 Mon Sep 17 00:00:00 2001 From: jspark03 Date: Thu, 5 Dec 2019 07:05:36 +0000 Subject: [PATCH] 1.1.2, simplify exceptions on getMessage() --- README.md | 4 ++-- build.gradle | 2 +- .../samples/controller/GraylogSearchController.java | 3 +-- .../sdk/spring/samples/service/GraylogSearchService.java | 3 +-- .../graylog/sdk/spring/starter/GraylogSearch.java | 8 ++------ .../graylog/sdk/spring/starter/GraylogSearchTests.java | 3 +-- 6 files changed, 8 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 71ee534..dc79336 100644 --- a/README.md +++ b/README.md @@ -13,13 +13,13 @@ Graylog SDK Spring Boot Starter is available at the Central Maven Repository. com.joonsang.graylog graylog-sdk-spring-boot-starter - 1.1.1 + 1.1.2 ``` **Gradle** ``` -implementation group: 'com.joonsang.graylog', name: 'graylog-sdk-spring-boot-starter', version: '1.1.1' +implementation group: 'com.joonsang.graylog', name: 'graylog-sdk-spring-boot-starter', version: '1.1.2' ``` ## Usage diff --git a/build.gradle b/build.gradle index 0199e9e..74b81de 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ repositories { subprojects { group = 'com.joonsang.graylog' - version = '1.1.1' + version = '1.1.2' sourceCompatibility = '11' repositories { diff --git a/graylog-sdk-spring-boot-samples/src/main/java/com/joonsang/graylog/sdk/spring/samples/controller/GraylogSearchController.java b/graylog-sdk-spring-boot-samples/src/main/java/com/joonsang/graylog/sdk/spring/samples/controller/GraylogSearchController.java index 1443ba2..d6d03bd 100644 --- a/graylog-sdk-spring-boot-samples/src/main/java/com/joonsang/graylog/sdk/spring/samples/controller/GraylogSearchController.java +++ b/graylog-sdk-spring-boot-samples/src/main/java/com/joonsang/graylog/sdk/spring/samples/controller/GraylogSearchController.java @@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.*; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -33,7 +32,7 @@ public GraylogSearchController(GraylogSearchService graylogSearchService) { @GetMapping({"/messages/{requestId}"}) public ResponseEntity getMessageByRequestId( @PathVariable("requestId") String requestId - ) throws IOException, NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException { + ) throws IOException, ReflectiveOperationException { LocalDateTime fromDateTime = LocalDateTime.now().minusMonths(3); LocalDateTime toDateTime = LocalDateTime.now(); diff --git a/graylog-sdk-spring-boot-samples/src/main/java/com/joonsang/graylog/sdk/spring/samples/service/GraylogSearchService.java b/graylog-sdk-spring-boot-samples/src/main/java/com/joonsang/graylog/sdk/spring/samples/service/GraylogSearchService.java index fb6afd7..26429fd 100644 --- a/graylog-sdk-spring-boot-samples/src/main/java/com/joonsang/graylog/sdk/spring/samples/service/GraylogSearchService.java +++ b/graylog-sdk-spring-boot-samples/src/main/java/com/joonsang/graylog/sdk/spring/samples/service/GraylogSearchService.java @@ -14,7 +14,6 @@ import org.springframework.stereotype.Service; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; import java.util.ArrayList; @@ -40,7 +39,7 @@ public GraylogMessage getMessage( LocalDateTime fromDateTime, LocalDateTime toDateTime, GraylogQuery query - ) throws InvocationTargetException, NoSuchMethodException, InstantiationException, IllegalAccessException, IOException { + ) throws IOException, ReflectiveOperationException { @SuppressWarnings("unchecked") List messages = (List) graylogSearch.getMessages( diff --git a/graylog-sdk-spring-boot-starter/src/main/java/com/joonsang/graylog/sdk/spring/starter/GraylogSearch.java b/graylog-sdk-spring-boot-starter/src/main/java/com/joonsang/graylog/sdk/spring/starter/GraylogSearch.java index 8721743..1801228 100644 --- a/graylog-sdk-spring-boot-starter/src/main/java/com/joonsang/graylog/sdk/spring/starter/GraylogSearch.java +++ b/graylog-sdk-spring-boot-starter/src/main/java/com/joonsang/graylog/sdk/spring/starter/GraylogSearch.java @@ -10,7 +10,6 @@ import org.apache.commons.lang3.StringUtils; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -47,10 +46,7 @@ public GraylogSearch( * @param messageObject message object * @return List of message * @throws IOException Graylog server failure - * @throws NoSuchMethodException if given message object does not have constructor - * @throws IllegalAccessException if given message object fails initialization - * @throws InvocationTargetException if given message object fails initialization - * @throws InstantiationException if given message object fails initialization + * @throws ReflectiveOperationException if given message object does not have constructor * @since 1.0.0 */ public List getMessages( @@ -59,7 +55,7 @@ public List getMessages( LocalDateTime toDateTime, String query, Class messageObject - ) throws IOException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException { + ) throws IOException, ReflectiveOperationException { String filter = "streams:" + streamId; String from = fromDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); diff --git a/graylog-sdk-spring-boot-starter/src/test/java/com/joonsang/graylog/sdk/spring/starter/GraylogSearchTests.java b/graylog-sdk-spring-boot-starter/src/test/java/com/joonsang/graylog/sdk/spring/starter/GraylogSearchTests.java index 1269234..365da02 100644 --- a/graylog-sdk-spring-boot-starter/src/test/java/com/joonsang/graylog/sdk/spring/starter/GraylogSearchTests.java +++ b/graylog-sdk-spring-boot-starter/src/test/java/com/joonsang/graylog/sdk/spring/starter/GraylogSearchTests.java @@ -13,7 +13,6 @@ import org.springframework.boot.test.context.SpringBootTest; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.List; @@ -37,7 +36,7 @@ class GraylogSearchTests { GraylogSearch graylogSearch; @Test - void messages() throws IOException, InvocationTargetException, NoSuchMethodException, InstantiationException, IllegalAccessException { + void messages() throws IOException, ReflectiveOperationException { LocalDateTime from = LocalDateTime.parse("2019-11-04 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); LocalDateTime to = LocalDateTime.parse("2019-11-05 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));