Upgrade NiFi to 1.4.0

build.gradle

@@ -36,8 +36,9 @@ repositories {
 
 
 dependencies {
-    compile 'org.apache.nifi:nifi-api:0.6.1'
-    compile 'org.apache.nifi:nifi-mock:0.6.1'
+    compile 'org.apache.nifi:nifi-api:1.4.0'
+    compile 'org.apache.nifi:nifi-mock:1.4.0'
+    compile 'org.apache.nifi:nifi-logging-utils:1.4.0'
     testCompile 'junit:junit:4.12'
     runtime 'commons-io:commons-io:2.4'
     runtime 'junit:junit:4.12'

src/main/java/nifi/script/AbstractScriptProcessor.java

@@ -20,9 +20,11 @@
 import org.apache.nifi.components.AllowableValue;
 import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.components.Validator;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.NiFiLog;
 import org.apache.nifi.processor.AbstractSessionFactoryProcessor;
 import org.apache.nifi.processor.Relationship;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineFactory;
@@ -176,7 +178,7 @@ private void setupEngines(int numberOfScriptEngines) {
         engineQ = new LinkedBlockingQueue<>(numberOfScriptEngines);
         ClassLoader originalContextClassLoader = Thread.currentThread().getContextClassLoader();
         try {
-            ProcessorLog log = getLogger();
+            Logger log = new NiFiLog(LoggerFactory.getLogger(ExecuteScript.class));
 
             ScriptEngineConfigurator configurator = scriptEngineConfiguratorMap.get(scriptEngineName.toLowerCase());
 

src/main/java/nifi/script/ExecuteScript.java

@@ -21,12 +21,14 @@
 import org.apache.nifi.annotation.documentation.Tags;
 import org.apache.nifi.annotation.lifecycle.OnScheduled;
 import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.logging.ProcessorLog;
+import org.apache.nifi.logging.NiFiLog;
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.ProcessSession;
 import org.apache.nifi.processor.ProcessSessionFactory;
 import org.apache.nifi.processor.Relationship;
 import org.apache.nifi.processor.exception.ProcessException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.script.Bindings;
 import javax.script.ScriptContext;
@@ -160,7 +162,7 @@ public void onTrigger(ProcessContext context, ProcessSessionFactory sessionFacto
             // No engine available so nothing more to do here
             return;
         }
-        ProcessorLog log = getLogger();
+        Logger log = new NiFiLog(LoggerFactory.getLogger(ExecuteScript.class));
         ProcessSession session = sessionFactory.createSession();
         try {
 

src/main/java/nifi/script/ScriptEngineConfigurator.java

@@ -17,7 +17,7 @@
 package nifi.script;
 
 
-import org.apache.nifi.logging.ComponentLog;
+import org.slf4j.Logger;
 
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
@@ -31,7 +31,7 @@ public interface ScriptEngineConfigurator {
 
     String getScriptEngineName();
 
-    URL[] getModuleURLsForClasspath(String[] modulePaths, ComponentLog log);
+    URL[] getModuleURLsForClasspath(String[] modulePaths, Logger log);
 
     Object init(ScriptEngine engine, String[] modulePaths) throws ScriptException;
 

src/main/java/nifi/script/impl/AbstractModuleClassloaderConfigurator.java

@@ -16,8 +16,8 @@
  */
 package nifi.script.impl;
 
-import org.apache.nifi.logging.ComponentLog;
 import nifi.script.ScriptEngineConfigurator;
+import org.slf4j.Logger;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -43,7 +43,7 @@ abstract class AbstractModuleClassloaderConfigurator implements ScriptEngineConf
      * @return An array of URLs corresponding to all modules determined from the input set of module paths.
      */
     @Override
-    public URL[] getModuleURLsForClasspath(String[] modulePaths, ComponentLog log) {
+    public URL[] getModuleURLsForClasspath(String[] modulePaths, Logger log) {
         List<URL> additionalClasspath = new LinkedList<>();
         if (modulePaths != null) {
             for (String modulePathString : modulePaths) {

src/main/java/nifi/script/impl/GroovyScriptEngineConfigurator.java

@@ -29,7 +29,7 @@ public class GroovyScriptEngineConfigurator extends AbstractModuleClassloaderCon
                     + "import org.apache.nifi.processor.io.*\n"
                     + "import org.apache.nifi.processor.util.*\n"
                     + "import org.apache.nifi.processors.nifi.script.*\n"
-                    + "import org.apache.nifi.logging.ProcessorLog\n";
+                    + "import org.slf4j.Logger\n";
 
 
     private ScriptEngine scriptEngine;

src/main/java/nifi/script/impl/JythonScriptEngineConfigurator.java

@@ -16,8 +16,8 @@
  */
 package nifi.script.impl;
 
-import org.apache.nifi.logging.ComponentLog;
 import nifi.script.ScriptEngineConfigurator;
+import org.slf4j.Logger;
 
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
@@ -34,7 +34,7 @@ public String getScriptEngineName() {
     }
 
     @Override
-    public URL[] getModuleURLsForClasspath(String[] modulePaths, ComponentLog log) {
+    public URL[] getModuleURLsForClasspath(String[] modulePaths, Logger log) {
         // We don't need to add the module paths to the classpath, they will be added via sys.path.append
         return new URL[0];
     }