diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java index 67de5fb3a21..70467f08aa0 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java @@ -36,36 +36,6 @@ import org.slf4j.LoggerFactory; public class HBaseConfiguration extends Configuration { private static final Logger LOG = LoggerFactory.getLogger(HBaseConfiguration.class); - /** - * Instantiating HBaseConfiguration() is deprecated. Please use - * HBaseConfiguration#create() to construct a plain Configuration - * @deprecated since 0.90.0. Please use {@link #create()} instead. - * @see #create() - * @see HBASE-2036 - */ - @Deprecated - public HBaseConfiguration() { - //TODO:replace with private constructor, HBaseConfiguration should not extend Configuration - super(); - addHbaseResources(this); - LOG.warn("instantiating HBaseConfiguration() is deprecated. Please use" - + " HBaseConfiguration#create() to construct a plain Configuration"); - } - - /** - * Instantiating HBaseConfiguration() is deprecated. Please use - * HBaseConfiguration#create(conf) to construct a plain Configuration - * @deprecated since 0.90.0. Please use {@link #create(Configuration)} instead. - * @see #create(Configuration) - * @see HBASE-2036 - */ - @Deprecated - public HBaseConfiguration(final Configuration c) { - //TODO:replace with private constructor - this(); - merge(this, c); - } - private static void checkDefaultsVersion(Configuration conf) { if (conf.getBoolean("hbase.defaults.for.version.skip", Boolean.FALSE)) return; String defaultsVersion = conf.get("hbase.defaults.for.version");