Cleanup

Author: artem-v

metrics/src/main/java/io/scalecube/metrics/PropertiesRegistry.java

@@ -66,55 +66,57 @@ public void put(String name, Object value) {
    *
    * @param countersReader countersReader
    * @param name property name
-   * @return property value, or {@code null} if not found
+   * @return property value, or {@code null} if not found or malformed, or throws exception if
+   *     unparsable
    */
-  public static Integer getIntProperty(CountersReader countersReader, String name) {
-    return getProperty(countersReader, name, Integer::parseInt);
+  public static Integer getInt(CountersReader countersReader, String name) {
+    return get(countersReader, name, Integer::parseInt);
   }
 
   /**
    * Retrieves {@link Long} property.
    *
    * @param countersReader countersReader
    * @param name property name
-   * @return property value, or {@code null} if not found
+   * @return property value, or {@code null} if not found or malformed, or throws exception if
+   *     unparsable
    */
-  public static Long getLongProperty(CountersReader countersReader, String name) {
-    return getProperty(countersReader, name, Long::parseLong);
+  public static Long getLong(CountersReader countersReader, String name) {
+    return get(countersReader, name, Long::parseLong);
   }
 
   /**
    * Retrieves enum property.
    *
    * @param countersReader countersReader
    * @param name property name
-   * @return property value, or {@code null} if not found
+   * @return property value, or {@code null} if not found or malformed
    */
-  public static <T extends Enum<T>> T getEnumProperty(
+  public static <T extends Enum<T>> T getEnum(
       CountersReader countersReader, String name, Function<String, T> enumFunc) {
-    return getProperty(countersReader, name, enumFunc);
+    return get(countersReader, name, enumFunc);
   }
 
   /**
    * Retrieves {@link Boolean} property.
    *
    * @param countersReader countersReader
    * @param name property name
-   * @return property value, or {@code null} if not found
+   * @return property value, or {@code null} if not found or malformed
    */
-  public static Boolean getBooleanProperty(CountersReader countersReader, String name) {
-    return getProperty(countersReader, name, Boolean::parseBoolean);
+  public static Boolean getBoolean(CountersReader countersReader, String name) {
+    return get(countersReader, name, Boolean::parseBoolean);
   }
 
   /**
    * Retrieves {@link String} property.
    *
    * @param countersReader countersReader
    * @param name property name
-   * @return property value, or {@code null} if not found
+   * @return property value, or {@code null} if not found or malformed
    */
-  public static String getProperty(CountersReader countersReader, String name) {
-    return getProperty(countersReader, name, s -> s);
+  public static String getString(CountersReader countersReader, String name) {
+    return get(countersReader, name, s -> s);
   }
 
   /**
@@ -124,9 +126,9 @@ public static String getProperty(CountersReader countersReader, String name) {
    * @param name property name
    * @param converter function to convert string value
    * @param <T> result type
-   * @return converted property value, or {@code null} if not found
+   * @return converted property value, or {@code null} if not found or malformed
    */
-  public static <T> T getProperty(
+  public static <T> T get(
       CountersReader countersReader, String name, Function<String, T> converter) {
     final var counter = CounterDescriptor.findFirstCounter(countersReader, byPropertyName(name));
     if (counter == null) {

metrics/src/test/java/io/scalecube/metrics/PropertiesRegistryTest.java

@@ -33,45 +33,43 @@ void stringProperty() {
     final var value = UUID.randomUUID();
     final var name = "string_property";
     propertiesRegistry.put(name, value);
-    assertEquals(value.toString(), PropertiesRegistry.getProperty(countersManager, name));
+    assertEquals(value.toString(), PropertiesRegistry.getString(countersManager, name));
   }
 
   @Test
   void intProperty() {
     final String name = "int_property";
     int value = 123456789;
     propertiesRegistry.put(name, value);
-    assertEquals(Integer.valueOf(value), PropertiesRegistry.getIntProperty(countersManager, name));
+    assertEquals(Integer.valueOf(value), PropertiesRegistry.getInt(countersManager, name));
   }
 
   @Test
   void longProperty() {
     final String name = "long_property";
     long value = 9876543210L;
     propertiesRegistry.put(name, value);
-    assertEquals(Long.valueOf(value), PropertiesRegistry.getLongProperty(countersManager, name));
+    assertEquals(Long.valueOf(value), PropertiesRegistry.getLong(countersManager, name));
   }
 
   @Test
   void enumProperty() {
     final String name = "enum_property";
     SampleEnum value = SampleEnum.B;
     propertiesRegistry.put(name, value);
-    SampleEnum result =
-        PropertiesRegistry.getEnumProperty(countersManager, name, SampleEnum::valueOf);
+    SampleEnum result = PropertiesRegistry.getEnum(countersManager, name, SampleEnum::valueOf);
     assertEquals(value, result);
   }
 
   @Test
   void unknownPropertyReturnsNull() {
-    assertNull(PropertiesRegistry.getProperty(countersManager, "nonexistent"));
-    assertNull(PropertiesRegistry.getIntProperty(countersManager, "nonexistent"));
-    assertNull(PropertiesRegistry.getIntProperty(countersManager, "nonexistent"));
-    assertNull(PropertiesRegistry.getIntProperty(countersManager, "nonexistent"));
-    assertNull(PropertiesRegistry.getLongProperty(countersManager, "nonexistent"));
-    assertNull(PropertiesRegistry.getBooleanProperty(countersManager, "nonexistent"));
-    assertNull(
-        PropertiesRegistry.getEnumProperty(countersManager, "nonexistent", SampleEnum::valueOf));
+    assertNull(PropertiesRegistry.getString(countersManager, "nonexistent"));
+    assertNull(PropertiesRegistry.getInt(countersManager, "nonexistent"));
+    assertNull(PropertiesRegistry.getInt(countersManager, "nonexistent"));
+    assertNull(PropertiesRegistry.getInt(countersManager, "nonexistent"));
+    assertNull(PropertiesRegistry.getLong(countersManager, "nonexistent"));
+    assertNull(PropertiesRegistry.getBoolean(countersManager, "nonexistent"));
+    assertNull(PropertiesRegistry.getEnum(countersManager, "nonexistent", SampleEnum::valueOf));
   }
 
   enum SampleEnum {