diff --git a/src/main/java/org/elasticsearch/common/network/NetworkUtils.java b/src/main/java/org/elasticsearch/common/network/NetworkUtils.java index 92148e9f1dc..a1d60266733 100644 --- a/src/main/java/org/elasticsearch/common/network/NetworkUtils.java +++ b/src/main/java/org/elasticsearch/common/network/NetworkUtils.java @@ -22,12 +22,10 @@ package org.elasticsearch.common.network; import com.google.common.collect.Lists; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CollectionUtil; -import org.elasticsearch.ElasticsearchIllegalStateException; +import org.apache.lucene.util.Constants; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.common.os.OsUtils; -import java.lang.reflect.Method; import java.net.*; import java.util.*; @@ -61,7 +59,7 @@ public abstract class NetworkUtils { } public static Boolean defaultReuseAddress() { - return OsUtils.WINDOWS ? null : true; + return Constants.WINDOWS ? null : true; } public static boolean isIPv4() { @@ -109,11 +107,6 @@ public abstract class NetworkUtils { return InetAddress.getByName("::1"); } - public static boolean canBindToMcastAddress() { - return OsUtils.LINUX || OsUtils.SOLARIS || OsUtils.HP; - } - - /** * Returns the first non-loopback address on any interface on the current host. * diff --git a/src/main/java/org/elasticsearch/common/os/OsUtils.java b/src/main/java/org/elasticsearch/common/os/OsUtils.java deleted file mode 100644 index f0728039a46..00000000000 --- a/src/main/java/org/elasticsearch/common/os/OsUtils.java +++ /dev/null @@ -1,58 +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.os; - -import java.util.Locale; - -/** - * - */ -public class OsUtils { - - /** - * The value of System.getProperty("os.name"). - */ - public static final String OS_NAME = System.getProperty("os.name"); - /** - * True iff running on Linux. - */ - public static final boolean LINUX = OS_NAME.trim().toLowerCase(Locale.ROOT).startsWith("linux"); - /** - * True iff running on Windows. - */ - public static final boolean WINDOWS = OS_NAME.trim().toLowerCase(Locale.ROOT).startsWith("windows"); - /** - * True iff running on SunOS. - */ - public static final boolean SOLARIS = OS_NAME.trim().toLowerCase(Locale.ROOT).startsWith("sun"); - /** - * True iff running on Mac. - */ - public static final boolean MAC = OS_NAME.trim().toLowerCase(Locale.ROOT).startsWith("mac"); - /** - * True iff running on HP. - */ - public static final boolean HP = OS_NAME.trim().toLowerCase(Locale.ROOT).startsWith("hp"); - - - private OsUtils() { - - } -}