diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java index 459c110..61927fd 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java @@ -26,7 +26,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.hadoop.classification.InterfaceAudience.Private; +import com.google.common.annotations.VisibleForTesting; +import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Evolving; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.http.HttpConfig.Policy; @@ -37,7 +38,7 @@ import org.apache.hadoop.yarn.exceptions.YarnRuntimeException; import org.apache.hadoop.yarn.util.RMHAUtils; -@Private +@Public @Evolving public class WebAppUtils { public static final String WEB_APP_TRUSTSTORE_PASSWORD_KEY = @@ -66,7 +67,8 @@ public static void setRMWebAppHostnameAndPort(Configuration conf, conf.set(YarnConfiguration.RM_WEBAPP_ADDRESS, resolvedAddress); } } - + + @VisibleForTesting public static void setNMWebAppHostNameAndPort(Configuration conf, String hostName, int port) { if (YarnConfiguration.useHttps(conf)) { @@ -130,17 +132,12 @@ public static String getProxyHostAndPort(Configuration conf) { return addr; } - public static String getResolvedRemoteRMWebAppURLWithScheme( - Configuration conf) { - return getHttpSchemePrefix(conf) - + getResolvedRemoteRMWebAppURLWithoutScheme(conf); - } - public static String getResolvedRMWebAppURLWithScheme(Configuration conf) { return getHttpSchemePrefix(conf) + getResolvedRMWebAppURLWithoutScheme(conf); } - + + @VisibleForTesting public static String getResolvedRemoteRMWebAppURLWithoutScheme( Configuration conf) { return getResolvedRemoteRMWebAppURLWithoutScheme(conf, @@ -151,8 +148,8 @@ public static String getResolvedRMWebAppURLWithoutScheme(Configuration conf) { return getResolvedRMWebAppURLWithoutScheme(conf, YarnConfiguration.useHttps(conf) ? Policy.HTTPS_ONLY : Policy.HTTP_ONLY); } - - public static String getResolvedRMWebAppURLWithoutScheme(Configuration conf, + + private static String getResolvedRMWebAppURLWithoutScheme(Configuration conf, Policy httpPolicy) { InetSocketAddress address = null; if (httpPolicy == Policy.HTTPS_ONLY) {