Removed own Preconditons implementation

Marcus Linke · Marcus Linke · commit 11ae37f1fabc · 2015-01-31T21:08:04.000+01:00
diff --git a/src/main/java/com/github/dockerjava/Preconditions.java b/src/main/java/com/github/dockerjava/Preconditions.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Device.java b/src/main/java/com/github/dockerjava/api/model/Device.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.api.model;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
diff --git a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.api.model;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.Closeable;
 import java.io.File;
diff --git a/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java b/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.Serializable;
 import java.security.Security;
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.InputStream;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -1,9 +1,5 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkArgument;
-import static com.github.dockerjava.Preconditions.checkNotNull;
-import static com.github.dockerjava.Preconditions.checkState;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,6 +25,8 @@
 import com.github.dockerjava.core.GoLangFileMatchException;
 import com.github.dockerjava.core.GoLangMatchFileFilter;
 
+import static jersey.repackaged.com.google.common.base.Preconditions.*;
+
 /**
  * 
  * Build an image from Dockerfile.
diff --git a/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.List;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.InputStream;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.InputStream;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.NotFoundException;
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.InputStream;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.InspectContainerCmd;
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.InspectImageCmd;
diff --git a/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.KillContainerCmd;
diff --git a/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
@@ -1,7 +1,7 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkArgument;
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkArgument;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.List;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.List;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.InputStream;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.PauseContainerCmd;
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.InputStream;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.InputStream;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.RemoveImageCmd;
diff --git a/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
@@ -1,7 +1,7 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.Preconditions.checkArgument;
-import static com.github.dockerjava.Preconditions.checkNotNull;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkArgument;
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.RestartContainerCmd;
diff --git a/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/util/guava/PercentEscaper.java b/src/main/java/com/github/dockerjava/jaxrs/util/guava/PercentEscaper.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/util/guava/UnicodeEscaper.java b/src/main/java/com/github/dockerjava/jaxrs/util/guava/UnicodeEscaper.java
