Package refactoring utils

autumoswitzerland · Jul 14, 2024 · 6dc3d75 · 6dc3d75
1 parent e50b717
commit 6dc3d75
Show file tree

Hide file tree

Showing 76 changed files with 336 additions and 116 deletions.
diff --git a/cfg/beetroot_test.cfg b/cfg/beetroot_test.cfg
@@ -521,6 +521,7 @@ db_pw_encoded=no
 #       [WEB-CONTEXT-PATH] or use
 #       an absolute path. 
 #
+#db_url_h2_non_keywords=TEST1,TEST2
 db_url=jdbc:h2:./db/h2/db/test/beetroot;AUTO_SERVER=TRUE;IFEXISTS=TRUE
 #db_url=jdbc:mariadb://localhost:3306/beetroot_test
 #db_url=jdbc:postgresql://localhost:5432/beetroot

diff --git a/db/h2/db/test/beetroot.mv.db b/db/h2/db/test/beetroot.mv.db
diff --git a/gen/java/DeleteHandler.java b/gen/java/DeleteHandler.java
@@ -5,7 +5,7 @@
 
 import ch.autumo.beetroot.BeetRootHTTPSession;
 import ch.autumo.beetroot.handler.HandlerResponse;
-import ch.autumo.beetroot.utils.DB;
+import ch.autumo.beetroot.utils.database.DB;
 
 import ch.autumo.beetroot.handler.DefaultDeleteHandler;
 

diff --git a/gen/java/IndexHandler.java b/gen/java/IndexHandler.java
@@ -8,7 +8,7 @@
 import ch.autumo.beetroot.BeetRootHTTPSession;
 import ch.autumo.beetroot.Entity;
 import ch.autumo.beetroot.handler.DefaultIndexHandler;
-import ch.autumo.beetroot.utils.DB;
+import ch.autumo.beetroot.utils.database.DB;
 
 /**
  * ##Entitynameplural## index handler.

diff --git a/gen/java/ViewHandler.java b/gen/java/ViewHandler.java
@@ -8,7 +8,7 @@
 import ch.autumo.beetroot.BeetRootHTTPSession;
 import ch.autumo.beetroot.Entity;
 import ch.autumo.beetroot.handler.DefaultViewHandler;
-import ch.autumo.beetroot.utils.DB;
+import ch.autumo.beetroot.utils.database.DB;
 
 /**
  * ##Entitynameplural## view handler. 

diff --git a/src/main/java/ch/autumo/beetroot/AbstractBeetRootServlet.java b/src/main/java/ch/autumo/beetroot/AbstractBeetRootServlet.java
@@ -32,7 +32,7 @@
 
 import ch.autumo.beetroot.logging.LoggingFactory;
 import ch.autumo.beetroot.utils.UtilsException;
-import ch.autumo.beetroot.utils.Web;
+import ch.autumo.beetroot.utils.web.Web;
 
 
 /**

diff --git a/src/main/java/ch/autumo/beetroot/BeetRootConfigurationManager.java b/src/main/java/ch/autumo/beetroot/BeetRootConfigurationManager.java
@@ -39,8 +39,8 @@
 
 import ch.autumo.beetroot.security.SecureApplication;
 import ch.autumo.beetroot.utils.Helper;
-import ch.autumo.beetroot.utils.OS;
-import ch.autumo.beetroot.utils.Security;
+import ch.autumo.beetroot.utils.security.Security;
+import ch.autumo.beetroot.utils.systen.OS;
 
 
 /**
@@ -612,19 +612,39 @@ public String[] getAppRoles() {
 
 	/**
 	 * Get comma-separated values, e.g. 'a,b,c'.
+	 * If the configuration is messed up an empty
+	 * array is returned. No warning if key is missing.
+	 * 
+	 * @param key key
+	 * @return values
+	 */
+	public String[] getSepValuesNoWarn(String key) {
+		String v1 = generalProps.getProperty(key);
+		if (v1 == null || v1.length() == 0) {
+			return new String[0];
+		}
+		String v2[] = v1.split(",");
+		String res[] = new String[v2.length];
+		for (int j = 0; j < v2.length; j++) {
+			res[j] = v2[j].trim();
+		}
+		return res;
+	}
+
+	/**
+	 * Get comma-separated values, e.g. 'a,b,c'.
+	 * If no values are found an empty array
+	 * is returned.
+	 * 
 	 * @param key key
 	 * @return values
 	 */
 	public String[] getSepValues(String key) {
-
 		String v1 = generalProps.getProperty(key);
-
 		if (v1 == null || v1.length() == 0) {
-
-			LOG.warn("There are no separated values (or fields configured) for key '" + key + "' !");
+			LOG.warn("There are no separated values (or fields configured) for key '{}'!", key);
 			return new String[0];
 		}
-
 		String v2[] = v1.split(",");
 		String res[] = new String[v2.length];
 		for (int j = 0; j < v2.length; j++) {

diff --git a/src/main/java/ch/autumo/beetroot/BeetRootDatabaseManager.java b/src/main/java/ch/autumo/beetroot/BeetRootDatabaseManager.java
@@ -36,10 +36,10 @@
 import com.zaxxer.hikari.HikariDataSource;
 
 import ch.autumo.beetroot.security.SecureApplicationHolder;
-import ch.autumo.beetroot.utils.DB;
-import ch.autumo.beetroot.utils.DBField;
 import ch.autumo.beetroot.utils.Helper;
-import ch.autumo.beetroot.utils.OS;
+import ch.autumo.beetroot.utils.database.DB;
+import ch.autumo.beetroot.utils.database.DBField;
+import ch.autumo.beetroot.utils.systen.OS;
 
 /**
  * Database manager.

diff --git a/src/main/java/ch/autumo/beetroot/BeetRootWebServer.java b/src/main/java/ch/autumo/beetroot/BeetRootWebServer.java
@@ -70,13 +70,13 @@
 import ch.autumo.beetroot.server.message.ClientAnswer;
 import ch.autumo.beetroot.server.message.ServerCommand;
 import ch.autumo.beetroot.sms.MessengerFactory;
-import ch.autumo.beetroot.utils.DB;
-import ch.autumo.beetroot.utils.MIME;
-import ch.autumo.beetroot.utils.OS;
-import ch.autumo.beetroot.utils.Security;
-import ch.autumo.beetroot.utils.TwoFA;
 import ch.autumo.beetroot.utils.UtilsException;
-import ch.autumo.beetroot.utils.Web;
+import ch.autumo.beetroot.utils.common.MIME;
+import ch.autumo.beetroot.utils.database.DB;
+import ch.autumo.beetroot.utils.security.Security;
+import ch.autumo.beetroot.utils.systen.OS;
+import ch.autumo.beetroot.utils.web.TwoFA;
+import ch.autumo.beetroot.utils.web.Web;
 
 /**
  * autumo ifaceX web server and template engine.

diff --git a/src/main/java/ch/autumo/beetroot/LanguageManager.java b/src/main/java/ch/autumo/beetroot/LanguageManager.java
@@ -36,7 +36,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import ch.autumo.beetroot.utils.Web;
+import ch.autumo.beetroot.utils.web.Web;
 
 
 /**

diff --git a/src/main/java/ch/autumo/beetroot/Model.java b/src/main/java/ch/autumo/beetroot/Model.java
@@ -34,12 +34,12 @@
 
 import ch.autumo.beetroot.annotations.Column;
 import ch.autumo.beetroot.plant.Plant;
-import ch.autumo.beetroot.utils.BeanField;
-import ch.autumo.beetroot.utils.Beans;
-import ch.autumo.beetroot.utils.DB;
-import ch.autumo.beetroot.utils.Security;
-import ch.autumo.beetroot.utils.Time;
 import ch.autumo.beetroot.utils.UtilsException;
+import ch.autumo.beetroot.utils.bean.BeanField;
+import ch.autumo.beetroot.utils.bean.Beans;
+import ch.autumo.beetroot.utils.common.Time;
+import ch.autumo.beetroot.utils.database.DB;
+import ch.autumo.beetroot.utils.security.Security;
 
 
 /**

diff --git a/src/main/java/ch/autumo/beetroot/Session.java b/src/main/java/ch/autumo/beetroot/Session.java
@@ -28,8 +28,8 @@
 
 import org.nanohttpd.protocols.http.content.CookieHandler;
 
-import ch.autumo.beetroot.utils.GUIDGenerator;
-import ch.autumo.beetroot.utils.LowerCaseList;
+import ch.autumo.beetroot.utils.common.LowerCaseList;
+import ch.autumo.beetroot.utils.systen.GUIDGenerator;
 
 /**
  * User session.

diff --git a/src/main/java/ch/autumo/beetroot/cache/FileCache.java b/src/main/java/ch/autumo/beetroot/cache/FileCache.java
@@ -33,7 +33,7 @@
 import org.slf4j.LoggerFactory;
 
 import ch.autumo.beetroot.BeetRootConfigurationManager;
-import ch.autumo.beetroot.utils.MIME;
+import ch.autumo.beetroot.utils.common.MIME;
 
 /**
  * File cache.

diff --git a/src/main/java/ch/autumo/beetroot/crud/EventHandler.java b/src/main/java/ch/autumo/beetroot/crud/EventHandler.java
@@ -27,7 +27,7 @@
 import org.slf4j.LoggerFactory;
 
 import ch.autumo.beetroot.Model;
-import ch.autumo.beetroot.utils.DB;
+import ch.autumo.beetroot.utils.database.DB;
 
 
 /**

diff --git a/src/main/java/ch/autumo/beetroot/handler/BaseHandler.java b/src/main/java/ch/autumo/beetroot/handler/BaseHandler.java
@@ -71,11 +71,11 @@
 import ch.autumo.beetroot.handler.roles.Role;
 import ch.autumo.beetroot.handler.users.LogoutHandler;
 import ch.autumo.beetroot.handler.usersroles.UserRole;
-import ch.autumo.beetroot.utils.Beans;
-import ch.autumo.beetroot.utils.DB;
-import ch.autumo.beetroot.utils.Security;
-import ch.autumo.beetroot.utils.Time;
-import ch.autumo.beetroot.utils.Web;
+import ch.autumo.beetroot.utils.bean.Beans;
+import ch.autumo.beetroot.utils.common.Time;
+import ch.autumo.beetroot.utils.database.DB;
+import ch.autumo.beetroot.utils.security.Security;
+import ch.autumo.beetroot.utils.web.Web;
 import jakarta.activation.MimeType;
 
 

diff --git a/src/main/java/ch/autumo/beetroot/handler/DefaultAddHandler.java b/src/main/java/ch/autumo/beetroot/handler/DefaultAddHandler.java
@@ -36,11 +36,11 @@
 import ch.autumo.beetroot.LanguageManager;
 import ch.autumo.beetroot.Session;
 import ch.autumo.beetroot.crud.EventHandler;
-import ch.autumo.beetroot.utils.Beans;
-import ch.autumo.beetroot.utils.DB;
 import ch.autumo.beetroot.utils.Helper;
-import ch.autumo.beetroot.utils.Time;
-import ch.autumo.beetroot.utils.Web;
+import ch.autumo.beetroot.utils.bean.Beans;
+import ch.autumo.beetroot.utils.common.Time;
+import ch.autumo.beetroot.utils.database.DB;
+import ch.autumo.beetroot.utils.web.Web;
 
 /**
  * Default handler for 'web/html/&lt;entity&gt;/add.html' templates.

diff --git a/src/main/java/ch/autumo/beetroot/handler/DefaultDeleteHandler.java b/src/main/java/ch/autumo/beetroot/handler/DefaultDeleteHandler.java
@@ -22,7 +22,7 @@
 import ch.autumo.beetroot.BeetRootHTTPSession;
 import ch.autumo.beetroot.LanguageManager;
 import ch.autumo.beetroot.crud.EventHandler;
-import ch.autumo.beetroot.utils.DB;
+import ch.autumo.beetroot.utils.database.DB;
 
 /**
  * Default delete handler.

diff --git a/src/main/java/ch/autumo/beetroot/handler/DefaultEditHandler.java b/src/main/java/ch/autumo/beetroot/handler/DefaultEditHandler.java
@@ -29,10 +29,10 @@
 import ch.autumo.beetroot.Entity;
 import ch.autumo.beetroot.LanguageManager;
 import ch.autumo.beetroot.crud.EventHandler;
-import ch.autumo.beetroot.utils.Beans;
-import ch.autumo.beetroot.utils.DB;
 import ch.autumo.beetroot.utils.Helper;
-import ch.autumo.beetroot.utils.Web;
+import ch.autumo.beetroot.utils.bean.Beans;
+import ch.autumo.beetroot.utils.database.DB;
+import ch.autumo.beetroot.utils.web.Web;
 
 /**
  * Default handler for 'web/html/&lt;entity&gt;/edit.html' templates.

diff --git a/src/main/java/ch/autumo/beetroot/handler/DefaultIndexHandler.java b/src/main/java/ch/autumo/beetroot/handler/DefaultIndexHandler.java
@@ -34,11 +34,11 @@
 import ch.autumo.beetroot.LanguageManager;
 import ch.autumo.beetroot.Session;
 import ch.autumo.beetroot.SessionManager;
-import ch.autumo.beetroot.utils.BeanProcessor;
-import ch.autumo.beetroot.utils.Beans;
-import ch.autumo.beetroot.utils.DB;
 import ch.autumo.beetroot.utils.Helper;
-import ch.autumo.beetroot.utils.Web;
+import ch.autumo.beetroot.utils.bean.BeanProcessor;
+import ch.autumo.beetroot.utils.bean.Beans;
+import ch.autumo.beetroot.utils.database.DB;
+import ch.autumo.beetroot.utils.web.Web;
 
 /**
  * Default handler for 'web/html/&lt;entity&gt;/index.html' templates.

diff --git a/src/main/java/ch/autumo/beetroot/handler/DefaultRESTIndexHandler.java b/src/main/java/ch/autumo/beetroot/handler/DefaultRESTIndexHandler.java
@@ -29,8 +29,8 @@
 import ch.autumo.beetroot.BeetRootHTTPSession;
 import ch.autumo.beetroot.Constants;
 import ch.autumo.beetroot.Entity;
-import ch.autumo.beetroot.utils.BeanProcessor;
-import ch.autumo.beetroot.utils.Beans;
+import ch.autumo.beetroot.utils.bean.BeanProcessor;
+import ch.autumo.beetroot.utils.bean.Beans;
 
 /**
  * Default JSON-REST handler for listing entities.

diff --git a/src/main/java/ch/autumo/beetroot/handler/DefaultViewHandler.java b/src/main/java/ch/autumo/beetroot/handler/DefaultViewHandler.java
@@ -28,10 +28,10 @@
 import ch.autumo.beetroot.Entity;
 import ch.autumo.beetroot.LanguageManager;
 import ch.autumo.beetroot.Session;
-import ch.autumo.beetroot.utils.Beans;
-import ch.autumo.beetroot.utils.DB;
 import ch.autumo.beetroot.utils.Helper;
-import ch.autumo.beetroot.utils.Web;
+import ch.autumo.beetroot.utils.bean.Beans;
+import ch.autumo.beetroot.utils.database.DB;
+import ch.autumo.beetroot.utils.web.Web;
 
 /**
  * Default handler for 'web/html/&lt;entity&gt;/view.html' templates.

diff --git a/src/main/java/ch/autumo/beetroot/handler/ExampleDownloadHandler.java b/src/main/java/ch/autumo/beetroot/handler/ExampleDownloadHandler.java
@@ -27,7 +27,7 @@
 import ch.autumo.beetroot.BeetRootConfigurationManager;
 import ch.autumo.beetroot.BeetRootHTTPSession;
 import ch.autumo.beetroot.Constants;
-import ch.autumo.beetroot.utils.Web;
+import ch.autumo.beetroot.utils.web.Web;
 
 /**
  * Default file download handler for 'web/html/files/view.html' templates.

diff --git a/src/main/java/ch/autumo/beetroot/handler/properties/PropertiesIndexHandler.java b/src/main/java/ch/autumo/beetroot/handler/properties/PropertiesIndexHandler.java
@@ -11,7 +11,7 @@
 import ch.autumo.beetroot.Entity;
 import ch.autumo.beetroot.Session;
 import ch.autumo.beetroot.handler.DefaultIndexHandler;
-import ch.autumo.beetroot.utils.DB;
+import ch.autumo.beetroot.utils.database.DB;
 
 /**
  * Properties index handler.

diff --git a/src/main/java/ch/autumo/beetroot/handler/properties/PropertiesViewHandler.java b/src/main/java/ch/autumo/beetroot/handler/properties/PropertiesViewHandler.java
@@ -11,7 +11,7 @@
 import ch.autumo.beetroot.Entity;
 import ch.autumo.beetroot.Session;
 import ch.autumo.beetroot.handler.DefaultViewHandler;
-import ch.autumo.beetroot.utils.DB;
+import ch.autumo.beetroot.utils.database.DB;
 
 /**
  * Properties view handler. 

diff --git a/src/main/java/ch/autumo/beetroot/handler/roles/RolesIndexHandler.java b/src/main/java/ch/autumo/beetroot/handler/roles/RolesIndexHandler.java
@@ -9,7 +9,7 @@
 import ch.autumo.beetroot.Entity;
 import ch.autumo.beetroot.Session;
 import ch.autumo.beetroot.handler.DefaultIndexHandler;
-import ch.autumo.beetroot.utils.DB;
+import ch.autumo.beetroot.utils.database.DB;
 
 /**
  * Roles index handler.

diff --git a/src/main/java/ch/autumo/beetroot/handler/roles/RolesViewHandler.java b/src/main/java/ch/autumo/beetroot/handler/roles/RolesViewHandler.java
@@ -9,7 +9,7 @@
 import ch.autumo.beetroot.Entity;
 import ch.autumo.beetroot.Session;
 import ch.autumo.beetroot.handler.DefaultViewHandler;
-import ch.autumo.beetroot.utils.DB;
+import ch.autumo.beetroot.utils.database.DB;
 
 /**
  * Roles view handler. 

diff --git a/src/main/java/ch/autumo/beetroot/handler/system/LogHandler.java b/src/main/java/ch/autumo/beetroot/handler/system/LogHandler.java
@@ -35,7 +35,7 @@
 import ch.autumo.beetroot.logging.LogEventAppender;
 import ch.autumo.beetroot.server.message.ClientAnswer;
 import ch.autumo.beetroot.server.modules.log.LogFactory;
-import ch.autumo.beetroot.utils.Web;
+import ch.autumo.beetroot.utils.web.Web;
 
 
 /**

diff --git a/src/main/java/ch/autumo/beetroot/handler/tasks/TasksIndexHandler.java b/src/main/java/ch/autumo/beetroot/handler/tasks/TasksIndexHandler.java
@@ -23,8 +23,8 @@
 import ch.autumo.beetroot.Entity;
 import ch.autumo.beetroot.Session;
 import ch.autumo.beetroot.handler.DefaultIndexHandler;
-import ch.autumo.beetroot.utils.DB;
-import ch.autumo.beetroot.utils.Time;
+import ch.autumo.beetroot.utils.common.Time;
+import ch.autumo.beetroot.utils.database.DB;
 
 /**
  * Tasks index handler.

diff --git a/src/main/java/ch/autumo/beetroot/handler/tasks/TasksViewHandler.java b/src/main/java/ch/autumo/beetroot/handler/tasks/TasksViewHandler.java
@@ -22,8 +22,8 @@
 import ch.autumo.beetroot.BeetRootHTTPSession;
 import ch.autumo.beetroot.Entity;
 import ch.autumo.beetroot.handler.DefaultViewHandler;
-import ch.autumo.beetroot.utils.DB;
-import ch.autumo.beetroot.utils.Time;
+import ch.autumo.beetroot.utils.common.Time;
+import ch.autumo.beetroot.utils.database.DB;
 
 /**
  * Tasks view handler. 

diff --git a/src/main/java/ch/autumo/beetroot/handler/users/ChangeHandler.java b/src/main/java/ch/autumo/beetroot/handler/users/ChangeHandler.java
@@ -35,8 +35,8 @@
 import ch.autumo.beetroot.SessionManager;
 import ch.autumo.beetroot.handler.BaseHandler;
 import ch.autumo.beetroot.handler.HandlerResponse;
-import ch.autumo.beetroot.utils.Security;
-import ch.autumo.beetroot.utils.Time;
+import ch.autumo.beetroot.utils.common.Time;
+import ch.autumo.beetroot.utils.security.Security;
 
 /**
  * Default login handler.

diff --git a/src/main/java/ch/autumo/beetroot/handler/users/ExtUsersEditHandler.java b/src/main/java/ch/autumo/beetroot/handler/users/ExtUsersEditHandler.java
@@ -29,7 +29,7 @@
 import ch.autumo.beetroot.handler.HandlerResponse;
 import ch.autumo.beetroot.handler.roles.Role;
 import ch.autumo.beetroot.handler.usersroles.UserRole;
-import ch.autumo.beetroot.utils.DB;
+import ch.autumo.beetroot.utils.database.DB;
 
 
 /**

diff --git a/src/main/java/ch/autumo/beetroot/handler/users/ExtUsersIndexHandler.java b/src/main/java/ch/autumo/beetroot/handler/users/ExtUsersIndexHandler.java
@@ -27,8 +27,8 @@
 import ch.autumo.beetroot.Model;
 import ch.autumo.beetroot.handler.roles.Role;
 import ch.autumo.beetroot.handler.usersroles.UserRole;
-import ch.autumo.beetroot.utils.DB;
-import ch.autumo.beetroot.utils.Time;
+import ch.autumo.beetroot.utils.common.Time;
+import ch.autumo.beetroot.utils.database.DB;
 
 /**
  * Users edit handler for extended roles.