From a10814aaa2f8209a9f28cf5ee82c29ca222c58d8 Mon Sep 17 00:00:00 2001
From: pborissow <peter.borissow@yahoo.com>
Date: Sat, 20 May 2023 12:53:18 -0400
Subject: [PATCH 1/5] Add support for OpenJDK version of Nashorn

---
 src/javaxt/orm/Parser.java | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/javaxt/orm/Parser.java b/src/javaxt/orm/Parser.java
index 64865d0..991d370 100644
--- a/src/javaxt/orm/Parser.java
+++ b/src/javaxt/orm/Parser.java
@@ -1,8 +1,14 @@
 package javaxt.orm;
-import javax.script.*;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
+
+import java.util.*;
 import javaxt.json.*;
-import java.util.HashMap;
+
+//Scripting includes
+import javax.script.*;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
+import org.openjdk.nashorn.api.scripting.NashornScriptEngine;
+
 
 //******************************************************************************
 //**  Parser Class
@@ -67,13 +73,13 @@ public Model[] getModels(){
     private void init(JSONObject json){
         String packageName = json.get("package").toString();
         JSONObject models = json.get("models").toJSONObject();
-        HashMap<String, String> options = new HashMap<String, String>();
+        HashMap<String, String> options = new HashMap<>();
         for (String key : optionalVars){
             String val = json.get(key).toString();
             if (val!=null) options.put(key, val);
         }
 
-        java.util.ArrayList<Model> arr = new java.util.ArrayList<Model>();
+        ArrayList<Model> arr = new ArrayList<>();
         for (String modelName : models.keySet()){
             Model model = new Model(modelName, models.get(modelName).toJSONObject(), packageName, options);
             arr.add(model);
@@ -94,8 +100,9 @@ private JSONObject parseJavaScript(String js) throws Exception {
 
 
       //Instantiate ScriptEngine
-        ScriptEngineManager factory = new ScriptEngineManager();
-        ScriptEngine engine = factory.getEngineByName("nashorn");
+        String[] options = new String[] { "--language=es6" };
+        NashornScriptEngineFactory factory = new NashornScriptEngineFactory();
+        NashornScriptEngine engine = (NashornScriptEngine) factory.getScriptEngine(options);
 
 
       //Extract variables

From a9d4c9000917d8cd20a87a9a863aa4c1cc48394a Mon Sep 17 00:00:00 2001
From: pborissow <peter.borissow@yahoo.com>
Date: Sat, 20 May 2023 12:54:12 -0400
Subject: [PATCH 2/5] Updated pom.xml with new Nashorn dependency

---
 pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 12f4f58..94cf71a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,12 @@
       <dependency>
         <groupId>javaxt</groupId>
         <artifactId>javaxt-core</artifactId>
-        <version>1.12.1</version>
+        <version>1.12.3</version>
+      </dependency>
+      <dependency>
+        <groupId>org.openjdk.nashorn</groupId>
+        <artifactId>nashorn-core</artifactId>
+        <version>15.4</version>
       </dependency>
     </dependencies>
 

From 911becf2fe02807c36c7074555f3b12a94a4a473 Mon Sep 17 00:00:00 2001
From: pborissow <peter.borissow@yahoo.com>
Date: Sat, 20 May 2023 12:57:21 -0400
Subject: [PATCH 3/5] Added support for new "implements" keyword. Also updated
 logic for returning passwords and cleaned up database code.

---
 src/javaxt/orm/Class.txt  |   2 +-
 src/javaxt/orm/Model.java | 162 ++++++++++++++++++++++++--------------
 2 files changed, 106 insertions(+), 58 deletions(-)

diff --git a/src/javaxt/orm/Class.txt b/src/javaxt/orm/Class.txt
index 25063cb..c78c060 100644
--- a/src/javaxt/orm/Class.txt
+++ b/src/javaxt/orm/Class.txt
@@ -11,7 +11,7 @@ ${includes}
  *
  ******************************************************************************/
 
-public class ${modelName} extends javaxt.sql.Model {
+public class ${modelName} extends javaxt.sql.Model ${implements}{
 
     ${privateFields}
 
diff --git a/src/javaxt/orm/Model.java b/src/javaxt/orm/Model.java
index d1301c6..2461a13 100644
--- a/src/javaxt/orm/Model.java
+++ b/src/javaxt/orm/Model.java
@@ -1,6 +1,7 @@
 package javaxt.orm;
 import javaxt.json.*;
-import java.util.HashMap;
+import java.util.*;
+import java.util.stream.Collectors;
 
 //******************************************************************************
 //**  Model Class
@@ -13,7 +14,8 @@
 public class Model {
 
     private String name;
-    private java.util.ArrayList<Field> fields;
+    private HashSet<String> implementations;
+    private ArrayList<Field> fields;
     private static final String template = getTemplate();
     private String tableName;
     private String escapedTableName;
@@ -30,7 +32,8 @@ public class Model {
    */
     protected Model(String modelName, JSONObject modelInfo, String packageName, HashMap<String, String> options){
         this.name = modelName;
-        this.fields = new java.util.ArrayList<Field>();
+        this.implementations = new HashSet<>();
+        this.fields = new ArrayList<>();
         this.options = options;
         this.packageName = packageName;
         this.tableName = Utils.camelCaseToUnderScore(name).toLowerCase();
@@ -47,6 +50,15 @@ protected Model(String modelName, JSONObject modelInfo, String packageName, Hash
         }
 
 
+      //Get implementation classes
+        JSONArray implementations = modelInfo.get("implements").toJSONArray();
+        if (implementations!=null){
+            for (JSONValue i : implementations){
+                this.implementations.add(i.toString());
+            }
+        }
+
+
       //Parse fields
         JSONArray arr = modelInfo.get("fields").toJSONArray();
         if (arr!=null)
@@ -180,6 +192,9 @@ public String getJavaCode(){
         String str = template.replace("${modelName}", name);
         str = str.replace("${package}", packageName);
         str = str.replace("${tableName}", schemaName==null ? tableName : (schemaName + "." + tableName));
+        str = str.replace("${implements}", implementations.isEmpty() ? "" : "\r\n    implements " +
+        implementations.stream().map(Object::toString).collect(Collectors.joining(", ")) + " ");
+
 
         StringBuilder fieldMap = new StringBuilder("\r\n");
         StringBuilder privateFields = new StringBuilder();
@@ -192,7 +207,7 @@ public String getJavaCode(){
         StringBuilder hasMany = new StringBuilder();
         StringBuilder initArrays = new StringBuilder();
         String getLastModified = "";
-        java.util.TreeSet<String> includes = new java.util.TreeSet<String>();
+        java.util.TreeSet<String> includes = new java.util.TreeSet<>();
 
 
         for (int i=0; i<fields.size(); i++){
@@ -257,21 +272,31 @@ public String getJavaCode(){
 
           //Append public get method
             if (!field.isArray()){
-                if (!password){
-                    publicMembers.append("    public ");
-                    publicMembers.append(fieldType);
-                    publicMembers.append(" get");
-                    publicMembers.append(methodName);
-                    publicMembers.append("(){\r\n");
-                    publicMembers.append("        return ");
-                    publicMembers.append(fieldName);
-                    publicMembers.append(";\r\n");
-                    publicMembers.append("    }\r\n\r\n");
+
+                if (password){
+                    publicMembers.append("    /** Returns a BCrypt encrypted password */\r\n");
+                }
+
+                publicMembers.append("    public ");
+                if (password){
+                    publicMembers.append("String");
                 }
                 else{
+                    publicMembers.append(fieldType);
+                }
+                publicMembers.append(" get");
+                publicMembers.append(methodName);
+                publicMembers.append("(){\r\n");
+                publicMembers.append("        return ");
+                publicMembers.append(fieldName);
+                publicMembers.append(";\r\n");
+                publicMembers.append("    }\r\n\r\n");
+
+
+              //Add extra method if password
+                if (password){
 
-                  //Special case for password fields. Instead of a "get" method
-                  //to return the password, we'll add an authenticate method.
+                  //Add an authenticate method for password fields
                     publicMembers.append("    public boolean authenticate(String ");
                     publicMembers.append(fieldName);
                     publicMembers.append("){\r\n");
@@ -282,6 +307,28 @@ public String getJavaCode(){
                     publicMembers.append(");\r\n");
                     publicMembers.append("    }\r\n\r\n");
                 }
+
+              //Add extra method if username and implements java.security.Principal
+                if (fieldName.equals("username") && fieldType.equals("String") &&
+                    implementations.contains("java.security.Principal")){
+
+                    boolean addMethod = true;
+                    for (Field f : fields){
+                        if (f.getName().equals("name")){
+                            addMethod = false;
+                            break;
+                        }
+                    }
+
+                    if (addMethod){
+                        publicMembers.append("    public String getName(){\r\n");
+                        publicMembers.append("        return ");
+                        publicMembers.append(fieldName);
+                        publicMembers.append(";\r\n");
+                        publicMembers.append("    }\r\n\r\n");
+                    }
+                }
+
             }
             else{
 
@@ -311,7 +358,21 @@ public String getJavaCode(){
                     publicMembers.append(" ");
                     publicMembers.append(fieldName);
                     publicMembers.append("){\r\n");
-                    publicMembers.append("        this.");
+
+                    if (password){
+                        publicMembers.append("        if (BCrypt.hasSalt(");
+                        publicMembers.append(fieldName);
+                        publicMembers.append(")) this.");
+                        publicMembers.append(fieldName);
+                        publicMembers.append(" = ");
+                        publicMembers.append(fieldName);
+                        publicMembers.append(";\r\n");
+                        publicMembers.append("        else this.");
+                    }
+                    else{
+                        publicMembers.append("        this.");
+                    }
+
                     publicMembers.append(fieldName);
                     publicMembers.append(" = ");
                     if (password){
@@ -404,7 +465,7 @@ else if (fieldType.equals("Geometry")){
                 String rightTable = Utils.camelCaseToUnderScore(modelName).toLowerCase();
                 String rightColumn = rightTable + "_id";
 
-                //Special case for when a model hasMany of itself
+              //Special case for when a model hasMany of itself
                 if (leftTable.equals(rightTable))  rightColumn = rightTable + "_id2";
 
                 String tableName = leftTable + "_" + rightTable;
@@ -423,14 +484,10 @@ else if (fieldType.equals("Geometry")){
               //Update get models (see database constructor)
                 hasMany.append("\r\n\r\n");
                 hasMany.append("              //Set " + fieldName + "\r\n");
-                hasMany.append("                ArrayList<Long> " + idArray + " = new ArrayList<Long>();\r\n");
-                hasMany.append("                for (javaxt.sql.Recordset row : conn.getRecordset(\r\n");
+                hasMany.append("                for (javaxt.sql.Record record : conn.getRecords(\r\n");
                 hasMany.append("                    \"select " + rightColumn + " from " + tableName + " where " + leftColumn + "=\"+id)){\r\n");
-                hasMany.append("                    " + idArray + ".add(row.getValue(0).toLong());\r\n");
+                hasMany.append("                    " + fieldName + ".add(new " + modelName + "(record.get(0).toLong()));\r\n");
                 hasMany.append("                }\r\n");
-                hasMany.append("                for (long " + id + " : " + idArray + "){\r\n");
-                hasMany.append("                    " + fieldName + ".add(new " + modelName + "(" + id + "));\r\n");
-                hasMany.append("                }\r\n\r\n");
 
                 initArrays.append("        " + fieldName + " = new " + fieldType + "();\r\n");
 
@@ -438,24 +495,25 @@ else if (fieldType.equals("Geometry")){
               //Update save models (see save method)
                 saveModels.append("\r\n");
                 saveModels.append("          //Save " + fieldName + "\r\n");
-                saveModels.append("            ArrayList<Long> " + idArray + " = new ArrayList<Long>();\r\n");
-                saveModels.append("            for (" + modelName + " obj : " + fieldName + "){\r\n");
+                saveModels.append("            ArrayList<Long> " + idArray + " = new ArrayList<>();\r\n");
+                saveModels.append("            for (" + modelName + " obj : this." + fieldName + "){\r\n");
                 saveModels.append("                obj.save();\r\n");
                 saveModels.append("                " + idArray + ".add(obj.getID());\r\n");
                 saveModels.append("            }\r\n");
 
 
-                saveModels.append("\r\n");
-                saveModels.append("            conn.execute(\"delete from " + tableName + " where " + leftColumn + "=\" + id);\r\n");
-                saveModels.append("            rs.open(\"select * from " + tableName + " where " + leftColumn + "=\" + id, conn, false);\r\n");
-                saveModels.append("            for (long " + id + " : " + idArray + "){\r\n");
-                saveModels.append("                rs.addNew();\r\n");
-                saveModels.append("                rs.setValue(\"" + leftColumn + "\", id);\r\n");
-                saveModels.append("                rs.setValue(\"" + rightColumn + "\", " + id + ");\r\n");
-                saveModels.append("                rs.update();\r\n");
+                saveModels.append("\r\n\r\n");
+                saveModels.append("          //Link " + fieldName + " to this " + this.name + "\r\n");
+                saveModels.append("            target = \"" + tableName + " where " + leftColumn + "=\" + this.id;\r\n");
+                saveModels.append("            conn.execute(\"delete from \" + target);\r\n");
+                saveModels.append("            try (javaxt.sql.Recordset rs = conn.getRecordset(\"select * from \" + target, false)){\r\n");
+                saveModels.append("                for (long " + id + " : " + idArray + "){\r\n");
+                saveModels.append("                    rs.addNew();\r\n");
+                saveModels.append("                    rs.setValue(\"" + leftColumn + "\", this.id);\r\n");
+                saveModels.append("                    rs.setValue(\"" + rightColumn + "\", " + id + ");\r\n");
+                saveModels.append("                    rs.update();\r\n");
+                saveModels.append("                }\r\n");
                 saveModels.append("            }\r\n");
-                saveModels.append("            rs.close();\r\n");
-                saveModels.append("\r\n");
             }
 
 
@@ -574,15 +632,8 @@ else if (fieldType.equals("byte[]")){
       //Update the database constructor with hasMany variables
         if (hasMany.length()>0){
             getValues.append("\r\n\r\n");
-            getValues.append("            javaxt.sql.Connection conn = null;\r\n");
-            getValues.append("            try{\r\n");
-            getValues.append("                conn = getConnection(this.getClass());\r\n");
+            getValues.append("            try (javaxt.sql.Connection conn = getConnection(this.getClass())) {\r\n");
             getValues.append(hasMany);
-            getValues.append("                conn.close();\r\n");
-            getValues.append("            }\r\n");
-            getValues.append("            catch(SQLException e){\r\n");
-            getValues.append("                if (conn!=null) conn.close();\r\n");
-            getValues.append("                throw e;\r\n");
             getValues.append("            }\r\n");
         }
 
@@ -625,18 +676,15 @@ else if (fieldType.equals("byte[]")){
             "  //**************************************************************************\r\n" +
             "  /** Used to save a " + name + " in the database.\r\n" +
             "   */\r\n" +
-            "    public void save() throws SQLException {\r\n" +
-            "        super.save();\r\n" +
-            "        javaxt.sql.Connection conn = null;\r\n" +
-            "        try{\r\n" +
-            "            conn = getConnection(this.getClass());\r\n" +
-            "            javaxt.sql.Recordset rs = new javaxt.sql.Recordset();\r\n" +
-            "            " + saveModels + "\r\n" +
-            "            conn.close();\r\n" +
-            "        }\r\n" +
-            "        catch(SQLException e){\r\n" +
-            "            if (conn!=null) conn.close();\r\n" +
-            "            throw e;\r\n" +
+            "    public void save() throws SQLException {\r\n\r\n" +
+
+            "      //Update record in the " + this.tableName + " table\r\n" +
+            "        super.save();\r\n\r\n\r\n" +
+
+            "      //Save models\r\n" +
+            "        try (javaxt.sql.Connection conn = getConnection(this.getClass())) {\r\n" +
+            "            String target;\r\n" +
+            "            " + saveModels +
             "        }\r\n" +
             "    }\r\n";
 
@@ -711,7 +759,7 @@ public String getTableSQL(){
 
 
       //Add fields
-        java.util.ArrayList<String> foreignKeys = new java.util.ArrayList<String>();
+        java.util.ArrayList<String> foreignKeys = new java.util.ArrayList<>();
         java.util.Iterator<Field> it = fields.iterator();
         while (it.hasNext()){
             Field field = it.next();

From a7126fa07cbec1743fb992f539c44d25dca1a226 Mon Sep 17 00:00:00 2001
From: pborissow <peter.borissow@yahoo.com>
Date: Sat, 20 May 2023 13:47:17 -0400
Subject: [PATCH 4/5] Cleaned up JSONArray iterator

---
 src/javaxt/orm/Model.java | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/javaxt/orm/Model.java b/src/javaxt/orm/Model.java
index 2461a13..fee6fd8 100644
--- a/src/javaxt/orm/Model.java
+++ b/src/javaxt/orm/Model.java
@@ -14,7 +14,7 @@
 public class Model {
 
     private String name;
-    private HashSet<String> implementations;
+    private TreeSet<String> implementations;
     private ArrayList<Field> fields;
     private static final String template = getTemplate();
     private String tableName;
@@ -32,7 +32,7 @@ public class Model {
    */
     protected Model(String modelName, JSONObject modelInfo, String packageName, HashMap<String, String> options){
         this.name = modelName;
-        this.implementations = new HashSet<>();
+        this.implementations = new TreeSet<>();
         this.fields = new ArrayList<>();
         this.options = options;
         this.packageName = packageName;
@@ -207,7 +207,7 @@ public String getJavaCode(){
         StringBuilder hasMany = new StringBuilder();
         StringBuilder initArrays = new StringBuilder();
         String getLastModified = "";
-        java.util.TreeSet<String> includes = new java.util.TreeSet<>();
+        TreeSet<String> includes = new TreeSet<>();
 
 
         for (int i=0; i<fields.size(); i++){
@@ -599,15 +599,14 @@ else if (fieldType.equals("byte[]")){
                 getJson.append("        if (json.has(\"");
                 getJson.append(fieldName);
                 getJson.append("\")){\r\n");
-                getJson.append("            JSONArray _");
+                getJson.append("            for (JSONValue _");
                 getJson.append(fieldName);
-                getJson.append(" = json.get(\"");
+                getJson.append(" : json.get(\"");
                 getJson.append(fieldName);
-                getJson.append("\").toJSONArray();\r\n");
-                getJson.append("            for (int i=0; i<_" + fieldName + ".length(); i++){\r\n");
+                getJson.append("\").toJSONArray()){\r\n");
                 getJson.append("                ");
                 getJson.append(fieldName);
-                getJson.append(".add(new " + modelName + "(_" + fieldName + ".get(i).toJSONObject()));\r\n");
+                getJson.append(".add(new " + modelName + "(_" + fieldName + ".toJSONObject()));\r\n");
                 getJson.append("            }\r\n");
                 getJson.append("        }\r\n\r\n");
             }
@@ -759,8 +758,8 @@ public String getTableSQL(){
 
 
       //Add fields
-        java.util.ArrayList<String> foreignKeys = new java.util.ArrayList<>();
-        java.util.Iterator<Field> it = fields.iterator();
+        ArrayList<String> foreignKeys = new ArrayList<>();
+        Iterator<Field> it = fields.iterator();
         while (it.hasNext()){
             Field field = it.next();
             if (field.isArray()) continue;
@@ -823,7 +822,7 @@ public String getTableSQL(){
    */
     public String getDiamondTableSQL(){
         StringBuilder str = new StringBuilder();
-        java.util.Iterator<Field> it = fields.iterator();
+        Iterator<Field> it = fields.iterator();
         while (it.hasNext()){
             Field field = it.next();
             if (field.isArray()){
@@ -925,7 +924,7 @@ public String getDiamondTableSQL(){
    */
     public String getForeignKeySQL(){
         StringBuilder str = new StringBuilder();
-        java.util.Iterator<Field> it = fields.iterator();
+        Iterator<Field> it = fields.iterator();
         while (it.hasNext()){
             Field field = it.next();
             if (!field.isArray()){
@@ -967,7 +966,7 @@ public String getForeignKeySQL(){
     public String getIndexSQL(){
         StringBuilder str = new StringBuilder();
         String indexPrefix = "IDX_" + tableName.toUpperCase()+ "_";
-        java.util.Iterator<Field> it = fields.iterator();
+        Iterator<Field> it = fields.iterator();
         while (it.hasNext()){
             Field field = it.next();
             if (!field.isArray()){
@@ -1036,7 +1035,7 @@ public String getTriggerSQL(){
   /** Returns true if the model contains a lastModified date field.
    */
     protected boolean hasLastModifiedField(){
-        java.util.Iterator<Field> it = fields.iterator();
+        Iterator<Field> it = fields.iterator();
         while (it.hasNext()){
             Field field = it.next();
             if (field.isArray()) continue;

From 318973dc4ffa7d7dcb2bf19ca4fd210c33052a12 Mon Sep 17 00:00:00 2001
From: pborissow <peter.borissow@yahoo.com>
Date: Sun, 21 May 2023 09:31:30 -0400
Subject: [PATCH 5/5] Updated javaxt-core dependency in pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 94cf71a..352a3d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
       <dependency>
         <groupId>javaxt</groupId>
         <artifactId>javaxt-core</artifactId>
-        <version>1.12.3</version>
+        <version>2.0.0</version>
       </dependency>
       <dependency>
         <groupId>org.openjdk.nashorn</groupId>

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/javaxt-project/javaxt-orm/pull/2.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/javaxt-project/javaxt-orm/pull/2.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/javaxt-project/javaxt-orm/pull/2.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/javaxt-project/javaxt-orm/pull/2.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>