AMBARI-8446 - Alerts: Remove Deprecated NagiosPropertyProvider Stub (jonathanhurley)

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java

@@ -18,6 +18,7 @@
 
 package org.apache.ambari.server.controller.internal;
 
+import java.net.InetAddress;
 import java.util.Collections;
 import java.util.EnumMap;
 import java.util.HashMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.Role;
 import org.apache.ambari.server.configuration.ComponentSSLConfiguration;
-import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.controller.AmbariManagementController;
 import org.apache.ambari.server.controller.AmbariServer;
 import org.apache.ambari.server.controller.HostRequest;
@@ -47,10 +47,6 @@ import org.apache.ambari.server.controller.ganglia.GangliaReportPropertyProvider
 import org.apache.ambari.server.controller.jmx.JMXHostProvider;
 import org.apache.ambari.server.controller.jmx.JMXPropertyProvider;
 import org.apache.ambari.server.controller.metrics.MetricsHostProvider;
-import org.apache.ambari.server.controller.nagios.NagiosPropertyProvider;
-import org.apache.ambari.server.controller.sql.HostInfoProvider;
-import org.apache.ambari.server.controller.sql.SQLPropertyProvider;
-import org.apache.ambari.server.controller.sql.SinkConnectionFactory;
 import org.apache.ambari.server.controller.spi.NoSuchParentResourceException;
 import org.apache.ambari.server.controller.spi.NoSuchResourceException;
 import org.apache.ambari.server.controller.spi.Predicate;
@@ -61,6 +57,9 @@ import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.controller.spi.ResourceProvider;
 import org.apache.ambari.server.controller.spi.SystemException;
 import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
+import org.apache.ambari.server.controller.sql.HostInfoProvider;
+import org.apache.ambari.server.controller.sql.SQLPropertyProvider;
+import org.apache.ambari.server.controller.sql.SinkConnectionFactory;
 import org.apache.ambari.server.controller.utilities.PredicateBuilder;
 import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.controller.utilities.StreamProvider;
@@ -72,12 +71,6 @@ import org.apache.ambari.server.state.State;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.net.InetAddress;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentHashMap;
-import java.lang.System;
-
 import com.google.inject.Inject;
 
 /**
@@ -484,12 +477,10 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource
               ComponentSSLConfiguration.instance(),
               this,
               PropertyHelper.getPropertyId("Clusters", "cluster_name")));
-          providers.add(new NagiosPropertyProvider());
           providers.add(new AlertSummaryPropertyProvider(type,
               "Clusters/cluster_name", null));
           break;
         case Service:
-          providers.add(new NagiosPropertyProvider());
           providers.add(new AlertSummaryPropertyProvider(type,
               "ServiceInfo/cluster_name", "ServiceInfo/service_name"));
           break;
@@ -502,7 +493,6 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource
               PropertyHelper.getPropertyId("Hosts", "cluster_name"),
               PropertyHelper.getPropertyId("Hosts", "host_name")
           ));
-          providers.add(new NagiosPropertyProvider());
           providers.add(new AlertSummaryPropertyProvider(type,
               "Hosts/cluster_name", "Hosts/host_name"));
           break;

ambari-server/src/main/java/org/apache/ambari/server/controller/nagios/NagiosPropertyProvider.java

@@ -1,57 +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.ambari.server.controller.nagios;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.ambari.server.controller.internal.BaseProvider;
-import org.apache.ambari.server.controller.spi.Predicate;
-import org.apache.ambari.server.controller.spi.PropertyProvider;
-import org.apache.ambari.server.controller.spi.Request;
-import org.apache.ambari.server.controller.spi.Resource;
-import org.apache.ambari.server.controller.spi.SystemException;
-
-/**
- * Deprecated. To be removed for Ambari 2.0.0 after the web client has removed
- * references to {@code legacy_alerts}.
- */
-@Deprecated
-public class NagiosPropertyProvider extends BaseProvider implements PropertyProvider {
-
-  private static final Set<String> NAGIOS_PROPERTY_IDS = new HashSet<String>();
-
-  private static final String ALERT_DETAIL_PROPERTY_ID = "legacy_alerts/detail";
-  private static final String ALERT_SUMMARY_PROPERTY_ID = "legacy_alerts/summary";
-
-  static {
-    NAGIOS_PROPERTY_IDS.add(ALERT_SUMMARY_PROPERTY_ID);
-    NAGIOS_PROPERTY_IDS.add(ALERT_DETAIL_PROPERTY_ID);
-  }
-
-  @Deprecated
-  public NagiosPropertyProvider() {
-    super(NAGIOS_PROPERTY_IDS);
-  }
-
-  @Override
-  public Set<Resource> populateResources(Set<Resource> resources,
-      Request request, Predicate predicate) throws SystemException {
-    return resources;
-  }
-}