From 30ed24a42112b3225ab2486ed24bd6a5011a7a7f Mon Sep 17 00:00:00 2001 From: Eric Yang Date: Mon, 28 Oct 2019 19:27:32 -0400 Subject: [PATCH] HDFS-14730. Removed unused configuration dfs.web.authentication.filter. Contributed by Chen Zhang --- .../org/apache/hadoop/hdfs/DFSConfigKeys.java | 7 ---- .../src/main/resources/hdfs-default.xml | 8 ---- .../apache/hadoop/hdfs/TestDFSConfigKeys.java | 37 ------------------- 3 files changed, 52 deletions(-) delete mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSConfigKeys.java diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java index 47a507dbaff..16a29dd3dec 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java @@ -283,13 +283,6 @@ public class DFSConfigKeys extends CommonConfigurationKeys { = "dfs.namenode.blockreport.queue.size"; public static final int DFS_NAMENODE_BLOCKREPORT_QUEUE_SIZE_DEFAULT = 1024; - public static final String DFS_WEBHDFS_AUTHENTICATION_FILTER_KEY = "dfs.web.authentication.filter"; - /* Phrased as below to avoid javac inlining as a constant, to match the behavior when - this was AuthFilter.class.getName(). Note that if you change the import for AuthFilter, you - need to update the literal here as well as TestDFSConfigKeys. - */ - public static final String DFS_WEBHDFS_AUTHENTICATION_FILTER_DEFAULT = - "org.apache.hadoop.hdfs.web.AuthFilter"; @Deprecated public static final String DFS_WEBHDFS_USER_PATTERN_KEY = HdfsClientConfigKeys.DFS_WEBHDFS_USER_PATTERN_KEY; diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml index 27b3fe60c49..fa2f30e67a9 100755 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml @@ -5042,14 +5042,6 @@ - - dfs.web.authentication.filter - org.apache.hadoop.hdfs.web.AuthFilter - - Authentication filter class used for WebHDFS. - - - dfs.web.authentication.simple.anonymous.allowed diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSConfigKeys.java deleted file mode 100644 index c7df891e25e..00000000000 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSConfigKeys.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF 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.apache.hadoop.hdfs; - -import org.apache.hadoop.hdfs.web.AuthFilter; - -import org.junit.Assert; -import org.junit.Test; - -public class TestDFSConfigKeys { - - /** - * Make sure we keep the String literal up to date with what we'd get by calling - * class.getName. - */ - @Test - public void testStringLiteralDefaultWebFilter() { - Assert.assertEquals("The default webhdfs auth filter should make the FQCN of AuthFilter.", - AuthFilter.class.getName(), DFSConfigKeys.DFS_WEBHDFS_AUTHENTICATION_FILTER_DEFAULT); - } - -}