Skip to content

Replace Guava's Objects util with JDK's equivalents #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
exoego merged 1 commit into from
Jan 27, 2023
Merged

Replace Guava's Objects util with JDK's equivalents #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/java/com/treasuredata/client/model/TDColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.RuntimeJsonMappingException;
import com.google.common.base.Objects;
import org.json.simple.JSONArray;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
Expand All @@ -33,6 +32,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;

import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Objects.requireNonNull;
Expand Down Expand Up @@ -169,15 +169,15 @@ public boolean equals(Object obj)
return false;
}
TDColumn other = (TDColumn) obj;
return Objects.equal(this.name, other.name) &&
Objects.equal(type, other.type) &&
return Objects.equals(this.name, other.name) &&
Objects.equals(type, other.type) &&
Arrays.equals(key, other.key);
}

@Override
public int hashCode()
{
return Objects.hashCode(name, type, Arrays.hashCode(key));
return Objects.hash(name, type, Arrays.hashCode(key));
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/treasuredata/client/model/TDDatabase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Objects;

import java.util.Objects;
import java.util.Optional;

@JsonCollectionRootName(value = "databases")
Expand Down Expand Up @@ -112,12 +112,12 @@ public boolean equals(Object obj)
return false;
}
TDDatabase other = (TDDatabase) obj;
return Objects.equal(this.name, other.name);
return Objects.equals(this.name, other.name);
}

@Override
public int hashCode()
{
return Objects.hashCode(name);
return Objects.hash(name);
}
}
10 changes: 5 additions & 5 deletions src/main/java/com/treasuredata/client/model/TDTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Objects;

import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

public class TDTable
Expand Down Expand Up @@ -136,15 +136,15 @@ public boolean equals(Object obj)
return false;
}
TDTable other = (TDTable) obj;
return Objects.equal(this.name, other.name) &&
Objects.equal(this.type, other.type) &&
Objects.equal(this.columns, other.columns);
return Objects.equals(this.name, other.name) &&
Objects.equals(this.type, other.type) &&
Objects.equals(this.columns, other.columns);
}

@Override
public int hashCode()
{
return Objects.hashCode(name, type, columns);
return Objects.hash(name, type, columns);
}

@Override
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/treasuredata/client/model/TDTableDistribution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Objects;

import java.util.List;
import java.util.Objects;

/**
* TDTableDistribution provides the information about custom partitioning of the table.
Expand Down Expand Up @@ -72,16 +72,16 @@ public boolean equals(Object obj)
return false;
}
TDTableDistribution other = (TDTableDistribution) obj;
return Objects.equal(this.userTableId, other.userTableId) &&
Objects.equal(this.bucketCount, other.bucketCount) &&
Objects.equal(this.partitionFunction, other.partitionFunction) &&
Objects.equal(this.columns, other.columns);
return Objects.equals(this.userTableId, other.userTableId) &&
Objects.equals(this.bucketCount, other.bucketCount) &&
Objects.equals(this.partitionFunction, other.partitionFunction) &&
Objects.equals(this.columns, other.columns);
}

@Override
public int hashCode()
{
return Objects.hashCode(userTableId, bucketCount, partitionFunction);
return Objects.hash(userTableId, bucketCount, partitionFunction);
}

@Override
Expand Down