upgrade to micronaut 1.2.0.R2

Author: peh

build.gradle

@@ -1,8 +1,9 @@
+import org.apache.tools.ant.taskdefs.condition.Os
+
 plugins {
-    id "io.spring.dependency-management" version "1.0.6.RELEASE"
-    id "com.github.johnrengelman.shadow" version "4.0.2"
-    id "application"
     id "groovy"
+    id "com.github.johnrengelman.shadow" version "5.0.0"
+    id "application"
 }
 
 version "1.0.0-beta9"
@@ -14,50 +15,49 @@ repositories {
     maven { url "https://jcenter.bintray.com" }
 }
 
-dependencyManagement {
-    imports {
-        mavenBom 'io.micronaut:micronaut-bom:1.1.0.M1'
-    }
-}
-
 configurations {
     // for dependencies that are needed for development only
     developmentOnly
 }
 
 dependencies {
-    compile "io.micronaut:micronaut-runtime-groovy"
-    compile "io.micronaut:micronaut-validation"
-    compile "io.micronaut:micronaut-http-client"
-    compile "io.micronaut:micronaut-http-server-netty"
+    implementation enforcedPlatform("io.micronaut:micronaut-bom:$micronautVersion")
+    compileOnly enforcedPlatform("io.micronaut:micronaut-bom:$micronautVersion")
+    annotationProcessor enforcedPlatform("io.micronaut:micronaut-bom:$micronautVersion")
+    testAnnotationProcessor enforcedPlatform("io.micronaut:micronaut-bom:$micronautVersion")
+
     compileOnly "io.micronaut:micronaut-inject-groovy"
-    runtime "ch.qos.logback:logback-classic:1.2.3"
+    compile "io.micronaut:micronaut-management"
+    implementation "io.micronaut:micronaut-http-client"
+    implementation "io.micronaut:micronaut-http-server-netty"
+    implementation "io.micronaut:micronaut-runtime-groovy"
+    implementation "io.micronaut:micronaut-validation"
+
+    if (Os.isFamily(Os.FAMILY_MAC)) {
+        developmentOnly "io.micronaut:micronaut-runtime-osx:1.2.0.RC2"
+    }
 
-    testCompile("org.spockframework:spock-core") {
+    runtimeOnly "ch.qos.logback:logback-classic:1.2.3"
+    testImplementation("org.spockframework:spock-core") {
         exclude group: "org.codehaus.groovy", module: "groovy-all"
     }
-    testCompile "io.micronaut:micronaut-inject-groovy"
-    testCompile "io.micronaut.test:micronaut-test-spock:1.0.1"
-
-    developmentOnly "net.java.dev.jna:jna"
-    developmentOnly "io.methvin:directory-watcher"
-    developmentOnly "io.micronaut:micronaut-runtime-osx"
-
-    compile group: 'org.codehaus.groovy', name: 'groovy-json', version: '2.5.1'
-    compile group: 'joda-time', name: 'joda-time', version: '2.10.1'
+    testImplementation "io.micronaut:micronaut-inject-groovy"
+    testImplementation "io.micronaut.test:micronaut-test-spock"
+    testImplementation "io.micronaut.test:micronaut-test-junit5"
+    testRuntimeOnly "org.junit.vintage:junit-vintage-engine:5.5.0"
+
+    compile "org.codehaus.groovy:groovy-json:2.5.1"
+    compile group: 'cglib', name: 'cglib-nodep', version: '3.2.12'
+    compile group: 'joda-time', name: 'joda-time', version: '2.10.3'
     compile group: 'org.reflections', name: 'reflections', version: '0.9.11'
 }
 
-shadowJar {
-    mergeServiceFiles()
-}
-
-run.classpath += configurations.developmentOnly
 test.classpath += configurations.developmentOnly
-run.jvmArgs('-noverify', '-XX:TieredStopAtLevel=1')
 
+mainClassName = "bamboohr.slack.bot.Application"
+
+run.classpath += configurations.developmentOnly
+run.jvmArgs('-noverify', '-XX:TieredStopAtLevel=1', '-Dcom.sun.management.jmxremote')
 tasks.withType(GroovyCompile) {
     groovyOptions.forkOptions.jvmArgs.add('-Dgroovy.parameters=true')
 }
-
-mainClassName = "bamboohr.slack.bot.Application"

gradle.properties

@@ -0,0 +1 @@
+micronautVersion=1.2.0.RC2

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Mon Aug 05 09:59:25 CEST 2019
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

src/main/groovy/bamboohr/slack/bot/services/BambooService.groovy

@@ -44,18 +44,25 @@ class BambooService {
      * @return
      */
     List<EmployeeTimeOffInfo> getEmployeesWhoAreOutToday(String apiKey) {
-        String url = "$basePath/time_off/whos_out?end=${LocalDateTime.now().format(DateTimeFormatter.ISO_DATE)}"
-        def list = httpClient.retrieve(getRequest(url, apiKey), List).firstElement().blockingGet().collect { EmployeeTimeOffInfo.parse(it as Map) }.unique { it.employeeId }
+        String url = "$basePath/time_off/whos_out?start=${LocalDateTime.now().minusDays(30).format(DateTimeFormatter.ISO_DATE)}&end=${LocalDateTime.now().format(DateTimeFormatter.ISO_DATE)}"
+        def list
+        try {
+            list = httpClient.retrieve(getRequest(url, apiKey), List).firstElement().blockingGet().collect { EmployeeTimeOffInfo.parse(it as Map) }.unique { it.employeeId }
 
-        Flowable.fromIterable(list).flatMapMaybe({ basicInfo ->
-            getTimeOffDetails(apiKey, basicInfo.id)?.doOnSuccess({ List l ->
-                if (l.size()) {
-                    def detailedInfo = l.first()
-                    basicInfo.type = EmployeeTimeOffInfo.Type.fromBambooType(detailedInfo.type.name)
-                    basicInfo.typeString = detailedInfo.type.name
-                }
-            })
-        }, false, 10).toList().blockingGet()
+            Flowable.fromIterable(list).flatMapMaybe({ basicInfo ->
+                getTimeOffDetails(apiKey, basicInfo.id)?.doOnSuccess({ List l ->
+                    if (l.size()) {
+                        def detailedInfo = l.first()
+                        basicInfo.type = EmployeeTimeOffInfo.Type.fromBambooType(detailedInfo.type.name)
+                        basicInfo.typeString = detailedInfo.type.name
+                    }
+                })
+            }, false, 10).toList().blockingGet()
+
+        } catch (HttpClientResponseException e) {
+            e.response.body()
+            true
+        }
         list
     }
 
@@ -67,7 +74,7 @@ class BambooService {
      */
     Maybe<List> getTimeOffDetails(String apiKey, long id) {
         try {
-            return httpClient.retrieve(getRequest("$basePath/time_off/requests?id=$id", apiKey), List).firstElement()
+            return httpClient.retrieve(getRequest("$basePath/time_off/requests?start=${LocalDateTime.now().minusDays(30).format(DateTimeFormatter.ISO_DATE)}&end=${LocalDateTime.now().plusDays(30).format(DateTimeFormatter.ISO_DATE)}&id=$id", apiKey), List).firstElement()
         } catch (HttpClientResponseException e) {
             if(e.response.status == HttpStatus.UNAUTHORIZED) {
                 // nothing

src/main/resources/logback.xml

@@ -12,6 +12,6 @@
     <root level="info">
         <appender-ref ref="STDOUT" />
     </root>
-        <!--<logger name="io.micronaut.http.client" level="TRACE"/>-->
+<!--        <logger name="io.micronaut.http.client" level="TRACE"/>-->
 </configuration>