You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2016/07/16 20:07:27 UTC

nifi git commit: NIFI-1157 removed methods no longer needed due to deprecation cleanup. In NIFI-2280 also ensure they were deprecated on the 0.x line. This closes #663.

Repository: nifi
Updated Branches:
  refs/heads/master 1c5975da8 -> ad02b4309


NIFI-1157 removed methods no longer needed due to deprecation cleanup.  In NIFI-2280 also ensure they were deprecated on the 0.x line. This closes #663.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/ad02b430
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/ad02b430
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/ad02b430

Branch: refs/heads/master
Commit: ad02b43099312d0a3552cd7e032385272d076d8d
Parents: 1c5975d
Author: joewitt <jo...@apache.org>
Authored: Fri Jul 15 16:05:32 2016 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Sat Jul 16 16:07:12 2016 -0400

----------------------------------------------------------------------
 .../controller/AbstractControllerService.java   | 28 --------------------
 1 file changed, 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/ad02b430/nifi-api/src/main/java/org/apache/nifi/controller/AbstractControllerService.java
----------------------------------------------------------------------
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/AbstractControllerService.java b/nifi-api/src/main/java/org/apache/nifi/controller/AbstractControllerService.java
index 15d30c3..6a27761 100644
--- a/nifi-api/src/main/java/org/apache/nifi/controller/AbstractControllerService.java
+++ b/nifi-api/src/main/java/org/apache/nifi/controller/AbstractControllerService.java
@@ -16,12 +16,7 @@
  */
 package org.apache.nifi.controller;
 
-import java.util.Map;
-import org.apache.nifi.annotation.lifecycle.OnConfigurationRestored;
-
 import org.apache.nifi.components.AbstractConfigurableComponent;
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.components.PropertyValue;
 import org.apache.nifi.components.state.StateManager;
 import org.apache.nifi.logging.ComponentLog;
 import org.apache.nifi.processor.ProcessorInitializationContext;
@@ -31,7 +26,6 @@ public abstract class AbstractControllerService extends AbstractConfigurableComp
 
     private String identifier;
     private ControllerServiceLookup serviceLookup;
-    private volatile ConfigurationContext configContext;
     private ComponentLog logger;
     private StateManager stateManager;
 
@@ -49,28 +43,6 @@ public abstract class AbstractControllerService extends AbstractConfigurableComp
         return identifier;
     }
 
-    @OnConfigurationRestored
-    public void onConfigurationChange(final ConfigurationContext context) {
-        this.configContext = context;
-    }
-
-    /**
-     * @param descriptor to retrieve value of
-     * @return the currently configured value for the given
-     * {@link PropertyDescriptor}
-     */
-    protected final PropertyValue getProperty(final PropertyDescriptor descriptor) {
-        return configContext.getProperty(descriptor);
-    }
-
-    /**
-     * @return an unmodifiable map of all configured properties for this
-     * {@link ControllerService}
-     */
-    protected final Map<PropertyDescriptor, String> getProperties() {
-        return configContext.getProperties();
-    }
-
     /**
      * @return the {@link ControllerServiceLookup} that was passed to the
      * {@link #init(ProcessorInitializationContext)} method