Remove commons-lang3 from the dependencies

ZeroOne3010 · Aug 2, 2018 · 82ffb9b · 82ffb9b
1 parent 1062d76
commit 82ffb9b
Show file tree

Hide file tree

Showing 30 changed files with 68 additions and 101 deletions.
diff --git a/pom.xml b/pom.xml
@@ -70,11 +70,6 @@
             <artifactId>jackson-databind</artifactId>
             <version>2.9.6</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.7</version>
-        </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>

diff --git a/src/main/java/com/github/zeroone3010/yahueapi/State.java b/src/main/java/com/github/zeroone3010/yahueapi/State.java
@@ -4,13 +4,14 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.awt.Color;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 @JsonInclude(Include.NON_NULL)
@@ -179,8 +180,21 @@ private static double gammaCorrection(float component) {
   }
 
   @Override
-  public boolean equals(Object obj) {
-    return EqualsBuilder.reflectionEquals(this, obj);
+  public boolean equals(final Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    final State state = (State) o;
+    return Objects.equals(on, state.on) &&
+        Objects.equals(hue, state.hue) &&
+        Objects.equals(sat, state.sat) &&
+        Objects.equals(bri, state.bri) &&
+        Objects.equals(ct, state.ct) &&
+        Objects.equals(xy, state.xy);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(on, hue, sat, bri, ct, xy);
   }
 
   private static final class XAndYAndBrightness {
@@ -207,7 +221,11 @@ int getBrightness() {
 
     @Override
     public String toString() {
-      return ToStringBuilder.reflectionToString(this);
+      try {
+        return new ObjectMapper().writeValueAsString(this);
+      } catch (final JsonProcessingException e) {
+        throw new RuntimeException(e);
+      }
     }
   }
 }
diff --git a/src/main/java/com/github/zeroone3010/yahueapi/domain/Action.java b/src/main/java/com/github/zeroone3010/yahueapi/domain/Action.java
@@ -1,8 +1,5 @@
 package com.github.zeroone3010.yahueapi.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
 import java.util.List;
 
 public class Action {
@@ -90,6 +87,6 @@ public void setColormode(String colormode) {
 
   @Override
   public String toString() {
-    return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    return JsonStringUtil.toJsonString(this);
   }
 }
diff --git a/src/main/java/com/github/zeroone3010/yahueapi/domain/ApiInitializationError.java b/src/main/java/com/github/zeroone3010/yahueapi/domain/ApiInitializationError.java
@@ -1,8 +1,5 @@
 package com.github.zeroone3010.yahueapi.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
 public class ApiInitializationError {
   private int type;
   private String address;
@@ -34,6 +31,6 @@ public void setDescription(String description) {
 
   @Override
   public String toString() {
-    return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    return JsonStringUtil.toJsonString(this);
   }
 }
diff --git a/src/main/java/com/github/zeroone3010/yahueapi/domain/ApiInitializationStatus.java b/src/main/java/com/github/zeroone3010/yahueapi/domain/ApiInitializationStatus.java
@@ -1,8 +1,5 @@
 package com.github.zeroone3010.yahueapi.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
 public class ApiInitializationStatus {
   private ApiInitializationError error;
   private ApiInitializationSuccess success;
@@ -25,6 +22,6 @@ public void setSuccess(ApiInitializationSuccess success) {
 
   @Override
   public String toString() {
-    return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    return JsonStringUtil.toJsonString(this);
   }
 }
diff --git a/src/main/java/com/github/zeroone3010/yahueapi/domain/ApiInitializationSuccess.java b/src/main/java/com/github/zeroone3010/yahueapi/domain/ApiInitializationSuccess.java
@@ -1,8 +1,5 @@
 package com.github.zeroone3010.yahueapi.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
 public class ApiInitializationSuccess {
   private String username;
 
@@ -16,6 +13,6 @@ public void setUsername(String username) {
 
   @Override
   public String toString() {
-    return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    return JsonStringUtil.toJsonString(this);
   }
 }
diff --git a/src/main/java/com/github/zeroone3010/yahueapi/domain/BridgeConfig.java b/src/main/java/com/github/zeroone3010/yahueapi/domain/BridgeConfig.java
@@ -1,8 +1,6 @@
 package com.github.zeroone3010.yahueapi.domain;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.Map;
 
@@ -68,6 +66,6 @@ public class BridgeConfig {
 
     @Override
     public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+        return JsonStringUtil.toJsonString(this);
     }
 }
diff --git a/src/main/java/com/github/zeroone3010/yahueapi/domain/ComponentSoftwareUpdate.java b/src/main/java/com/github/zeroone3010/yahueapi/domain/ComponentSoftwareUpdate.java
@@ -1,8 +1,5 @@
 package com.github.zeroone3010.yahueapi.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
 public class ComponentSoftwareUpdate {
     private String state;
     private String lastinstall;
@@ -25,6 +22,6 @@ public void setLastinstall(String lastinstall) {
 
     @Override
     public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+        return JsonStringUtil.toJsonString(this);
     }
 }
diff --git a/src/main/java/com/github/zeroone3010/yahueapi/domain/ConfigBackup.java b/src/main/java/com/github/zeroone3010/yahueapi/domain/ConfigBackup.java
@@ -1,8 +1,6 @@
 package com.github.zeroone3010.yahueapi.domain;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 public class ConfigBackup {
     @JsonProperty("status")
@@ -12,6 +10,6 @@ public class ConfigBackup {
 
     @Override
     public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+        return JsonStringUtil.toJsonString(this);
     }
 }
diff --git a/src/main/java/com/github/zeroone3010/yahueapi/domain/ConfigSoftwareUpdate.java b/src/main/java/com/github/zeroone3010/yahueapi/domain/ConfigSoftwareUpdate.java
@@ -1,8 +1,6 @@
 package com.github.zeroone3010.yahueapi.domain;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 public class ConfigSoftwareUpdate {
     @JsonProperty("updatestate")
@@ -20,6 +18,6 @@ public class ConfigSoftwareUpdate {
 
     @Override
     public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+        return JsonStringUtil.toJsonString(this);
     }
 }
diff --git a/src/main/java/com/github/zeroone3010/yahueapi/domain/ConfigSoftwareUpdate2.java b/src/main/java/com/github/zeroone3010/yahueapi/domain/ConfigSoftwareUpdate2.java
@@ -1,8 +1,6 @@
 package com.github.zeroone3010.yahueapi.domain;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 public class ConfigSoftwareUpdate2 {
     @JsonProperty("checkforupdate")
@@ -18,6 +16,6 @@ public class ConfigSoftwareUpdate2 {
 
     @Override
     public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+        return JsonStringUtil.toJsonString(this);
     }
 }
diff --git a/src/main/java/com/github/zeroone3010/yahueapi/domain/ConfigSoftwareUpdate2AutoInstall.java b/src/main/java/com/github/zeroone3010/yahueapi/domain/ConfigSoftwareUpdate2AutoInstall.java
@@ -1,8 +1,6 @@
 package com.github.zeroone3010.yahueapi.domain;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 public class ConfigSoftwareUpdate2AutoInstall {
     @JsonProperty("updatetime")
@@ -12,6 +10,6 @@ public class ConfigSoftwareUpdate2AutoInstall {
 
     @Override
     public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+        return JsonStringUtil.toJsonString(this);
     }
 }
diff --git a/src/main/java/com/github/zeroone3010/yahueapi/domain/ConfigSoftwareUpdate2Bridge.java b/src/main/java/com/github/zeroone3010/yahueapi/domain/ConfigSoftwareUpdate2Bridge.java
@@ -1,8 +1,6 @@
 package com.github.zeroone3010.yahueapi.domain;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 public class ConfigSoftwareUpdate2Bridge {
     @JsonProperty("state")
@@ -12,6 +10,6 @@ public class ConfigSoftwareUpdate2Bridge {
 
     @Override
     public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+        return JsonStringUtil.toJsonString(this);
     }
 }
diff --git a/src/main/java/com/github/zeroone3010/yahueapi/domain/DeviceTypes.java b/src/main/java/com/github/zeroone3010/yahueapi/domain/DeviceTypes.java
@@ -1,8 +1,6 @@
 package com.github.zeroone3010.yahueapi.domain;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.List;
 
@@ -16,6 +14,6 @@ public class DeviceTypes {
 
     @Override
     public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+        return JsonStringUtil.toJsonString(this);
     }
 }
diff --git a/src/main/java/com/github/zeroone3010/yahueapi/domain/EntertainmentStream.java b/src/main/java/com/github/zeroone3010/yahueapi/domain/EntertainmentStream.java
@@ -1,8 +1,6 @@
 package com.github.zeroone3010.yahueapi.domain;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 public class EntertainmentStream {
     @JsonProperty("proxymode")
@@ -16,6 +14,6 @@ public class EntertainmentStream {
 
     @Override
     public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+        return JsonStringUtil.toJsonString(this);
     }
 }
diff --git a/src/main/java/com/github/zeroone3010/yahueapi/domain/Group.java b/src/main/java/com/github/zeroone3010/yahueapi/domain/Group.java
@@ -1,8 +1,6 @@
 package com.github.zeroone3010.yahueapi.domain;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.List;
 import java.util.Map;
@@ -102,6 +100,6 @@ public void setLocations(Map<String, List<Integer>> locations) {
 
     @Override
     public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+        return JsonStringUtil.toJsonString(this);
     }
 }
diff --git a/src/main/java/com/github/zeroone3010/yahueapi/domain/GroupState.java b/src/main/java/com/github/zeroone3010/yahueapi/domain/GroupState.java
@@ -1,8 +1,6 @@
 package com.github.zeroone3010.yahueapi.domain;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 public class GroupState {
     @JsonProperty("all_on")
@@ -28,6 +26,6 @@ public void setAnyOn(boolean anyOn) {
 
     @Override
     public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+        return JsonStringUtil.toJsonString(this);
     }
 }
diff --git a/src/main/java/com/github/zeroone3010/yahueapi/domain/InternetServices.java b/src/main/java/com/github/zeroone3010/yahueapi/domain/InternetServices.java
@@ -1,8 +1,6 @@
 package com.github.zeroone3010.yahueapi.domain;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 public class InternetServices {
     @JsonProperty("internet")
@@ -16,6 +14,6 @@ public class InternetServices {
 
     @Override
     public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+        return JsonStringUtil.toJsonString(this);
     }
 }
diff --git a/src/main/java/com/github/zeroone3010/yahueapi/domain/JsonStringUtil.java b/src/main/java/com/github/zeroone3010/yahueapi/domain/JsonStringUtil.java
@@ -0,0 +1,18 @@
+package com.github.zeroone3010.yahueapi.domain;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+final class JsonStringUtil {
+  private static final ObjectMapper objectMapper = new ObjectMapper();
+
+  private JsonStringUtil() { /* prevent */ }
+
+  static String toJsonString(final Object object) {
+    try {
+      return objectMapper.writeValueAsString(object);
+    } catch (final JsonProcessingException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/src/main/java/com/github/zeroone3010/yahueapi/domain/Light.java b/src/main/java/com/github/zeroone3010/yahueapi/domain/Light.java
@@ -1,8 +1,6 @@
 package com.github.zeroone3010.yahueapi.domain;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.Map;
 
@@ -128,6 +126,6 @@ public void setConfig(LightConfig config) {
 
   @Override
   public String toString() {
-    return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    return JsonStringUtil.toJsonString(this);
   }
 }
diff --git a/src/main/java/com/github/zeroone3010/yahueapi/domain/LightConfig.java b/src/main/java/com/github/zeroone3010/yahueapi/domain/LightConfig.java
@@ -1,8 +1,5 @@
 package com.github.zeroone3010.yahueapi.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
 public class LightConfig {
   private String archetype;
   private String function;
@@ -34,6 +31,6 @@ public void setDirection(String direction) {
 
   @Override
   public String toString() {
-    return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    return JsonStringUtil.toJsonString(this);
   }
 }