Updated dependencies

kairosdb · Mar 22, 2024 · cc6a699 · cc6a699
1 parent ecc845b
commit cc6a699
Show file tree

Hide file tree

Showing 9 changed files with 186 additions and 133 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.kairosdb</groupId>
 	<artifactId>client</artifactId>
-	<version>3.0.1</version>
+	<version>3.1.0</version>
 	<packaging>jar</packaging>
 
 
@@ -47,18 +47,12 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>25.1-jre</version>
-		</dependency>
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-library</artifactId>
-			<version>1.3</version>
-			<scope>test</scope>
+			<version>33.1.0-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>4.5.8</version>
+			<version>4.5.14</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-lang</groupId>
@@ -68,7 +62,7 @@
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.5</version>
+			<version>2.9.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.findbugs</groupId>
@@ -80,26 +74,45 @@
 			<artifactId>bval-jsr303</artifactId>
 			<version>0.5</version>
 		</dependency>
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.9.1</version>
+		</dependency>
 
 		<!-- Test -->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.11</version>
+			<version>4.13.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>2.8.0</version>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>3.21.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>1.5.3</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>1.5.3</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.kairosdb</groupId>
 			<artifactId>kairosdb</artifactId>
-			<version>1.2.1-1</version>
+			<version>1.3.0-1</version>
 			<scope>test</scope>
 		</dependency>
 
+
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
@@ -116,14 +129,14 @@
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-util</artifactId>
-			<version>8.1.6.v20120903</version>
+			<version>12.0.5</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-io</artifactId>
-			<version>8.1.6.v20120903</version>
+			<version>12.0.5</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -162,14 +175,14 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.5.1</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>11</source>
+					<target>11</target>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.7.7.201606060606</version>
+				<version>0.8.11</version>
 				<executions>
 					<execution>
 						<id>prepare-agent</id>
@@ -190,7 +203,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>2.2.1</version>
+				<version>3.3.0</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -203,7 +216,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.9.1</version>
+				<version>3.6.3</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -217,7 +230,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-gpg-plugin</artifactId>
-				<version>1.6</version>
+				<version>3.2.1</version>
 				<executions>
 					<execution>
 						<id>sign-artifacts</id>
@@ -232,7 +245,7 @@
 			<plugin>
 				<groupId>org.sonatype.plugins</groupId>
 				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.2</version>
+				<version>1.6.13</version>
 				<extensions>true</extensions>
 				<configuration>
 					<serverId>ossrh</serverId>
@@ -244,7 +257,7 @@
 			<plugin>
 				<groupId>org.basepom.maven</groupId>
 				<artifactId>duplicate-finder-maven-plugin</artifactId>
-				<version>1.3.0</version>
+				<version>2.0.1</version>
 				<configuration>
 					<checkCompileClasspath>true</checkCompileClasspath>
 					<checkRuntimeClasspath>true</checkRuntimeClasspath>

diff --git a/src/main/java/org/kairosdb/client/builder/grouper/BinGrouper.java b/src/main/java/org/kairosdb/client/builder/grouper/BinGrouper.java
@@ -5,6 +5,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 import static java.util.Objects.requireNonNull;
 import static org.kairosdb.client.util.Preconditions.checkArgument;
@@ -14,46 +15,44 @@ public class BinGrouper extends Grouper
 {
 
 	@SerializedName("bins")
-	private Double[] bins;
+	private List<Double> bins;
 
 	public BinGrouper(Double... bins)
 	{
 		super("bin");
 
 		requireNonNull(bins, "bins cannot be null");
 		checkArgument(bins.length > 0, "bins cannot be empty");
-		this.bins = bins;
+		this.bins = Arrays.asList(bins);
 	}
 
 	public BinGrouper(List<Double> bins)
 	{
 		super("bin");
 		requireNonNull(bins, "bins cannot be null");
 		checkArgument(bins.size() > 0, "bins cannot be empty");
-		this.bins = (Double[]) bins.toArray();
+		this.bins = bins;
 	}
 
 	public List<Double> getBins()
 	{
-		return Arrays.asList(bins);
+		return bins;
 	}
 
+
 	@Override
 	public boolean equals(Object o)
 	{
 		if (this == o) return true;
 		if (o == null || getClass() != o.getClass()) return false;
 		if (!super.equals(o)) return false;
-
 		BinGrouper that = (BinGrouper) o;
-		return Arrays.equals(bins, that.bins);
+		return Objects.equals(bins, that.bins);
 	}
 
 	@Override
 	public int hashCode()
 	{
-		int result = super.hashCode();
-		result = 31 * result + Arrays.hashCode(bins);
-		return result;
+		return Objects.hash(super.hashCode(), bins);
 	}
 }
diff --git a/src/main/java/org/kairosdb/client/response/ResponseHelper.java b/src/main/java/org/kairosdb/client/response/ResponseHelper.java
@@ -1,9 +1,8 @@
 package org.kairosdb.client.response;
 
-import com.google.common.collect.ImmutableListMultimap;
+import org.apache.commons.lang.NotImplementedException;
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 import java.io.IOException;
 import java.io.InputStream;