Replace com.google.common.base.Objects.equal() by java.util.Objects.equal()

Author: groldan

geowebcache/core/src/main/java/org/geowebcache/filter/parameters/ParameterFilter.java

@@ -13,10 +13,10 @@
  */
 package org.geowebcache.filter.parameters;
 
-import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import java.io.Serializable;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
@@ -127,7 +127,7 @@ protected Object readResolve() {
 
     /** Is the given value exactly a value that could be produced by the filter. */
     public boolean isFilteredValue(final String value) {
-        if (Objects.equal(value, this.getDefaultValue())) {
+        if (Objects.equals(value, this.getDefaultValue())) {
             return true;
         }
         if (Optional.ofNullable(this.getLegalValues())
@@ -136,7 +136,7 @@ public boolean isFilteredValue(final String value) {
             return true;
         }
         try {
-            return Objects.equal(value, this.apply(value));
+            return Objects.equals(value, this.apply(value));
         } catch (ParameterException ex) {
             return false;
         }

geowebcache/core/src/main/java/org/geowebcache/layer/TileLayer.java

@@ -13,7 +13,6 @@
  */
 package org.geowebcache.layer;
 
-import com.google.common.base.Objects;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,6 +21,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -302,7 +302,7 @@ public FormatModifier getFormatModifier(MimeType responseFormat) {
         Iterator<FormatModifier> iter = formatModifiers.iterator();
         while (iter.hasNext()) {
             FormatModifier mod = iter.next();
-            if (Objects.equal(mod.getResponseFormat(), responseFormat)) {
+            if (Objects.equals(mod.getResponseFormat(), responseFormat)) {
                 return mod;
             }
         }

geowebcache/diskquota/bdb/src/main/java/org/geowebcache/diskquota/bdb/BDBQuotaStore.java

@@ -16,7 +16,6 @@
 import static org.geowebcache.diskquota.DiskQuotaMonitor.GWC_DISKQUOTA_DISABLED;
 import static org.geowebcache.util.FileUtils.listFilesNullSafe;
 
-import com.google.common.base.Objects;
 import com.sleepycat.je.CursorConfig;
 import com.sleepycat.je.Environment;
 import com.sleepycat.je.LockMode;
@@ -34,6 +33,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
@@ -397,12 +397,12 @@ public void deleteLayer(final String layerName) {
 
     @Override
     public void deleteGridSubset(String layerName, String gridSetId) {
-        issue(new Deleter(layerName, ts -> Objects.equal(ts.getGridsetId(), gridSetId)));
+        issue(new Deleter(layerName, ts -> Objects.equals(ts.getGridsetId(), gridSetId)));
     }
 
     @Override
     public void deleteParameters(String layerName, String parametersId) {
-        issue(new Deleter(layerName, ts -> Objects.equal(ts.getParametersId(), parametersId)));
+        issue(new Deleter(layerName, ts -> Objects.equals(ts.getParametersId(), parametersId)));
     }
 
     private class Deleter implements Callable<Void> {

geowebcache/diskquota/jdbc/src/test/java/org/geowebcache/diskquota/jdbc/JDBCQuotaStoreTest.java

@@ -10,7 +10,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import com.google.common.base.Objects;
 import java.io.File;
 import java.io.IOException;
 import java.math.BigInteger;
@@ -25,6 +24,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
@@ -462,7 +462,7 @@ public void testDeleteParameters() throws InterruptedException {
         assertThat(
                 store.getTileSets(),
                 containsInAnyOrder(expectedTileSets.stream()
-                        .filter(ts -> !(Objects.equal(ts.getParametersId(), paramIds[1])
+                        .filter(ts -> !(Objects.equals(ts.getParametersId(), paramIds[1])
                                 && ts.getLayerName().equals(layerName)))
                         .map(Matchers::equalTo)
                         .collect(Collectors.toSet())));

geowebcache/wms/src/test/java/org/geowebcache/config/wms/GetCapabilitiesGridSetConfigurationConformanceTest.java

@@ -20,10 +20,10 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 
-import com.google.common.base.Objects;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 import org.easymock.EasyMock;
 import org.geotools.data.ows.OperationType;
 import org.geotools.ows.wms.CRSEnvelope;
@@ -148,7 +148,7 @@ protected Matcher<GridSet> infoEquals(int expected) {
             @Override
             public boolean matches(Object item) {
                 return item instanceof GridSet
-                        && Objects.equal(((GridSet) item).getDescription(), Integer.toString(expected));
+                        && Objects.equals(((GridSet) item).getDescription(), Integer.toString(expected));
             }
         };
     }