From 85b5d7f6e0a12b206987a25509f28ec24abb6f1a Mon Sep 17 00:00:00 2001
From: Marc Gueury <marc.gueury@oracle.com>
Date: Thu, 7 Dec 2023 15:15:41 +0100
Subject: [PATCH] v1.6

---
 .../java/com/example/fn/HelloFunction.j2.java | 15 ++++++++++++++-
 .../java/com/example/fn/HelloFunction.java    | 19 -------------------
 option/src/app/fn/fn_node_psql/func.js        |  5 ++---
 3 files changed, 16 insertions(+), 23 deletions(-)
 delete mode 100644 option/src/app/fn/fn_java_none/src/main/java/com/example/fn/HelloFunction.java

diff --git a/option/src/app/fn/fn_java/src/main/java/com/example/fn/HelloFunction.j2.java b/option/src/app/fn/fn_java/src/main/java/com/example/fn/HelloFunction.j2.java
index 08276494..c59e9f95 100644
--- a/option/src/app/fn/fn_java/src/main/java/com/example/fn/HelloFunction.j2.java
+++ b/option/src/app/fn/fn_java/src/main/java/com/example/fn/HelloFunction.j2.java
@@ -9,11 +9,13 @@
 
 public class HelloFunction {
 
+	{%- if db_family != "none" %}
   private final String dbUser = System.getenv().get("DB_USER");
   private final String dbPassword = System.getenv().get("DB_PASSWORD");
   private final String dbUrl = System.getenv().get("DB_URL");
+  {%- endif %}	
 
-	{%- if db_family == "oracle" %}
+  {%- if db_family == "oracle" %}
   final static String CONN_FACTORY_CLASS_NAME = "oracle.jdbc.pool.OracleDataSource";
   private PoolDataSource poolDataSource;
 
@@ -38,6 +40,16 @@ public HelloFunction() {}
   {%- endif %}	
 
   public String handleRequest(String input) {
+    {%- if db_family == "none" %}
+		return """
+ 		[ 
+			{ "deptno": "10", "dname": "ACCOUNTING", "loc": "Seoul"},
+			{ "deptno": "20", "dname": "RESEARCH", "loc": "Cape Town"},
+			{ "deptno": "30", "dname": "SALES", "loc": "Brussels"},
+			{ "deptno": "40", "dname": "OPERATIONS", "loc": "San Francisco"}
+		] 
+		""";
+    {%- else %}
     // System.out.println("dbUser=" + dbUser + " / dbPassword=" + dbPassword + " / dbUurl=" + dbUrl);
     int counter = 0;
     StringBuffer sb = new StringBuffer();
@@ -68,5 +80,6 @@ public String handleRequest(String input) {
     }
     sb.append("]");
     return sb.toString();
+    {%- endif %}	
   }
 }
diff --git a/option/src/app/fn/fn_java_none/src/main/java/com/example/fn/HelloFunction.java b/option/src/app/fn/fn_java_none/src/main/java/com/example/fn/HelloFunction.java
deleted file mode 100644
index 78d74adf..00000000
--- a/option/src/app/fn/fn_java_none/src/main/java/com/example/fn/HelloFunction.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.example.fn;
-
-import com.fnproject.fn.api.RuntimeContext;
-
-public class HelloFunction {
-
-  public HelloFunction() {}
-
-  public String handleRequest(String input) {
-		return """
- 		[ 
-			{ "deptno": "10", "dname": "ACCOUNTING", "loc": "Seoul"},
-			{ "deptno": "20", "dname": "RESEARCH", "loc": "Cape Town"},
-			{ "deptno": "30", "dname": "SALES", "loc": "Brussels"},
-			{ "deptno": "40", "dname": "OPERATIONS", "loc": "San Francisco"}
-		] 
-		""";
-  }
-}
diff --git a/option/src/app/fn/fn_node_psql/func.js b/option/src/app/fn/fn_node_psql/func.js
index d0bc6ae5..b1371d13 100644
--- a/option/src/app/fn/fn_node_psql/func.js
+++ b/option/src/app/fn/fn_node_psql/func.js
@@ -14,7 +14,6 @@ fdk.handle(async function() {
             rejectUnauthorized: false
         }
       })
-    const [rows, fields] = await pool.query("SELECT deptno, dname, loc FROM dept");
-    connection.end();   
-    return rows.rows;
+    response = await pool.query("SELECT deptno, dname, loc FROM dept");
+    return response.rows;
 })