swap version and add debug details (#4806)

* [ci fw-only Java/greenlightning]

swap versions

* [ci fw-only Java/greenlightning]

go back to simple file

frameworks/Java/greenlightning/pom.xml

@@ -2,9 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.ociweb.gl.benchmark</groupId>
+	<groupId>com.javanut.gl.benchmark</groupId>
 	<artifactId>benchmark-test</artifactId>
-	<version>1.0.37</version> 
+	<version>1.1.1</version> 
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -12,7 +12,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>com.ociweb</groupId>
+			<groupId>com.javanut</groupId>
 			<artifactId>greenlightning</artifactId>
 			<version>${project.version}</version> <!-- must be a fixed version for techempower releases -->
 		</dependency>
@@ -97,7 +97,7 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>com.ociweb.gl.benchmark.GreenLightning</mainClass>
+							<mainClass>com.javanut.gl.benchmark.GreenLightning</mainClass>
 						</manifest>
 					</archive>
 					<descriptorRefs>

frameworks/Java/greenlightning/src/main/java/com/ociweb/gl/benchmark/DBRest.java → frameworks/Java/greenlightning/src/main/java/com/javanut/gl/benchmark/DBRest.java

@@ -1,11 +1,11 @@
-package com.ociweb.gl.benchmark;
+package com.javanut.gl.benchmark;
 
-import com.ociweb.gl.api.GreenRuntime;
-import com.ociweb.gl.api.HTTPRequestReader;
-import com.ociweb.gl.api.HTTPResponseService;
-import com.ociweb.gl.api.PubSubMethodListener;
-import com.ociweb.gl.api.RestMethodListener;
-import com.ociweb.gl.api.TickListener;
+import com.javanut.gl.api.GreenRuntime;
+import com.javanut.gl.api.HTTPRequestReader;
+import com.javanut.gl.api.HTTPResponseService;
+import com.javanut.gl.api.PubSubMethodListener;
+import com.javanut.gl.api.RestMethodListener;
+import com.javanut.gl.api.TickListener;
 
 import io.reactiverse.pgclient.PgPoolOptions;
 

frameworks/Java/greenlightning/src/main/java/com/ociweb/gl/benchmark/Field.java → frameworks/Java/greenlightning/src/main/java/com/javanut/gl/benchmark/Field.java

@@ -1,4 +1,4 @@
-package com.ociweb.gl.benchmark;
+package com.javanut.gl.benchmark;
 
 public enum Field {
 	//identifiers for each field used by routes and/or structures

frameworks/Java/greenlightning/src/main/java/com/ociweb/gl/benchmark/FortuneObject.java → frameworks/Java/greenlightning/src/main/java/com/javanut/gl/benchmark/FortuneObject.java

@@ -1,4 +1,4 @@
-package com.ociweb.gl.benchmark;
+package com.javanut.gl.benchmark;
 
 public class FortuneObject implements Comparable<FortuneObject>{
 

frameworks/Java/greenlightning/src/main/java/com/ociweb/gl/benchmark/FortunesObject.java → frameworks/Java/greenlightning/src/main/java/com/javanut/gl/benchmark/FortunesObject.java

@@ -1,4 +1,4 @@
-package com.ociweb.gl.benchmark;
+package com.javanut.gl.benchmark;
 
 import java.util.ArrayList;
 import java.util.Collections;

frameworks/Java/greenlightning/src/main/java/com/ociweb/gl/benchmark/FrameworkTest.java → frameworks/Java/greenlightning/src/main/java/com/javanut/gl/benchmark/FrameworkTest.java

@@ -1,17 +1,11 @@
-package com.ociweb.gl.benchmark;
+package com.javanut.gl.benchmark;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import com.ociweb.gl.api.GreenApp;
-import com.ociweb.gl.api.GreenCommandChannel;
-/**
- * ************************************************************************
- * For greenlightning support, training or feature reqeusts please contact:
- *   [email protected]   (314) 579-0066
- * ************************************************************************
- */
-import com.ociweb.gl.api.GreenFramework;
-import com.ociweb.gl.api.GreenRuntime;
+import com.javanut.gl.api.GreenApp;
+import com.javanut.gl.api.GreenCommandChannel;
+import com.javanut.gl.api.GreenFramework;
+import com.javanut.gl.api.GreenRuntime;
 
 import io.reactiverse.pgclient.PgClient;
 import io.reactiverse.pgclient.PgPool;
@@ -172,7 +166,7 @@ public class FrameworkTest implements GreenApp {
     			 //NOTE: not sure this is optimal yet ...
     			 //TODO: neeed to allow for multiple writes one pipe! big dif.
     			// .setConcurrentChannelsPerEncryptUnit(Math.max(1,concurrentWritesPerChannel/2))  //8K    
-    			 .setConcurrentChannelsPerEncryptUnit(concurrentWritesPerChannel/80)   // /8)//4)
+    			 .setConcurrentChannelsPerEncryptUnit(concurrentWritesPerChannel/80)  ///80) ///16) // /8)//4)
     			 //TODO: we need smaller count of connections but MORE writers.
     			 
     			 .disableEPoll() //provides advantage in JSON test....

frameworks/Java/greenlightning/src/main/java/com/javanut/gl/benchmark/GreenLightning.java

@@ -0,0 +1,14 @@
+package com.javanut.gl.benchmark;
+
+import com.javanut.gl.api.GreenRuntime;
+import com.javanut.pronghorn.stage.scheduling.GraphManager;
+
+public class GreenLightning {
+
+	public static void main(String[] args) {
+		
+		GreenRuntime.run(new FrameworkTest(),args);
+	
+	}
+	
+}

frameworks/Java/greenlightning/src/main/java/com/ociweb/gl/benchmark/PoolManager.java → frameworks/Java/greenlightning/src/main/java/com/javanut/gl/benchmark/PoolManager.java

@@ -1,4 +1,4 @@
-package com.ociweb.gl.benchmark;
+package com.javanut.gl.benchmark;
 
 import io.reactiverse.pgclient.PgClient;
 import io.reactiverse.pgclient.PgPool;

frameworks/Java/greenlightning/src/main/java/com/ociweb/gl/benchmark/ProcessFortune.java → frameworks/Java/greenlightning/src/main/java/com/javanut/gl/benchmark/ProcessFortune.java

@@ -1,10 +1,10 @@
-package com.ociweb.gl.benchmark;
+package com.javanut.gl.benchmark;
 
-import com.ociweb.gl.api.HTTPRequestReader;
-import com.ociweb.gl.api.HTTPResponseService;
-import com.ociweb.pronghorn.network.config.HTTPContentTypeDefaults;
-import com.ociweb.pronghorn.pipe.ObjectPipe;
-import com.ociweb.pronghorn.util.AppendableBuilder;
+import com.javanut.gl.api.HTTPRequestReader;
+import com.javanut.gl.api.HTTPResponseService;
+import com.javanut.pronghorn.network.config.HTTPContentTypeDefaults;
+import com.javanut.pronghorn.pipe.ObjectPipe;
+import com.javanut.pronghorn.util.AppendableBuilder;
 
 import io.reactiverse.pgclient.PgIterator;
 import io.reactiverse.pgclient.Row;

frameworks/Java/greenlightning/src/main/java/com/ociweb/gl/benchmark/ProcessQuery.java → frameworks/Java/greenlightning/src/main/java/com/javanut/gl/benchmark/ProcessQuery.java

@@ -1,13 +1,13 @@
-package com.ociweb.gl.benchmark;
+package com.javanut.gl.benchmark;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 
-import com.ociweb.gl.api.HTTPRequestReader;
-import com.ociweb.gl.api.HTTPResponseService;
-import com.ociweb.pronghorn.network.config.HTTPContentTypeDefaults;
-import com.ociweb.pronghorn.pipe.ObjectPipe;
+import com.javanut.gl.api.HTTPRequestReader;
+import com.javanut.gl.api.HTTPResponseService;
+import com.javanut.pronghorn.network.config.HTTPContentTypeDefaults;
+import com.javanut.pronghorn.pipe.ObjectPipe;
 
 import io.reactiverse.pgclient.PgIterator;
 import io.reactiverse.pgclient.PgPool;

frameworks/Java/greenlightning/src/main/java/com/ociweb/gl/benchmark/ProcessUpdate.java → frameworks/Java/greenlightning/src/main/java/com/javanut/gl/benchmark/ProcessUpdate.java

@@ -1,4 +1,4 @@
-package com.ociweb.gl.benchmark;
+package com.javanut.gl.benchmark;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -6,10 +6,10 @@ import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import com.ociweb.gl.api.HTTPRequestReader;
-import com.ociweb.gl.api.HTTPResponseService;
-import com.ociweb.pronghorn.network.config.HTTPContentTypeDefaults;
-import com.ociweb.pronghorn.pipe.ObjectPipe;
+import com.javanut.gl.api.HTTPRequestReader;
+import com.javanut.gl.api.HTTPResponseService;
+import com.javanut.pronghorn.network.config.HTTPContentTypeDefaults;
+import com.javanut.pronghorn.pipe.ObjectPipe;
 
 import io.reactiverse.pgclient.PgIterator;
 import io.reactiverse.pgclient.Tuple;

frameworks/Java/greenlightning/src/main/java/com/ociweb/gl/benchmark/ResultObject.java → frameworks/Java/greenlightning/src/main/java/com/javanut/gl/benchmark/ResultObject.java

@@ -1,4 +1,4 @@
-package com.ociweb.gl.benchmark;
+package com.javanut.gl.benchmark;
 
 public class ResultObject {
 

frameworks/Java/greenlightning/src/main/java/com/ociweb/gl/benchmark/SimpleRest.java → frameworks/Java/greenlightning/src/main/java/com/javanut/gl/benchmark/SimpleRest.java

@@ -1,11 +1,11 @@
-package com.ociweb.gl.benchmark;
+package com.javanut.gl.benchmark;
 
-import com.ociweb.gl.api.GreenRuntime;
-import com.ociweb.gl.api.HTTPRequestReader;
-import com.ociweb.gl.api.HTTPResponseService;
-import com.ociweb.gl.api.RestMethodListener;
-import com.ociweb.json.encode.JSONRenderer;
-import com.ociweb.pronghorn.network.config.HTTPContentTypeDefaults;
+import com.javanut.gl.api.GreenRuntime;
+import com.javanut.gl.api.HTTPRequestReader;
+import com.javanut.gl.api.HTTPResponseService;
+import com.javanut.gl.api.RestMethodListener;
+import com.javanut.json.encode.JSONRenderer;
+import com.javanut.pronghorn.network.config.HTTPContentTypeDefaults;
 
 public class SimpleRest implements RestMethodListener {
 

frameworks/Java/greenlightning/src/main/java/com/ociweb/gl/benchmark/Struct.java → frameworks/Java/greenlightning/src/main/java/com/javanut/gl/benchmark/Struct.java

@@ -1,4 +1,4 @@
-package com.ociweb.gl.benchmark;
+package com.javanut.gl.benchmark;
 
 public enum Struct {
 	PLAINTEXT_ROUTE, JSON_ROUTE, 

frameworks/Java/greenlightning/src/main/java/com/ociweb/gl/benchmark/Templates.java → frameworks/Java/greenlightning/src/main/java/com/javanut/gl/benchmark/Templates.java

@@ -1,11 +1,11 @@
-package com.ociweb.gl.benchmark;
+package com.javanut.gl.benchmark;
 
 import java.util.List;
 
-import com.ociweb.json.encode.JSONRenderer;
-import com.ociweb.pronghorn.util.Appendables;
-import com.ociweb.pronghorn.util.template.StringTemplateBuilder;
-import com.ociweb.pronghorn.util.template.StringTemplateRenderer;
+import com.javanut.json.encode.JSONRenderer;
+import com.javanut.pronghorn.util.Appendables;
+import com.javanut.pronghorn.util.template.StringTemplateBuilder;
+import com.javanut.pronghorn.util.template.StringTemplateRenderer;
 
 public class Templates {
 	

frameworks/Java/greenlightning/src/main/java/com/ociweb/gl/benchmark/GreenLightning.java

@@ -1,17 +0,0 @@
-package com.ociweb.gl.benchmark;
-
-import com.ociweb.gl.api.GreenRuntime;
-import com.ociweb.pronghorn.stage.scheduling.GraphManager;
-
-public class GreenLightning {
-
-	public static void main(String[] args) {
-
-		GraphManager.showThreadIdOnTelemetry = true;
-		GraphManager.showScheduledRateOnTelemetry = true;
-		                      
-		GreenRuntime.run(new FrameworkTest(),args);
-	
-	}
-	
-}

frameworks/Java/greenlightning/src/main/resources/GreenLight.props

@@ -1 +1 @@
-main=com.ociweb.gl.benchmark.FrameworkTest
+main=com.javanut.gl.benchmark.FrameworkTest