From 845abc6c9c08837fb547accfd4498cfd1ee6962f Mon Sep 17 00:00:00 2001
From: "michele.artini" <michele.artini@isti.cnr.it>
Date: Wed, 8 Jul 2020 10:01:54 +0200
Subject: [PATCH] removed guava

---
 libs/dnet-openaire-broker-common/pom.xml          |  8 --------
 .../dnetlib/broker/objects/OaBrokerInstance.java  | 15 +++++++--------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/libs/dnet-openaire-broker-common/pom.xml b/libs/dnet-openaire-broker-common/pom.xml
index b31045e4..fb749623 100644
--- a/libs/dnet-openaire-broker-common/pom.xml
+++ b/libs/dnet-openaire-broker-common/pom.xml
@@ -13,18 +13,10 @@
 
 	<dependencies>
 
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>18.0</version>
-			<scope>compile</scope>
-		</dependency>
-
 		<!-- Gson -->
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.6.2</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/libs/dnet-openaire-broker-common/src/main/java/eu/dnetlib/broker/objects/OaBrokerInstance.java b/libs/dnet-openaire-broker-common/src/main/java/eu/dnetlib/broker/objects/OaBrokerInstance.java
index 69cfcaea..3d665893 100644
--- a/libs/dnet-openaire-broker-common/src/main/java/eu/dnetlib/broker/objects/OaBrokerInstance.java
+++ b/libs/dnet-openaire-broker-common/src/main/java/eu/dnetlib/broker/objects/OaBrokerInstance.java
@@ -1,8 +1,7 @@
 package eu.dnetlib.broker.objects;
 
 import java.io.Serializable;
-
-import com.google.common.base.Objects;
+import java.util.Objects;
 
 /**
  * Created by claudio on 22/07/16.
@@ -56,16 +55,16 @@ public class OaBrokerInstance implements Serializable {
 
 	@Override
 	public int hashCode() {
-		return Objects.hashCode(getUrl(), getLicense(), getHostedby(), getInstancetype());
+		return Objects.hash(hostedby, instancetype, license, url);
 	}
 
 	@Override
 	public boolean equals(final Object obj) {
+		if (this == obj) { return true; }
 		if (!(obj instanceof OaBrokerInstance)) { return false; }
-		final OaBrokerInstance that = (OaBrokerInstance) obj;
-		return Objects.equal(getUrl(), that.getUrl()) &&
-				Objects.equal(getLicense(), that.getLicense()) &&
-				Objects.equal(getHostedby(), that.getHostedby()) &&
-				Objects.equal(getInstancetype(), that.getInstancetype());
+		final OaBrokerInstance other = (OaBrokerInstance) obj;
+		return Objects.equals(hostedby, other.hostedby) && Objects.equals(instancetype, other.instancetype) && Objects.equals(license, other.license)
+			&& Objects.equals(url, other.url);
 	}
+
 }