Skip to content

Remove usage of deprecated Objects.toStringHelper #1209

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
KostyaSha merged 1 commit into from
Jul 10, 2019
Merged

Remove usage of deprecated Objects.toStringHelper #1209

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
4 changes: 2 additions & 2 deletions src/main/java/com/github/dockerjava/api/model/Identifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.dockerjava.api.model;

import com.google.common.base.Objects;
import com.google.common.base.MoreObjects;
import com.google.common.base.Optional;

import java.io.Serializable;
Expand Down Expand Up @@ -55,6 +55,6 @@ public static Identifier fromCompoundString(String identifier) {

@Override
public String toString() {
return Objects.toStringHelper(this).add("repository", repository).add("tag", tag).toString();
return MoreObjects.toStringHelper(this).add("repository", repository).add("tag", tag).toString();
}
}
4 changes: 2 additions & 2 deletions src/main/java/com/github/dockerjava/api/model/Repository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import java.net.MalformedURLException;
import java.net.URL;

import com.google.common.base.Objects;
import com.google.common.base.MoreObjects;

/**
* A repository or image name.
Expand Down Expand Up @@ -36,7 +36,7 @@ public URL getURL() throws MalformedURLException {

@Override
public String toString() {
return Objects.toStringHelper(this).add("name", name).toString();
return MoreObjects.toStringHelper(this).add("name", name).toString();
}

public String getPath() {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import com.github.dockerjava.core.util.CompressArchiveUtil;
import com.github.dockerjava.core.util.FilePathUtil;
import com.google.common.base.Function;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects;
import com.google.common.base.Optional;
import com.google.common.collect.Collections2;

Expand Down Expand Up @@ -171,7 +171,7 @@ public void close() throws IOException {

@Override
public String toString() {
return Objects.toStringHelper(this).add("ignores", ignores).add("filesToAdd", filesToAdd).toString();
return MoreObjects.toStringHelper(this).add("ignores", ignores).add("filesToAdd", filesToAdd).toString();
}

public ScannedResult() throws IOException {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

import com.github.dockerjava.api.exception.DockerClientException;
import com.google.common.base.Function;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
Expand Down Expand Up @@ -155,7 +155,7 @@ public static Optional<Add> create(String statement) {

@Override
public String toString() {
return Objects.toStringHelper(this).add("sources", sources).add("destination", destination).toString();
return MoreObjects.toStringHelper(this).add("sources", sources).add("destination", destination).toString();
}
}

Expand Down Expand Up @@ -192,7 +192,7 @@ public static Optional<Env> create(String statement) {

@Override
public String toString() {
return Objects.toStringHelper(this).add("variable", variable).add("value", value).toString();
return MoreObjects.toStringHelper(this).add("variable", variable).add("value", value).toString();
}
}

Expand Down