Updated to 1.15.0

mrcsparker · Nov 27, 2021 · 874e2a0 · 874e2a0
1 parent ed0cdf8
commit 874e2a0
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 431 deletions.
diff --git a/README.md b/README.md
@@ -38,8 +38,8 @@ These controllers were designed to be _flexible_ and _fast_.
 ```bash
 > cd nifi-sqllookup-bundle
 > mvn package
-> cp ./nifi-sqllookup-services-nar/target/nifi-sqllookup-services-nar-1.12.0.nar /NIFI_INSTALL/lib/
-> cp ./nifi-sqllookup-services-api-nar/target/nifi-sqllookup-services-api-nar-1.12.0.nar /NIFI_INSTALL/lib/
+> cp ./nifi-sqllookup-services-nar/target/nifi-sqllookup-services-nar-1.15.0.nar /NIFI_INSTALL/lib/
+> cp ./nifi-sqllookup-services-api-nar/target/nifi-sqllookup-services-api-nar-1.15.0.nar /NIFI_INSTALL/lib/
 ```
 
 - Start NiFi

diff --git a/nifi-sqllookup-services-api-nar/pom.xml b/nifi-sqllookup-services-api-nar/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.mrcsparker</groupId>
     <artifactId>nifi-sqllookup-services-bundle</artifactId>
-    <version>1.12.0</version>
+    <version>1.15.0</version>
   </parent>
 
   <artifactId>nifi-sqllookup-services-api-nar</artifactId>

diff --git a/nifi-sqllookup-services-api/pom.xml b/nifi-sqllookup-services-api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.mrcsparker</groupId>
     <artifactId>nifi-sqllookup-services-bundle</artifactId>
-    <version>1.12.0</version>
+    <version>1.15.0</version>
   </parent>
 
   <artifactId>nifi-sqllookup-services-api</artifactId>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.apache.nifi</groupId>
       <artifactId>nifi-lookup-service-api</artifactId>
-      <version>1.12.0</version>
+      <version>1.15.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

diff --git a/nifi-sqllookup-services-nar/pom.xml b/nifi-sqllookup-services-nar/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.mrcsparker</groupId>
         <artifactId>nifi-sqllookup-services-bundle</artifactId>
-        <version>1.12.0</version>
+        <version>1.15.0</version>
     </parent>
 
     <artifactId>nifi-sqllookup-services-nar</artifactId>

diff --git a/nifi-sqllookup-services/pom.xml b/nifi-sqllookup-services/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.mrcsparker</groupId>
         <artifactId>nifi-sqllookup-services-bundle</artifactId>
-        <version>1.12.0</version>
+        <version>1.15.0</version>
     </parent>
 
     <artifactId>nifi-sqllookup-services</artifactId>

diff --git a/...lookup-services/src/main/java/com/mrcsparker/nifi/sqllookup/AbstractSQLLookupService.java b/...lookup-services/src/main/java/com/mrcsparker/nifi/sqllookup/AbstractSQLLookupService.java
@@ -36,7 +36,7 @@ abstract class AbstractSQLLookupService<T> extends AbstractControllerService imp
                                     .description("SQL Query")
                                     .required(true)
                                     .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
-                                    .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
+                                    .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
                                     .build();
 
     static final PropertyDescriptor QUERY_TIMEOUT =

diff --git a/nifi-sqllookup-services/src/main/java/com/mrcsparker/nifi/sqllookup/SQLLookupService.java b/nifi-sqllookup-services/src/main/java/com/mrcsparker/nifi/sqllookup/SQLLookupService.java
@@ -128,14 +128,18 @@ public Class<?> getValueType() {
     @OnEnabled
     public void onEnabled(final ConfigurationContext context) throws InitializationException {
         setDefaultValues(context);
-        this.lookupValue = context.getProperty(LOOKUP_VALUE_COLUMN).getValue();
-
-        if (cachingLibrary.equals("Caffeine")) {
-            cache = new CaffeineAdapter<>(cacheSize);
-        } else if (cachingLibrary.equals("Cache2k")) {
-            cache = new Cache2kAdapter<>(cacheSize, String.class);
-        } else {
-            cache = new GuavaAdapter<>(cacheSize);
+        lookupValue = context.getProperty(LOOKUP_VALUE_COLUMN).getValue();
+
+        switch (cachingLibrary) {
+            case "Caffeine":
+                cache = new CaffeineAdapter<>(cacheSize);
+                break;
+            case "Cache2k":
+                cache = new Cache2kAdapter<>(cacheSize, String.class);
+                break;
+            default:
+                cache = new GuavaAdapter<>(cacheSize);
+                break;
         }
     }
 

diff --git a/...qllookup-services/src/main/java/com/mrcsparker/nifi/sqllookup/SQLRecordLookupService.java b/...qllookup-services/src/main/java/com/mrcsparker/nifi/sqllookup/SQLRecordLookupService.java
@@ -17,8 +17,8 @@
 
 package com.mrcsparker.nifi.sqllookup;
 
-import com.mrcsparker.nifi.sqllookup.cache.Cache2kAdapter;
 import com.mrcsparker.nifi.sqllookup.cache.CaffeineAdapter;
+import com.mrcsparker.nifi.sqllookup.cache.GuavaAdapter;
 import org.apache.commons.dbcp2.BasicDataSource;
 import org.apache.nifi.annotation.documentation.CapabilityDescription;
 import org.apache.nifi.annotation.documentation.Tags;
@@ -156,7 +156,7 @@ private Optional<Record> jdbcDatabaseLookup(Map<String, Object> coordinates) thr
 
             try (ResultSet resultSet = preparedStatement.getResultSet()) {
                 final RecordSchema schema = new SimpleRecordSchema(new ArrayList<>());
-                try (SQLResultSetRecordSet resultSetRecordSet = new SQLResultSetRecordSet(resultSet, schema)) {
+                try (ResultSetRecordSet resultSetRecordSet = new ResultSetRecordSet(resultSet, schema)) {
                     return Optional.of(resultSetRecordSet.next());
                 }
             }
@@ -191,12 +191,12 @@ protected Optional<Record> cacheLookup(Map<String, Object> coordinates) throws L
     @OnEnabled
     public void onEnabled(final ConfigurationContext context) {
         setDefaultValues(context);
-        this.useJDBCTypes = context.getProperty(USE_JDBC_TYPES).asBoolean();
+        useJDBCTypes = context.getProperty(USE_JDBC_TYPES).asBoolean();
 
-        if (cachingLibrary.equals("Caffeine")) {
+        if ("Caffeine".equals(cachingLibrary)) {
             cache = new CaffeineAdapter<>(cacheSize);
         } else {
-            cache = new Cache2kAdapter<>(cacheSize, Record.class);
+            cache = new GuavaAdapter<>(cacheSize);
         }
     }
 }