geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [geode] branch micrometer updated: wIP
Date Thu, 22 Mar 2018 21:33:20 GMT
This is an automated email from the ASF dual-hosted git repository.

udo pushed a commit to branch micrometer
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/micrometer by this push:
     new dbc0bc9  wIP
dbc0bc9 is described below

commit dbc0bc9c45e2964acf5def90242d88cc9d8e3655
Author: Udo <ukohlmeyer@pivotal.io>
AuthorDate: Thu Mar 22 14:33:08 2018 -0700

    wIP
---
 geode-core/build.gradle                                           | 8 ++++----
 .../org/apache/geode/internal/cache/MicroMeterRegistryFactory.kt  | 4 ++--
 geode-protobuf/build.gradle                                       | 4 +++-
 .../v1/operations/ClearRequestOperationHandlerJUnitTest.java      | 5 -----
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 66e4cb5..7075d39 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -41,10 +41,10 @@ dependencies {
     // External
     provided files("${System.getProperty('java.home')}/../lib/tools.jar")
 
-    compile group: 'io.micrometer', name: 'micrometer-core', version: '1.0.1'
-    compile group: 'io.micrometer', name: 'micrometer-registry-atlas', version: '1.0.1'
-    compile group: 'io.micrometer', name: 'micrometer-registry-influx', version: '1.0.1'
-    compile group: 'io.micrometer', name: 'micrometer-registry-jmx', version: '1.0.1'
+    compile group: 'io.micrometer', name: 'micrometer-core', version: '1.0.2'
+    compile group: 'io.micrometer', name: 'micrometer-registry-atlas', version: '1.0.2'
+    compile group: 'io.micrometer', name: 'micrometer-registry-influx', version: '1.0.2'
+    compile group: 'io.micrometer', name: 'micrometer-registry-jmx', version: '1.0.2'
 
     compile group: 'io.pivotal.gemfire', name: 'stats', version: '1.0-SNAPSHOT'
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/MicroMeterRegistryFactory.kt
b/geode-core/src/main/java/org/apache/geode/internal/cache/MicroMeterRegistryFactory.kt
index 96dfa4e..910bf77 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/MicroMeterRegistryFactory.kt
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/MicroMeterRegistryFactory.kt
@@ -3,6 +3,6 @@ package org.apache.geode.internal.cache
 import io.micrometer.core.instrument.MeterRegistry
 
 object MicroMeterRegistryFactory {
-    private val meterRegistry = MicrometerStats().meterRegistry
-    fun getMeterRegistry(): MeterRegistry = meterRegistry
+    private val micrometerStats = MicrometerStats()
+    fun getMeterRegistry(): MeterRegistry = micrometerStats.meterRegistry
 }
\ No newline at end of file
diff --git a/geode-protobuf/build.gradle b/geode-protobuf/build.gradle
index b24103b..9aa9402 100644
--- a/geode-protobuf/build.gradle
+++ b/geode-protobuf/build.gradle
@@ -35,7 +35,7 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
 buildscript {
-    ext.kotlin_version = '1.2.10'
+    ext.kotlin_version = '1.2.30'
     repositories {
         mavenCentral()
     }
@@ -44,6 +44,8 @@ buildscript {
     }
 }
 apply plugin: 'kotlin'
+apply plugin: 'idea'
+
 repositories {
     mavenCentral()
 }
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ClearRequestOperationHandlerJUnitTest.java
b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ClearRequestOperationHandlerJUnitTest.java
index 167ce46..3a0ab38 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ClearRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ClearRequestOperationHandlerJUnitTest.java
@@ -16,9 +16,7 @@ package org.apache.geode.internal.protocol.protobuf.v1.operations;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import org.junit.Before;
@@ -31,12 +29,9 @@ import org.apache.geode.internal.protocol.protobuf.v1.BasicTypes;
 import org.apache.geode.internal.protocol.protobuf.v1.ClientProtocol;
 import org.apache.geode.internal.protocol.protobuf.v1.Failure;
 import org.apache.geode.internal.protocol.protobuf.v1.ProtobufRequestUtilities;
-import org.apache.geode.internal.protocol.protobuf.v1.ProtobufSerializationService;
 import org.apache.geode.internal.protocol.protobuf.v1.RegionAPI;
 import org.apache.geode.internal.protocol.protobuf.v1.Result;
 import org.apache.geode.internal.protocol.protobuf.v1.Success;
-import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.DecodingException;
-import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.EncodingException;
 import org.apache.geode.test.junit.categories.UnitTest;
 
 @Category(UnitTest.class)

-- 
To stop receiving notification emails like this one, please contact
udo@apache.org.

Mime
View raw message