Skip to content

Commit ec0e5da

Browse files
kennedyoliveirakennedyoliveira
committed
updating dependencies
1 parent 9e9c2e1 commit ec0e5da

File tree

5 files changed

+35
-50
lines changed

5 files changed

+35
-50
lines changed

‎build.gradle

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
buildscript {
22
repositories { jcenter() }
33
dependencies {
4-
classpath 'com.netflix.nebula:nebula-publishing-plugin:4.4.4'
4+
classpath 'com.netflix.nebula:nebula-publishing-plugin:4.7.0'
55
}
66
}
77

88
plugins {
9-
id 'nebula.dependency-recommender' version '3.1.0'
10-
id 'nebula.dependency-lock' version '4.2.0'
9+
id 'nebula.dependency-recommender' version '3.3.0'
10+
id 'nebula.dependency-lock' version '4.3.0'
1111
id 'nebula.nebula-release' version '4.0.1'
1212
id 'nebula.contacts' version '3.0.1'
13-
id 'nebula.info' version '3.0.3'
14-
id 'nebula.nebula-bintray' version '3.3.4'
13+
id 'nebula.info' version '3.1.0'
14+
id 'nebula.nebula-bintray' version '3.4.0'
1515
id "org.standardout.versioneye" version '1.4.0'
1616
}
1717

@@ -30,6 +30,10 @@ apply plugin: 'build-dashboard'
3030
group 'com.github.kennedyoliveira'
3131
description = 'Implementation of a Metrics Event Stream using Vert.x'
3232

33+
pmd {
34+
toolVersion = '5.4.2'
35+
}
36+
3337
def recomendationsFile = rootProject.file('dependencies-version.properties')
3438

3539
dependencyRecommendations {

‎dependencies-version.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ VERTX_VERSION=3.2.+
55
com.netflix.hystrix:hystrix-core=$HYSTRIX_VERSION
66

77
# Json Deps
8-
org.codehaus.jackson:jackson-core-asl=1.9.+
9-
org.codehaus.jackson:jackson-mapper-asl=1.9.+
8+
org.codehaus.jackson:jackson-core-asl= 1.9.13
9+
org.codehaus.jackson:jackson-mapper-asl= 1.9.13
1010

1111
# Vert.x
1212
io.vertx:vertx-core=$VERTX_VERSION

‎dependencies.lock

+19-19
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
"locked": "3.2.1"
1111
},
1212
"org.codehaus.jackson:jackson-core-asl": {
13-
"locked": "1.9.11"
13+
"locked": "1.9.13"
1414
},
1515
"org.codehaus.jackson:jackson-mapper-asl": {
16-
"locked": "1.9.11"
16+
"locked": "1.9.13"
1717
}
1818
},
1919
"compileClasspath": {
@@ -27,10 +27,10 @@
2727
"locked": "3.2.1"
2828
},
2929
"org.codehaus.jackson:jackson-core-asl": {
30-
"locked": "1.9.11"
30+
"locked": "1.9.13"
3131
},
3232
"org.codehaus.jackson:jackson-mapper-asl": {
33-
"locked": "1.9.11"
33+
"locked": "1.9.13"
3434
}
3535
},
3636
"compileOnly": {
@@ -44,10 +44,10 @@
4444
"locked": "3.2.1"
4545
},
4646
"org.codehaus.jackson:jackson-core-asl": {
47-
"locked": "1.9.11"
47+
"locked": "1.9.13"
4848
},
4949
"org.codehaus.jackson:jackson-mapper-asl": {
50-
"locked": "1.9.11"
50+
"locked": "1.9.13"
5151
}
5252
},
5353
"default": {
@@ -61,10 +61,10 @@
6161
"locked": "3.2.1"
6262
},
6363
"org.codehaus.jackson:jackson-core-asl": {
64-
"locked": "1.9.11"
64+
"locked": "1.9.13"
6565
},
6666
"org.codehaus.jackson:jackson-mapper-asl": {
67-
"locked": "1.9.11"
67+
"locked": "1.9.13"
6868
}
6969
},
7070
"findbugs": {
@@ -74,7 +74,7 @@
7474
},
7575
"pmd": {
7676
"net.sourceforge.pmd:pmd-java": {
77-
"locked": "5.2.3"
77+
"locked": "5.4.2"
7878
}
7979
},
8080
"runtime": {
@@ -88,10 +88,10 @@
8888
"locked": "3.2.1"
8989
},
9090
"org.codehaus.jackson:jackson-core-asl": {
91-
"locked": "1.9.11"
91+
"locked": "1.9.13"
9292
},
9393
"org.codehaus.jackson:jackson-mapper-asl": {
94-
"locked": "1.9.11"
94+
"locked": "1.9.13"
9595
}
9696
},
9797
"testCompile": {
@@ -111,10 +111,10 @@
111111
"locked": "4.12"
112112
},
113113
"org.codehaus.jackson:jackson-core-asl": {
114-
"locked": "1.9.11"
114+
"locked": "1.9.13"
115115
},
116116
"org.codehaus.jackson:jackson-mapper-asl": {
117-
"locked": "1.9.11"
117+
"locked": "1.9.13"
118118
}
119119
},
120120
"testCompileClasspath": {
@@ -134,10 +134,10 @@
134134
"locked": "4.12"
135135
},
136136
"org.codehaus.jackson:jackson-core-asl": {
137-
"locked": "1.9.11"
137+
"locked": "1.9.13"
138138
},
139139
"org.codehaus.jackson:jackson-mapper-asl": {
140-
"locked": "1.9.11"
140+
"locked": "1.9.13"
141141
}
142142
},
143143
"testCompileOnly": {
@@ -157,10 +157,10 @@
157157
"locked": "4.12"
158158
},
159159
"org.codehaus.jackson:jackson-core-asl": {
160-
"locked": "1.9.11"
160+
"locked": "1.9.13"
161161
},
162162
"org.codehaus.jackson:jackson-mapper-asl": {
163-
"locked": "1.9.11"
163+
"locked": "1.9.13"
164164
}
165165
},
166166
"testRuntime": {
@@ -180,10 +180,10 @@
180180
"locked": "4.12"
181181
},
182182
"org.codehaus.jackson:jackson-core-asl": {
183-
"locked": "1.9.11"
183+
"locked": "1.9.13"
184184
},
185185
"org.codehaus.jackson:jackson-mapper-asl": {
186-
"locked": "1.9.11"
186+
"locked": "1.9.13"
187187
}
188188
}
189189
}

‎gradle.properties

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
versioneye.projectid=56f0d26335630e0029daff48

‎src/main/java/com/github/kennedyoliveira/hystrix/contrib/vertx/metricsstream/JsonMappers.java

+4-24
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,7 @@ static String toJson(final HystrixThreadPoolMetrics threadPoolMetrics) throws IO
174174
json.writeNumberField("currentTaskCount", threadPoolMetrics.getCurrentTaskCount().longValue());
175175
json.writeNumberField("rollingCountThreadsExecuted", threadPoolMetrics.getRollingCountThreadsExecuted());
176176
json.writeNumberField("rollingMaxActiveThreads", threadPoolMetrics.getRollingMaxActiveThreads());
177-
safelyWriteNumberField(json, "rollingCountCommandsRejected", new Func0<Long>() {
178-
@Override
179-
public Long call() {
180-
return threadPoolMetrics.getRollingCount(HystrixRollingNumberEvent.THREAD_POOL_REJECTED);
181-
}
182-
});
177+
safelyWriteNumberField(json, "rollingCountCommandsRejected", () -> threadPoolMetrics.getRollingCount(HystrixRollingNumberEvent.THREAD_POOL_REJECTED));
183178
json.writeNumberField("propertyValue_queueSizeRejectionThreshold", threadPoolMetrics.getProperties().queueSizeRejectionThreshold().get());
184179
json.writeNumberField("propertyValue_metricsRollingStatisticalWindowInMilliseconds", threadPoolMetrics.getProperties().metricsRollingStatisticalWindowInMilliseconds().get());
185180

@@ -201,24 +196,9 @@ static String toJson(final HystrixCollapserMetrics collapserMetrics) throws IOEx
201196
json.writeStringField("name", key.name());
202197
json.writeNumberField("currentTime", System.currentTimeMillis());
203198

204-
safelyWriteNumberField(json, "rollingCountRequestsBatched", new Func0<Long>() {
205-
@Override
206-
public Long call() {
207-
return collapserMetrics.getRollingCount(HystrixRollingNumberEvent.COLLAPSER_REQUEST_BATCHED);
208-
}
209-
});
210-
safelyWriteNumberField(json, "rollingCountBatches", new Func0<Long>() {
211-
@Override
212-
public Long call() {
213-
return collapserMetrics.getRollingCount(HystrixRollingNumberEvent.COLLAPSER_BATCH);
214-
}
215-
});
216-
safelyWriteNumberField(json, "rollingCountResponsesFromCache", new Func0<Long>() {
217-
@Override
218-
public Long call() {
219-
return collapserMetrics.getRollingCount(HystrixRollingNumberEvent.RESPONSE_FROM_CACHE);
220-
}
221-
});
199+
safelyWriteNumberField(json, "rollingCountRequestsBatched", () -> collapserMetrics.getRollingCount(HystrixRollingNumberEvent.COLLAPSER_REQUEST_BATCHED));
200+
safelyWriteNumberField(json, "rollingCountBatches", () -> collapserMetrics.getRollingCount(HystrixRollingNumberEvent.COLLAPSER_BATCH));
201+
safelyWriteNumberField(json, "rollingCountResponsesFromCache", () -> collapserMetrics.getRollingCount(HystrixRollingNumberEvent.RESPONSE_FROM_CACHE));
222202

223203
// batch size percentiles
224204
json.writeNumberField("batchSize_mean", collapserMetrics.getBatchSizeMean());

0 commit comments

Comments
 (0)