Merge pull request #10873 from kimchy/remove_preconditions

Remove Preconditions class

src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java

@@ -21,6 +21,7 @@ package org.elasticsearch.cluster.metadata;
 
 import com.carrotsearch.hppc.cursors.ObjectCursor;
 import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
+import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import org.elasticsearch.Version;
 import org.elasticsearch.cluster.block.ClusterBlock;
@@ -29,7 +30,6 @@ import org.elasticsearch.cluster.node.DiscoveryNodeFilters;
 import org.elasticsearch.cluster.routing.HashFunction;
 import org.elasticsearch.cluster.routing.Murmur3HashFunction;
 import org.elasticsearch.common.Nullable;
-import org.elasticsearch.common.Preconditions;
 import org.elasticsearch.common.collect.ImmutableOpenMap;
 import org.elasticsearch.common.collect.MapBuilder;
 import org.elasticsearch.common.compress.CompressedString;

src/main/java/org/elasticsearch/common/Preconditions.java

@@ -1,289 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.common;
-
-import org.elasticsearch.ElasticsearchNullPointerException;
-
-import java.util.NoSuchElementException;
-
-/**
- * Simple static methods to be called at the start of your own methods to verify
- * correct arguments and state. This allows constructs such as
- * <pre>
- *     if (count <= 0) {
- *       throw new ElasticsearchIllegalArgumentException("must be positive: " + count);
- *     }</pre>
- *
- * to be replaced with the more compact
- * <pre>
- *     checkArgument(count > 0, "must be positive: %s", count);</pre>
- *
- * Note that the sense of the expression is inverted; with {@code Preconditions}
- * you declare what you expect to be <i>true</i>, just as you do with an
- * <a href="http://java.sun.com/j2se/1.5.0/docs/guide/language/assert.html">
- * {@code assert}</a> or a JUnit {@code assertTrue()} call.
- *
- * <p>Take care not to confuse precondition checking with other similar types
- * of checks! Precondition exceptions -- including those provided here, but also
- * {@link IndexOutOfBoundsException}, {@link NoSuchElementException}, {@link
- * UnsupportedOperationException} and others -- are used to signal that the
- * <i>calling method</i> has made an error. This tells the caller that it should
- * not have invoked the method when it did, with the arguments it did, or
- * perhaps <i>ever</i>. Postcondition or other invariant failures should not
- * throw these types of exceptions.
- *
- * <p><b>Note:</b> The methods of the {@code Preconditions} class are highly
- * unusual in one way: they are <i>supposed to</i> throw exceptions, and promise
- * in their specifications to do so even when given perfectly valid input. That
- * is, {@code null} is a valid parameter to the method {@link
- * #checkNotNull(Object)} -- and technically this parameter could be even marked
- * as Nullable -- yet the method will still throw an exception anyway,
- * because that's what its contract says to do.
- *
- *
- */
-public final class Preconditions {
-    private Preconditions() {
-    }
-
-    /**
-     * Ensures the truth of an expression involving one or more parameters to the
-     * calling method.
-     *
-     * @param expression a boolean expression
-     * @throws IllegalArgumentException
-     *          if {@code expression} is false
-     */
-    public static void checkArgument(boolean expression) {
-        if (!expression) {
-            throw new IllegalArgumentException();
-        }
-    }
-
-    /**
-     * Ensures the truth of an expression involving one or more parameters to the
-     * calling method.
-     *
-     * @param expression   a boolean expression
-     * @param errorMessage the exception message to use if the check fails; will
-     *                     be converted to a string using {@link String#valueOf(Object)}
-     * @throws IllegalArgumentException
-     *          if {@code expression} is false
-     */
-    public static void checkArgument(boolean expression, Object errorMessage) {
-        if (!expression) {
-            throw new IllegalArgumentException(String.valueOf(errorMessage));
-        }
-    }
-
-    /**
-     * Ensures the truth of an expression involving one or more parameters to the
-     * calling method.
-     *
-     * @param expression           a boolean expression
-     * @param errorMessageTemplate a template for the exception message should the
-     *                             check fail. The message is formed by replacing each {@code %s}
-     *                             placeholder in the template with an argument. These are matched by
-     *                             position - the first {@code %s} gets {@code errorMessageArgs[0]}, etc.
-     *                             Unmatched arguments will be appended to the formatted message in square
-     *                             braces. Unmatched placeholders will be left as-is.
-     * @param errorMessageArgs     the arguments to be substituted into the message
-     *                             template. Arguments are converted to strings using
-     *                             {@link String#valueOf(Object)}.
-     * @throws IllegalArgumentException
-     *          if {@code expression} is false
-     * @throws org.elasticsearch.ElasticsearchNullPointerException
-     *          if the check fails and either {@code
-     *          errorMessageTemplate} or {@code errorMessageArgs} is null (don't let
-     *          this happen)
-     */
-    public static void checkArgument(boolean expression,
-                                     String errorMessageTemplate, Object... errorMessageArgs) {
-        if (!expression) {
-            throw new IllegalArgumentException(
-                    format(errorMessageTemplate, errorMessageArgs));
-        }
-    }
-
-    /**
-     * Ensures the truth of an expression involving the state of the calling
-     * instance, but not involving any parameters to the calling method.
-     *
-     * @param expression a boolean expression
-     * @throws IllegalStateException
-     *          if {@code expression} is false
-     */
-    public static void checkState(boolean expression) {
-        if (!expression) {
-            throw new IllegalStateException();
-        }
-    }
-
-    /**
-     * Ensures the truth of an expression involving the state of the calling
-     * instance, but not involving any parameters to the calling method.
-     *
-     * @param expression   a boolean expression
-     * @param errorMessage the exception message to use if the check fails; will
-     *                     be converted to a string using {@link String#valueOf(Object)}
-     * @throws IllegalStateException
-     *          if {@code expression} is false
-     */
-    public static void checkState(boolean expression, Object errorMessage) {
-        if (!expression) {
-            throw new IllegalStateException(String.valueOf(errorMessage));
-        }
-    }
-
-    /**
-     * Ensures the truth of an expression involving the state of the calling
-     * instance, but not involving any parameters to the calling method.
-     *
-     * @param expression           a boolean expression
-     * @param errorMessageTemplate a template for the exception message should the
-     *                             check fail. The message is formed by replacing each {@code %s}
-     *                             placeholder in the template with an argument. These are matched by
-     *                             position - the first {@code %s} gets {@code errorMessageArgs[0]}, etc.
-     *                             Unmatched arguments will be appended to the formatted message in square
-     *                             braces. Unmatched placeholders will be left as-is.
-     * @param errorMessageArgs     the arguments to be substituted into the message
-     *                             template. Arguments are converted to strings using
-     *                             {@link String#valueOf(Object)}.
-     * @throws IllegalStateException
-     *          if {@code expression} is false
-     * @throws org.elasticsearch.ElasticsearchNullPointerException
-     *          if the check fails and either {@code
-     *          errorMessageTemplate} or {@code errorMessageArgs} is null (don't let
-     *          this happen)
-     */
-    public static void checkState(boolean expression,
-                                  String errorMessageTemplate, Object... errorMessageArgs) {
-        if (!expression) {
-            throw new IllegalStateException(
-                    format(errorMessageTemplate, errorMessageArgs));
-        }
-    }
-
-    /**
-     * Ensures that an object reference passed as a parameter to the calling
-     * method is not null.
-     *
-     * @param reference an object reference
-     * @return the non-null reference that was validated
-     * @throws org.elasticsearch.ElasticsearchNullPointerException
-     *          if {@code reference} is null
-     */
-    public static <T> T checkNotNull(T reference) {
-        if (reference == null) {
-            throw new ElasticsearchNullPointerException();
-        }
-        return reference;
-    }
-
-    /**
-     * Ensures that an object reference passed as a parameter to the calling
-     * method is not null.
-     *
-     * @param reference    an object reference
-     * @param errorMessage the exception message to use if the check fails; will
-     *                     be converted to a string using {@link String#valueOf(Object)}
-     * @return the non-null reference that was validated
-     * @throws org.elasticsearch.ElasticsearchNullPointerException
-     *          if {@code reference} is null
-     */
-    public static <T> T checkNotNull(T reference, Object errorMessage) {
-        if (reference == null) {
-            throw new ElasticsearchNullPointerException(String.valueOf(errorMessage));
-        }
-        return reference;
-    }
-
-    /**
-     * Ensures that an object reference passed as a parameter to the calling
-     * method is not null.
-     *
-     * @param reference            an object reference
-     * @param errorMessageTemplate a template for the exception message should the
-     *                             check fail. The message is formed by replacing each {@code %s}
-     *                             placeholder in the template with an argument. These are matched by
-     *                             position - the first {@code %s} gets {@code errorMessageArgs[0]}, etc.
-     *                             Unmatched arguments will be appended to the formatted message in square
-     *                             braces. Unmatched placeholders will be left as-is.
-     * @param errorMessageArgs     the arguments to be substituted into the message
-     *                             template. Arguments are converted to strings using
-     *                             {@link String#valueOf(Object)}.
-     * @return the non-null reference that was validated
-     * @throws org.elasticsearch.ElasticsearchNullPointerException
-     *          if {@code reference} is null
-     */
-    public static <T> T checkNotNull(T reference, String errorMessageTemplate,
-                                     Object... errorMessageArgs) {
-        if (reference == null) {
-            // If either of these parameters is null, the right thing happens anyway
-            throw new ElasticsearchNullPointerException(
-                    format(errorMessageTemplate, errorMessageArgs));
-        }
-        return reference;
-    }
-
-    /**
-     * Substitutes each {@code %s} in {@code template} with an argument. These
-     * are matched by position - the first {@code %s} gets {@code args[0]}, etc.
-     * If there are more arguments than placeholders, the unmatched arguments will
-     * be appended to the end of the formatted message in square braces.
-     *
-     * @param template a non-null string containing 0 or more {@code %s}
-     *                 placeholders.
-     * @param args     the arguments to be substituted into the message
-     *                 template. Arguments are converted to strings using
-     *                 {@link String#valueOf(Object)}. Arguments can be null.
-     */
-    // VisibleForTesting
-    static String format(String template, Object... args) {
-        // start substituting the arguments into the '%s' placeholders
-        StringBuilder builder = new StringBuilder(
-                template.length() + 16 * args.length);
-        int templateStart = 0;
-        int i = 0;
-        while (i < args.length) {
-            int placeholderStart = template.indexOf("%s", templateStart);
-            if (placeholderStart == -1) {
-                break;
-            }
-            builder.append(template.substring(templateStart, placeholderStart));
-            builder.append(args[i++]);
-            templateStart = placeholderStart + 2;
-        }
-        builder.append(template.substring(templateStart));
-
-        // if we run out of placeholders, append the extra args in square braces
-        if (i < args.length) {
-            builder.append(" [");
-            builder.append(args[i++]);
-            while (i < args.length) {
-                builder.append(", ");
-                builder.append(args[i++]);
-            }
-            builder.append("]");
-        }
-
-        return builder.toString();
-    }
-}

src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashMap.java

@@ -19,11 +19,11 @@
 
 package org.elasticsearch.common.collect;
 
+import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
 import com.google.common.collect.UnmodifiableIterator;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.lucene.util.mutable.MutableValueInt;
-import org.elasticsearch.common.Preconditions;
 
 import java.util.*;
 

src/main/java/org/elasticsearch/common/io/Streams.java

@@ -20,14 +20,12 @@
 package org.elasticsearch.common.io;
 
 import com.google.common.base.Charsets;
+import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
-import org.elasticsearch.common.Preconditions;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.util.Callback;
 
 import java.io.*;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.List;
 
 /**

src/main/java/org/elasticsearch/common/property/PropertyPlaceholder.java

@@ -19,7 +19,7 @@
 
 package org.elasticsearch.common.property;
 
-import org.elasticsearch.common.Preconditions;
+import com.google.common.base.Preconditions;
 import org.elasticsearch.common.Strings;
 
 import java.util.HashSet;
@@ -159,7 +159,7 @@ public class PropertyPlaceholder {
      *
      * @see PropertyPlaceholder
      */
-    public static interface PlaceholderResolver {
+    public interface PlaceholderResolver {
 
         /**
          * Resolves the supplied placeholder name into the replacement value.

src/main/java/org/elasticsearch/common/unit/Fuzziness.java

@@ -18,10 +18,10 @@
  */
 package org.elasticsearch.common.unit;
 
+import com.google.common.base.Preconditions;
 import org.apache.lucene.search.FuzzyQuery;
 import org.apache.lucene.util.automaton.LevenshteinAutomata;
 import org.elasticsearch.common.ParseField;
-import org.elasticsearch.common.Preconditions;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentBuilderString;

src/main/java/org/elasticsearch/common/unit/SizeValue.java

@@ -19,8 +19,8 @@
 
 package org.elasticsearch.common.unit;
 
+import com.google.common.base.Preconditions;
 import org.elasticsearch.ElasticsearchParseException;
-import org.elasticsearch.common.Preconditions;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;

src/main/java/org/elasticsearch/common/util/CollectionUtils.java

@@ -23,8 +23,8 @@ import com.carrotsearch.hppc.DoubleArrayList;
 import com.carrotsearch.hppc.FloatArrayList;
 import com.carrotsearch.hppc.LongArrayList;
 import com.carrotsearch.hppc.ObjectArrayList;
+import com.google.common.base.Preconditions;
 import org.apache.lucene.util.*;
-import org.elasticsearch.common.Preconditions;
 
 import java.util.*;
 

src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java

@@ -18,6 +18,7 @@
  */
 package org.elasticsearch.gateway;
 
+import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
 import org.apache.lucene.codecs.CodecUtil;
@@ -27,7 +28,6 @@ import org.apache.lucene.index.IndexFormatTooOldException;
 import org.apache.lucene.store.*;
 import org.apache.lucene.util.IOUtils;
 import org.elasticsearch.ExceptionsHelper;
-import org.elasticsearch.common.Preconditions;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.lucene.store.InputStreamIndexInput;
 import org.elasticsearch.common.xcontent.*;

src/main/java/org/elasticsearch/http/HttpServerModule.java

@@ -19,14 +19,12 @@
 
 package org.elasticsearch.http;
 
+import com.google.common.base.Preconditions;
 import org.elasticsearch.common.inject.AbstractModule;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.http.netty.NettyHttpServerTransport;
-import org.elasticsearch.plugins.Plugin;
-
-import static org.elasticsearch.common.Preconditions.checkNotNull;
 
 /**
  *
@@ -60,8 +58,8 @@ public class HttpServerModule extends AbstractModule {
     }
 
     public void setHttpServerTransport(Class<? extends HttpServerTransport> httpServerTransport, String source) {
-        checkNotNull(httpServerTransport, "Configured http server transport may not be null");
+        Preconditions.checkNotNull(httpServerTransport, "Configured http server transport may not be null");
-        checkNotNull(source, "Plugin, that changes transport may not be null");
+        Preconditions.checkNotNull(source, "Plugin, that changes transport may not be null");
         this.configuredHttpServerTransport = httpServerTransport;
         this.configuredHttpServerTransportSource = source;
     }

src/main/java/org/elasticsearch/index/engine/Engine.java

@@ -19,6 +19,7 @@
 
 package org.elasticsearch.index.engine;
 
+import com.google.common.base.Preconditions;
 import org.apache.lucene.index.*;
 import org.apache.lucene.search.Filter;
 import org.apache.lucene.search.IndexSearcher;
@@ -27,10 +28,8 @@ import org.apache.lucene.search.SearcherManager;
 import org.apache.lucene.search.join.BitDocIdSetFilter;
 import org.apache.lucene.util.Accountable;
 import org.apache.lucene.util.Accountables;
-import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.common.Nullable;
-import org.elasticsearch.common.Preconditions;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.lease.Releasable;
 import org.elasticsearch.common.lease.Releasables;

src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java

@@ -19,6 +19,7 @@
 
 package org.elasticsearch.index.mapper;
 
+import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import org.apache.lucene.document.Field;
@@ -27,7 +28,6 @@ import org.apache.lucene.search.Filter;
 import org.apache.lucene.util.BitDocIdSet;
 import org.elasticsearch.ElasticsearchGenerationException;
 import org.elasticsearch.common.Nullable;
-import org.elasticsearch.common.Preconditions;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.collect.MapBuilder;

src/main/java/org/elasticsearch/index/merge/policy/LogByteSizeMergePolicyProvider.java

@@ -19,9 +19,8 @@
 
 package org.elasticsearch.index.merge.policy;
 
+import com.google.common.base.Preconditions;
 import org.apache.lucene.index.LogByteSizeMergePolicy;
-import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.common.Preconditions;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.ByteSizeUnit;

src/main/java/org/elasticsearch/index/merge/policy/LogDocMergePolicyProvider.java

@@ -19,9 +19,8 @@
 
 package org.elasticsearch.index.merge.policy;
 
+import com.google.common.base.Preconditions;
 import org.apache.lucene.index.LogDocMergePolicy;
-import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.common.Preconditions;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.settings.IndexSettingsService;

src/main/java/org/elasticsearch/index/shard/IndexShard.java

@@ -21,6 +21,7 @@ package org.elasticsearch.index.shard;
 
 import com.google.common.base.Charsets;
 
+import com.google.common.base.Preconditions;
 import org.apache.lucene.codecs.PostingsFormat;
 import org.apache.lucene.index.CheckIndex;
 import org.apache.lucene.search.Filter;
@@ -42,7 +43,6 @@ import org.elasticsearch.cluster.routing.ShardRouting;
 import org.elasticsearch.cluster.routing.ShardRoutingState;
 import org.elasticsearch.common.Booleans;
 import org.elasticsearch.common.Nullable;
-import org.elasticsearch.common.Preconditions;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.collect.Tuple;

src/main/java/org/elasticsearch/transport/TransportModule.java

@@ -19,18 +19,15 @@
 
 package org.elasticsearch.transport;
 
-import org.elasticsearch.action.admin.cluster.node.liveness.TransportLivenessAction;
+import com.google.common.base.Preconditions;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.common.inject.AbstractModule;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.transport.local.LocalTransport;
 import org.elasticsearch.transport.netty.NettyTransport;
 
-import static org.elasticsearch.common.Preconditions.checkNotNull;
-
 /**
  *
  */
@@ -78,15 +75,15 @@ public class TransportModule extends AbstractModule {
     }
 
     public void setTransportService(Class<? extends TransportService> transportService, String source) {
-        checkNotNull(transportService, "Configured transport service may not be null");
+        Preconditions.checkNotNull(transportService, "Configured transport service may not be null");
-        checkNotNull(source, "Plugin, that changes transport service may not be null");
+        Preconditions.checkNotNull(source, "Plugin, that changes transport service may not be null");
         this.configuredTransportService = transportService;
         this.configuredTransportServiceSource = source;
     }
 
     public void setTransport(Class<? extends Transport> transport, String source) {
-        checkNotNull(transport, "Configured transport may not be null");
+        Preconditions.checkNotNull(transport, "Configured transport may not be null");
-        checkNotNull(source, "Plugin, that changes transport may not be null");
+        Preconditions.checkNotNull(source, "Plugin, that changes transport may not be null");
         this.configuredTransport = transport;
         this.configuredTransportSource = source;
     }