added improved file-line-replace tool

Author: fquirin

src/main/java/net/b07z/sepia/server/core/tools/FilesAndStreams.java

@@ -24,6 +24,18 @@
  *
  */
 public class FilesAndStreams {
+	
+	//----helpers:
+	
+	/**
+	 * Generic class to give line operations as lambda expressions.
+	 */
+	public static interface LineOperation {
+		/**
+		 * Take line as input and return modified line.
+		 */
+		public String run(String lineInput);
+	}
 
 	/**
 	 * Collect all data of an InputStream to a string. 
@@ -103,14 +115,27 @@ public static boolean writeFileFromList(String pathWithName, List<String> fileCo
 	}
 
 	/**
-	 * Open a file, search first line by regular expression, then replace with new line.
+	 * Open a file, search line by regular expression then replace with new line.
 	 * Stops after first match.
 	 * @param pathWithName - path to file including file-name
 	 * @param lineMatchRegExp - regular expression to find line
 	 * @param replacement - complete line is replaced by this
 	 * @return true (all good), false (error during read/write or line not found)
 	 */
 	public static boolean replaceLineInFile(String pathWithName, String lineMatchRegExp, String replacement){
+		return replaceLineInFile(pathWithName, lineMatchRegExp, (oldLine) -> {
+			return replacement;
+		});
+	}
+	/**
+	 * Open a file, search line by regular expression then modify line by custom operation and store modifications.
+	 * Stops after first match.
+	 * @param pathWithName - path to file including file-name
+	 * @param lineMatchRegExp - regular expression to find line
+	 * @param lineOperation - modify line by using this with {@link LineOperation} (use lambda expression)
+	 * @return true (all good), false (error during read/write or line not found)
+	 */
+	public static boolean replaceLineInFile(String pathWithName, String lineMatchRegExp, LineOperation lineOperation){
 		try {
 			Path path = Paths.get(pathWithName);
 			List<String> fileContent = new ArrayList<>(Files.readAllLines(path, StandardCharsets.UTF_8));
@@ -119,7 +144,8 @@ public static boolean replaceLineInFile(String pathWithName, String lineMatchReg
 				String line = fileContent.get(i);
 			    if (line.matches(lineMatchRegExp)) {
 			    	foundLine = true;
-			        fileContent.set(i, replacement);
+			    	String newLine = lineOperation.run(line);
+			        fileContent.set(i, newLine);
 			        break;
 			    }
 			}

src/main/java/net/b07z/sepia/server/core/tools/SandboxClassLoader.java

@@ -4,7 +4,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Class loader to be used for plugins to make them run in a sandbox.
@@ -14,7 +14,7 @@
  */
 public class SandboxClassLoader extends URLClassLoader {
     //black-list classes
-	private ArrayList<String> blackList;
+	private List<String> blackList;
 
 	/*
 	public SandboxClassLoader(URL fileUrl) {
@@ -24,7 +24,7 @@ public SandboxClassLoader(File fileOrDir) throws MalformedURLException {
         super(new URL[]{fileOrDir.toURI().toURL()});
     }
     */
-    public SandboxClassLoader(File fileOrDir, ArrayList<String> blackList) throws MalformedURLException {
+    public SandboxClassLoader(File fileOrDir, List<String> blackList) throws MalformedURLException {
         super(new URL[]{fileOrDir.toURI().toURL()});
         this.blackList = blackList;
     }

src/test/java/tools/ToolsPlayground.java

@@ -33,9 +33,11 @@ public static void main(String[] args) {
 		System.out.println("password client hash: " + hash);
 		hash = hashPassword("!§$%&/()=?`");
 		System.out.println("password client hash: " + hash);
+		hash = hashPassword("test12345!_");
+		System.out.println("password client hash: " + hash);
 
 		/* -- Elasticsearch queries -- */
-		
+		/*
 		//double-match for simple field
 		String query = getBoolMustMatch();
 		System.out.println("query must-must: " + query);
@@ -58,7 +60,7 @@ public static void main(String[] args) {
 		//getAnswersByType query with JsonGenerator
 		query = getAnswersQueryWithBuilder();
 		System.out.println("getAnswersByType query with builder: " + query);
-		
+		*/
 	}
 
 	/* -- Password client hash -- */