ok

Author: cekvenich

SNX_01/build.gradle

@@ -27,7 +27,7 @@ sourceSets {e
 
 dependencies {
     implementation 'org.scala-lang:scala-library:2.13.1'
-    implementation 'com.github.cekvenich:SNX:0.0.109'
+    implementation 'com.github.cekvenich:SNX:0.0.112'
 }
 application {
     mainClassName = 'DBApp'

SNX_02/build.gradle

@@ -27,7 +27,7 @@ sourceSets {e
 
 dependencies {
     implementation 'org.scala-lang:scala-library:2.13.1'
-    implementation 'com.github.cekvenich:SNX:0.0.109'
+    implementation 'com.github.cekvenich:SNX:0.0.112'
 }
 application {
     mainClassName = 'DBApp'

SNXj_90/build.gradle

@@ -22,7 +22,7 @@ targetCompatibility = JavaVersion.VERSION_11
 }*/
 
 dependencies {
-    implementation 'com.github.cekvenich:SNX:0.0.109'    
+    implementation 'com.github.cekvenich:SNX:0.0.112'    
 }
 application {
     // Define the main class for the application.

SNXj_90/src/main/java/org/SNXex/db/LoadS3.java

@@ -10,6 +10,7 @@
 
 import org.apache.SNX.SNX;
 import org.apache.SNX.db.BasicS3Util;
+import org.apache.SNX.util.JACodecUtil;
 import org.apache.SNX.util.TimerU;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
@@ -36,17 +37,16 @@ public void load(BasicS3Util s3) throws Throwable {
 		List<String> lst =_s3.find(prefix);
 		String key = lst.get(0);
 		System.out.println(key);
-		
-		
+				
 		List<Map<String,Object>> rows = _s3.getAsList(key);
 
-		
 		Map row = rows.get(0);
 
 		System.out.println(row);
 
 	}
 
+
 	protected void ins() throws Throwable {
 		int mCount = 2; // 25*40* 1000 = 1 Million
 		int i = 0;

SNXtst/build.gradle

@@ -21,7 +21,7 @@ targetCompatibility = JavaVersion.VERSION_11
 }*/
 
 dependencies {
-    implementation 'com.github.cekvenich:SNX:0.0.109'
+    implementation 'com.github.cekvenich:SNX:0.0.112'
 
 
 

deleted/src/main/java/org/apache/SNX/SNX.java

@@ -6,7 +6,7 @@ public class SNX {
 	 * Just print out some version / info
 	 */
 	public String getSNX() {
-		String ver = "V: 0.0.109";
+		String ver = "V: 0.0.112";
 		System.out.println(ver);
 		return ver;
 	}

deleted/src/main/java/org/apache/SNX/db/BasicS3Util.java

@@ -9,7 +9,6 @@
 import java.util.UUID;
 
 import org.apache.SNX.util.JACodecUtil;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -43,7 +42,7 @@ protected int getKeyPosition(String prefixPlusKey) {
 
 	public List<String> find(String prefix) throws Throwable {
 		Iterable<Result<Item>> iter = _mclient.listObjects(_bucket, prefix, true);
-		
+
 		List<String> lst = new ArrayList();
 		for (Result<Item> result : iter) {
 			Item item = result.get();
@@ -70,7 +69,7 @@ public void put(String prefix, InputStream ins) throws Throwable {
 		key = key.replaceAll("[^a-zA-Z0-9]", "");// clean
 		_mclient.putObject(_bucket, prefix + "/" + key, ins, "application/octet-stream");
 	}
-	
+
 	/**
 	 * Auto generates guid, you only pass the prefix
 	 */
@@ -91,9 +90,9 @@ public void remove(String prefixPlusKey) throws Throwable {
 	 */
 	public Map getAsMap(String prefixPlusKey) throws Throwable {
 		InputStream is = _mclient.getObject(_bucket, prefixPlusKey);
-		byte[] array = IOUtils.toByteArray(is);
+		byte[] array = is.readAllBytes();
 		InputStream ins = new ByteArrayInputStream(array);
-		
+
 		String s = JACodecUtil.toStr(ins);
 		return JACodecUtil.toMap(s);
 	}
@@ -104,19 +103,18 @@ public Map getAsMap(String prefixPlusKey) throws Throwable {
 	 */
 	public List<Map<String, Object>> getAsList(String prefixPlusKey) throws Throwable {
 		InputStream is = _mclient.getObject(_bucket, prefixPlusKey);
-		byte[] array = IOUtils.toByteArray(is);
+		byte[] array = is.readAllBytes();
 		InputStream ins = new ByteArrayInputStream(array);
-		
+
 		String s = JACodecUtil.toStr(ins);
 		return JACodecUtil.toList(s);
 	}
 
 	public InputStream get(String prefixPlusKey) throws Throwable {
 		InputStream is = _mclient.getObject(_bucket, prefixPlusKey);
-		byte[] array = IOUtils.toByteArray(is);
+		byte[] array = is.readAllBytes();
 		InputStream ins = new ByteArrayInputStream(array);
 		return ins;
 	}
 
-	
 }// class

deleted/src/main/java/org/apache/SNX/util/HNetUtil.java

@@ -1,5 +1,8 @@
 package org.apache.SNX.util;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.DatagramSocket;
 import java.net.InetAddress;
 import java.nio.charset.StandardCharsets;
@@ -15,6 +18,19 @@ public class HNetUtil {
 
 	public static final String OK = "OK";
 
+	/**
+	 * 
+	 * @deprecated
+	 */
+	public static byte[] getBytesFromInputStream(InputStream is) throws IOException {
+		ByteArrayOutputStream os = new ByteArrayOutputStream();
+		byte[] buffer = new byte[0xFFFF];
+		for (int len = is.read(buffer); len != -1; len = is.read(buffer)) {
+			os.write(buffer, 0, len);
+		}
+		return os.toByteArray();
+	}
+
 	public static Map<String, String> qsToMap(final String uri_) {
 		if (!uri_.contains("?"))
 			return null;

deleted/src/main/java/org/apache/SNX/util/JACodecUtil.java

@@ -1,21 +1,18 @@
 package org.apache.SNX.util;
 
-import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.lang.invoke.MethodHandles;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
 
 public class JACodecUtil {
 	static Log LOG = LogFactory.getLog(MethodHandles.lookup().lookupClass());
@@ -84,8 +81,8 @@ public static String toStr8(byte[] ba) {
 		return new String(ba, StandardCharsets.UTF_8);
 	}
 
-	static public String toStr(InputStream ins) {
-		return new BufferedReader(new InputStreamReader(ins)).lines().collect(Collectors.joining("\n"));
+	static public String toStr(InputStream ins) throws IOException {
+		return new String(ins.readAllBytes(), StandardCharsets.UTF_8);
 	}
 
 	static public InputStream toIns(String str) throws Throwable {