diff --git a/build.gradle b/build.gradle index 9738411..e35d5a2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,17 +1,17 @@ buildscript { repositories { jcenter() } dependencies { - classpath 'com.netflix.nebula:nebula-publishing-plugin:4.4.4' + classpath 'com.netflix.nebula:nebula-publishing-plugin:4.7.0' } } plugins { - id 'nebula.dependency-recommender' version '3.1.0' - id 'nebula.dependency-lock' version '4.2.0' + id 'nebula.dependency-recommender' version '3.3.0' + id 'nebula.dependency-lock' version '4.3.0' id 'nebula.nebula-release' version '4.0.1' id 'nebula.contacts' version '3.0.1' - id 'nebula.info' version '3.0.3' - id 'nebula.nebula-bintray' version '3.3.4' + id 'nebula.info' version '3.1.0' + id 'nebula.nebula-bintray' version '3.4.0' id "org.standardout.versioneye" version '1.4.0' } @@ -30,6 +30,10 @@ apply plugin: 'build-dashboard' group 'com.github.kennedyoliveira' description = 'Implementation of a Metrics Event Stream using Vert.x' +pmd { + toolVersion = '5.4.2' +} + def recomendationsFile = rootProject.file('dependencies-version.properties') dependencyRecommendations { diff --git a/dependencies-version.properties b/dependencies-version.properties index d0c0811..21eece6 100644 --- a/dependencies-version.properties +++ b/dependencies-version.properties @@ -5,8 +5,8 @@ VERTX_VERSION=3.2.+ com.netflix.hystrix:hystrix-core=$HYSTRIX_VERSION # Json Deps -org.codehaus.jackson:jackson-core-asl=1.9.+ -org.codehaus.jackson:jackson-mapper-asl=1.9.+ +org.codehaus.jackson:jackson-core-asl= 1.9.13 +org.codehaus.jackson:jackson-mapper-asl= 1.9.13 # Vert.x io.vertx:vertx-core=$VERTX_VERSION diff --git a/dependencies.lock b/dependencies.lock index 1fb0fca..4d43b7f 100644 --- a/dependencies.lock +++ b/dependencies.lock @@ -10,10 +10,10 @@ "locked": "3.2.1" }, "org.codehaus.jackson:jackson-core-asl": { - "locked": "1.9.11" + "locked": "1.9.13" }, "org.codehaus.jackson:jackson-mapper-asl": { - "locked": "1.9.11" + "locked": "1.9.13" } }, "compileClasspath": { @@ -27,10 +27,10 @@ "locked": "3.2.1" }, "org.codehaus.jackson:jackson-core-asl": { - "locked": "1.9.11" + "locked": "1.9.13" }, "org.codehaus.jackson:jackson-mapper-asl": { - "locked": "1.9.11" + "locked": "1.9.13" } }, "compileOnly": { @@ -44,10 +44,10 @@ "locked": "3.2.1" }, "org.codehaus.jackson:jackson-core-asl": { - "locked": "1.9.11" + "locked": "1.9.13" }, "org.codehaus.jackson:jackson-mapper-asl": { - "locked": "1.9.11" + "locked": "1.9.13" } }, "default": { @@ -61,10 +61,10 @@ "locked": "3.2.1" }, "org.codehaus.jackson:jackson-core-asl": { - "locked": "1.9.11" + "locked": "1.9.13" }, "org.codehaus.jackson:jackson-mapper-asl": { - "locked": "1.9.11" + "locked": "1.9.13" } }, "findbugs": { @@ -74,7 +74,7 @@ }, "pmd": { "net.sourceforge.pmd:pmd-java": { - "locked": "5.2.3" + "locked": "5.4.2" } }, "runtime": { @@ -88,10 +88,10 @@ "locked": "3.2.1" }, "org.codehaus.jackson:jackson-core-asl": { - "locked": "1.9.11" + "locked": "1.9.13" }, "org.codehaus.jackson:jackson-mapper-asl": { - "locked": "1.9.11" + "locked": "1.9.13" } }, "testCompile": { @@ -111,10 +111,10 @@ "locked": "4.12" }, "org.codehaus.jackson:jackson-core-asl": { - "locked": "1.9.11" + "locked": "1.9.13" }, "org.codehaus.jackson:jackson-mapper-asl": { - "locked": "1.9.11" + "locked": "1.9.13" } }, "testCompileClasspath": { @@ -134,10 +134,10 @@ "locked": "4.12" }, "org.codehaus.jackson:jackson-core-asl": { - "locked": "1.9.11" + "locked": "1.9.13" }, "org.codehaus.jackson:jackson-mapper-asl": { - "locked": "1.9.11" + "locked": "1.9.13" } }, "testCompileOnly": { @@ -157,10 +157,10 @@ "locked": "4.12" }, "org.codehaus.jackson:jackson-core-asl": { - "locked": "1.9.11" + "locked": "1.9.13" }, "org.codehaus.jackson:jackson-mapper-asl": { - "locked": "1.9.11" + "locked": "1.9.13" } }, "testRuntime": { @@ -180,10 +180,10 @@ "locked": "4.12" }, "org.codehaus.jackson:jackson-core-asl": { - "locked": "1.9.11" + "locked": "1.9.13" }, "org.codehaus.jackson:jackson-mapper-asl": { - "locked": "1.9.11" + "locked": "1.9.13" } } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..eacae00 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +versioneye.projectid=56f0d26335630e0029daff48 \ No newline at end of file diff --git a/src/main/java/com/github/kennedyoliveira/hystrix/contrib/vertx/metricsstream/JsonMappers.java b/src/main/java/com/github/kennedyoliveira/hystrix/contrib/vertx/metricsstream/JsonMappers.java index 12fd025..112a1bd 100644 --- a/src/main/java/com/github/kennedyoliveira/hystrix/contrib/vertx/metricsstream/JsonMappers.java +++ b/src/main/java/com/github/kennedyoliveira/hystrix/contrib/vertx/metricsstream/JsonMappers.java @@ -174,12 +174,7 @@ static String toJson(final HystrixThreadPoolMetrics threadPoolMetrics) throws IO json.writeNumberField("currentTaskCount", threadPoolMetrics.getCurrentTaskCount().longValue()); json.writeNumberField("rollingCountThreadsExecuted", threadPoolMetrics.getRollingCountThreadsExecuted()); json.writeNumberField("rollingMaxActiveThreads", threadPoolMetrics.getRollingMaxActiveThreads()); - safelyWriteNumberField(json, "rollingCountCommandsRejected", new Func0() { - @Override - public Long call() { - return threadPoolMetrics.getRollingCount(HystrixRollingNumberEvent.THREAD_POOL_REJECTED); - } - }); + safelyWriteNumberField(json, "rollingCountCommandsRejected", () -> threadPoolMetrics.getRollingCount(HystrixRollingNumberEvent.THREAD_POOL_REJECTED)); json.writeNumberField("propertyValue_queueSizeRejectionThreshold", threadPoolMetrics.getProperties().queueSizeRejectionThreshold().get()); json.writeNumberField("propertyValue_metricsRollingStatisticalWindowInMilliseconds", threadPoolMetrics.getProperties().metricsRollingStatisticalWindowInMilliseconds().get()); @@ -201,24 +196,9 @@ static String toJson(final HystrixCollapserMetrics collapserMetrics) throws IOEx json.writeStringField("name", key.name()); json.writeNumberField("currentTime", System.currentTimeMillis()); - safelyWriteNumberField(json, "rollingCountRequestsBatched", new Func0() { - @Override - public Long call() { - return collapserMetrics.getRollingCount(HystrixRollingNumberEvent.COLLAPSER_REQUEST_BATCHED); - } - }); - safelyWriteNumberField(json, "rollingCountBatches", new Func0() { - @Override - public Long call() { - return collapserMetrics.getRollingCount(HystrixRollingNumberEvent.COLLAPSER_BATCH); - } - }); - safelyWriteNumberField(json, "rollingCountResponsesFromCache", new Func0() { - @Override - public Long call() { - return collapserMetrics.getRollingCount(HystrixRollingNumberEvent.RESPONSE_FROM_CACHE); - } - }); + safelyWriteNumberField(json, "rollingCountRequestsBatched", () -> collapserMetrics.getRollingCount(HystrixRollingNumberEvent.COLLAPSER_REQUEST_BATCHED)); + safelyWriteNumberField(json, "rollingCountBatches", () -> collapserMetrics.getRollingCount(HystrixRollingNumberEvent.COLLAPSER_BATCH)); + safelyWriteNumberField(json, "rollingCountResponsesFromCache", () -> collapserMetrics.getRollingCount(HystrixRollingNumberEvent.RESPONSE_FROM_CACHE)); // batch size percentiles json.writeNumberField("batchSize_mean", collapserMetrics.getBatchSizeMean());