Graphstream, Java 17 and Arangodb

.classpath

@@ -4,7 +4,8 @@
 	<classpathentry kind="lib" path="lib/commons-dbcp2-2.0.jar"/>
 	<classpathentry kind="lib" path="lib/commons-pool2-2.2.jar"/>
 	<classpathentry kind="lib" path="lib/bcprov-jdk15on-1.50.jar"/>
-	<classpathentry kind="lib" path="lib/y.jar"/>
+	<classpathentry kind="lib" path="lib/gs-algo-2.0.jar"/>
+    <classpathentry kind="lib" path="lib/gs-core-2.0.jar"/>
 	<classpathentry kind="lib" path="lib/json-simple-1.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/commonj.sdo-2.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/la4j-0.4.9.jar"/>
@@ -20,7 +21,6 @@
 	<classpathentry kind="lib" path="lib/geronimo-jpa_2.0_spec-1.1.jar"/>
 	<classpathentry kind="lib" path="lib/stax-api-1.0.1.jar"/>
 	<classpathentry kind="lib" path="lib/mockito-all-1.9.5.jar"/>
-	<classpathentry kind="lib" path="lib/ysvg.jar"/>
 	<classpathentry kind="lib" path="lib/mason-19.jar"/>
 	<classpathentry kind="lib" path="lib/ojalgo-48.3.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-jxpath-1.3.jar"/>
@@ -71,10 +71,9 @@
 	<classpathentry kind="lib" path="lib/junit-4.13.1.jar"/>
 	<classpathentry kind="lib" path="lib/guava-18.0.jar"/>
 	<classpathentry kind="lib" path="lib/json-smart-1.3.1.jar"/>
-	<classpathentry kind="lib" path="lib/las2peer-bundle-1.1.1.jar"/>
+	<classpathentry kind="lib" path="lib/las2peer-bundle-1.2.2.jar"/>
 	<classpathentry kind="lib" path="lib/sbbi-upnplib-1.0.4.jar"/>
 	<classpathentry kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
-	<classpathentry kind="lib" path="lib/yguard-3.0.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk-14.0.2">
 		<attributes>
 			<attribute name="module" value="true"/>

.github/workflows/gradle.yml

@@ -0,0 +1,23 @@
+# This workflow will build a Java project with Gradle
+
+name: Java CI with Gradle
+
+# Triggers the workflow on push or pull request events (on every branch)
+on:
+  push:
+    branches: [gradleAndJava17]
+  pull_request:
+    branches: [gradleAndJava17]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v1
+        with:
+          java-version: 17
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Run WebOCD Tests with Gradle
+        run: ./gradlew testWithoutDB

.project

@@ -20,4 +20,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1643825602746</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:14-alpine
+FROM openjdk:17-alpine
 COPY . /usr/src/webocd
 WORKDIR /usr/src/webocd
 RUN apk update && apk add bash \
@@ -8,8 +8,8 @@ RUN apk update && apk add bash \
         ghostscript-fonts \
         build-base 
 # Fetch fitting gradle version manually because so far no os container has both jdk14 and a high enough gradle package version
-RUN mkdir ../gradleFolder && wget https://services.gradle.org/distributions/gradle-6.8.3-bin.zip -P ../gradleFolder \
- && unzip -d ../gradleFolder ../gradleFolder/gradle-6.8.3-bin.zip && rm -R ../gradleFolder/gradle-6.8.3-bin.zip
-RUN ../gradleFolder/gradle-6.8.3/bin/gradle build
+RUN mkdir ../gradleFolder && wget https://services.gradle.org/distributions/gradle-7.3.2-bin.zip -P ../gradleFolder \
+ && unzip -d ../gradleFolder ../gradleFolder/gradle-7.3.2-bin.zip && rm -R ../gradleFolder/gradle-7.3.2-bin.zip
+RUN ../gradleFolder/gradle-7.3.2/bin/gradle build
 RUN chmod +x bin/start_network.sh
 CMD ["bin/start_network.sh"]

etc/userLimitInformation.json

@@ -0,0 +1,16 @@
+[
+  {
+    "username": "default",
+    "allowedInactiveDays": "30",
+    "graphSize": "1000",
+    "graphCount": "10",
+    "coverCount": "15"
+  },
+  {
+    "username": "user1",
+    "allowedInactiveDays": "5",
+    "graphSize": "1000",
+    "graphCount": "5",
+    "coverCount": "10"
+  }
+]

gradle.properties

@@ -1,8 +1,8 @@
-core.version=1.1.1
+core.version=1.2.2
 service.name=i5.las2peer.services.ocd
 service.class=ServiceClass
 service.version=1.0.0
-java.version=14
+java.version=17
 
 las2peer_user1.name=alice
 las2peer_user1.password=pwalice

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

ocd/arangoDB/config.properties

@@ -0,0 +1,6 @@
+#Wed Sep 14 15:39:01 CEST 2022
+PORT=8529
+PASSWORD=password
+DATABASENAME=ocd_db
+HOST=127.0.0.1
+USER=root

ocd/arangoDB/config_test.properties

@@ -0,0 +1,6 @@
+#Mon Sep 12 16:36:05 CEST 2022
+PORT=8529
+PASSWORD=password
+DATABASENAME=test_db
+HOST=127.0.0.1
+USER=root

ocd/arangoDB/standard_config.properties

@@ -0,0 +1,6 @@
+#Mon Sep 12 16:36:05 CEST 2022
+PORT=8529
+PASSWORD=password
+DATABASENAME=ocd_db
+HOST=127.0.0.1
+USER=root

ocd/eclipselink/serviceCreateDDL.jdbc

@@ -1,18 +1,18 @@
-CREATE TABLE SIMULATIONSERIESGROUP (ID BIGINT NOT NULL, COOPERATIVIATY REAL, NAME VARCHAR(255), USERID BIGINT, WEALTH REAL, AVERAGE REAL, DEVIATION REAL, MAXIMUM REAL, MINIMUM REAL, VARIANCE REAL, payoffAverage REAL, payoffdeviation REAL, payoffmaximum REAL, payoffminimum REAL, payoffvariance REAL, graphId BIGINT, username VARCHAR(255), PRIMARY KEY (ID))
+CREATE TABLE SIMULATIONSERIESGROUP (ID BIGINT NOT NULL, COOPERATIVIATY REAL, NAME VARCHAR(255), USERID VARCHAR(255), WEALTH REAL, AVERAGE REAL, DEVIATION REAL, MAXIMUM REAL, MINIMUM REAL, VARIANCE REAL, payoffAverage REAL, payoffdeviation REAL, payoffmaximum REAL, payoffminimum REAL, payoffvariance REAL, graphId BIGINT, username VARCHAR(255), PRIMARY KEY (ID))
 CREATE TABLE COVER (ID BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1) NOT NULL, NAME VARCHAR(255), SIMILARITYCOSTS REAL, CREATION_METHOD BIGINT, GRAPH_ID BIGINT NOT NULL, USER_NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID, GRAPH_ID, USER_NAME))
 CREATE TABLE AGENTDATA (ID BIGINT NOT NULL, COOPERATIVITY REAL, FINALPAYOFF REAL, FINALSTRATEGY BOOLEAN, WEALTH REAL, DATASET_ID BIGINT, AGENTDATA_ID BIGINT, PRIMARY KEY (ID))
 CREATE TABLE CENTRALITYMAP (ID BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1) NOT NULL, MAP LONGVARBINARY, NAME VARCHAR(255), CREATION_METHOD BIGINT, GRAPH_ID BIGINT NOT NULL, USER_NAME VARCHAR(255) NOT NULL, PRIMARY KEY (ID, GRAPH_ID, USER_NAME))
 CREATE TABLE CUSTOMNODE (INDEX INTEGER GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1) NOT NULL, NAME VARCHAR(255), GRAPH_ID BIGINT NOT NULL, USER_NAME VARCHAR(255) NOT NULL, RUNTIME_ID INTEGER, PRIMARY KEY (INDEX, GRAPH_ID, USER_NAME))
 CREATE TABLE CUSTOMGRAPH (ID BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1) NOT NULL, USER_NAME VARCHAR(255) NOT NULL, NAME VARCHAR(255), INDEX_PATH VARCHAR(255), CREATION_METHOD BIGINT, PRIMARY KEY (ID, USER_NAME))
 CREATE TABLE COVERCREATIONLOG (ID BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1) NOT NULL, STATUS INTEGER, TYPE INTEGER, PRIMARY KEY (ID))
 CREATE TABLE GRAPHCREATIONLOG (ID BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1) NOT NULL, STATUS INTEGER, TYPE INTEGER, PRIMARY KEY (ID))
-CREATE TABLE SIMULATIONSERIES (ID BIGINT NOT NULL, COOPERATIVIATY REAL, GENERATIONS INTEGER, NAME VARCHAR(255), USERID BIGINT, WEALTH REAL, AVERAGE REAL, DEVIATION REAL, MAXIMUM REAL, MINIMUM REAL, VARIANCE REAL, CONDITION VARCHAR(255), DYNAMIC VARCHAR(255), DYNAMICVALUE REAL, GAME VARCHAR(255), graphId BIGINT, GRAPHNAME VARCHAR(255), ITERATIONS INTEGER, MAXITERATIONS INTEGER, MINITERATIONS INTEGER, PAYOFFCC REAL, PAYOFFCD REAL, PAYOFFDC REAL, PAYOFFDD REAL, SIMULATIONNAME VARCHAR(255), THRESHOLD INTEGER, TIMEWINDOW INTEGER, payoffAverage REAL, payoffdeviation REAL, payoffmaximum REAL, payoffminimum REAL, payoffvariance REAL, username VARCHAR(255), PRIMARY KEY (ID))
+CREATE TABLE SIMULATIONSERIES (ID BIGINT NOT NULL, COOPERATIVIATY REAL, GENERATIONS INTEGER, NAME VARCHAR(255), USERID VARCHAR(255), WEALTH REAL, AVERAGE REAL, DEVIATION REAL, MAXIMUM REAL, MINIMUM REAL, VARIANCE REAL, CONDITION VARCHAR(255), DYNAMIC VARCHAR(255), DYNAMICVALUE REAL, GAME VARCHAR(255), graphId BIGINT, GRAPHNAME VARCHAR(255), ITERATIONS INTEGER, MAXITERATIONS INTEGER, MINITERATIONS INTEGER, PAYOFFCC REAL, PAYOFFCD REAL, PAYOFFDC REAL, PAYOFFDD REAL, SIMULATIONNAME VARCHAR(255), THRESHOLD INTEGER, TIMEWINDOW INTEGER, payoffAverage REAL, payoffdeviation REAL, payoffmaximum REAL, payoffminimum REAL, payoffvariance REAL, username VARCHAR(255), PRIMARY KEY (ID))
 CREATE TABLE CENTRALITYCREATIONLOG (ID BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1) NOT NULL, CENTRALITY_TYPE INTEGER, CREATION_TYPE INTEGER, EXECUTION_TIME BIGINT, STATUS INTEGER, PRIMARY KEY (ID))
 CREATE TABLE COMMUNITY (ID BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1) NOT NULL, COLOR INTEGER, NAME VARCHAR(255), GRAPH_ID BIGINT NOT NULL, USER_NAME VARCHAR(255) NOT NULL, COVER_ID BIGINT NOT NULL, PRIMARY KEY (ID, GRAPH_ID, USER_NAME, COVER_ID))
 CREATE TABLE GROUPPARAMETERS (DYNAMIC VARCHAR(255), GAME VARCHAR(255), GRAPHID BIGINT, SCALING INTEGER, SIMULATIONS_ID BIGINT NOT NULL, PRIMARY KEY (SIMULATIONS_ID))
 CREATE TABLE CUSTOMEDGE (ID INTEGER GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1) NOT NULL, WEIGHT REAL, GRAPH_ID BIGINT NOT NULL, USER_NAME VARCHAR(255) NOT NULL, SOURCE_INDEX INTEGER, TARGET_INDEX INTEGER, RUNTIME_ID INTEGER, PRIMARY KEY (ID, GRAPH_ID, USER_NAME))
 CREATE TABLE OCDMETRICLOG (ID BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1) NOT NULL, STATUS INTEGER, TYPE INTEGER, VALUE REAL, GRAPH_ID BIGINT NOT NULL, USER_NAME VARCHAR(255) NOT NULL, COVER_ID BIGINT NOT NULL, PRIMARY KEY (ID, GRAPH_ID, USER_NAME, COVER_ID))
-CREATE TABLE SIMULATIONDATASET (ID BIGINT NOT NULL, COOPERATIVIATY REAL, FINALCOOPERATIONVALUE REAL, FINALPAYOFFVALUE REAL, ITERATIONS REAL, NAME VARCHAR(255), USERID BIGINT, WEALTH REAL, AVERAGE REAL, DEVIATION REAL, MAXIMUM REAL, MINIMUM REAL, VARIANCE REAL, payoffAverage REAL, payoffdeviation REAL, payoffmaximum REAL, payoffminimum REAL, payoffvariance REAL, graphId BIGINT, username VARCHAR(255), simulationSeries BIGINT, SIMULATIONDATASETS_ID BIGINT, PRIMARY KEY (ID))
+CREATE TABLE SIMULATIONDATASET (ID BIGINT NOT NULL, COOPERATIVIATY REAL, FINALCOOPERATIONVALUE REAL, FINALPAYOFFVALUE REAL, ITERATIONS REAL, NAME VARCHAR(255), USERID VARCHAR(255), WEALTH REAL, AVERAGE REAL, DEVIATION REAL, MAXIMUM REAL, MINIMUM REAL, VARIANCE REAL, payoffAverage REAL, payoffdeviation REAL, payoffmaximum REAL, payoffminimum REAL, payoffvariance REAL, graphId BIGINT, username VARCHAR(255), simulationSeries BIGINT, SIMULATIONDATASETS_ID BIGINT, PRIMARY KEY (ID))
 CREATE TABLE SIMULATIONSERIESGROUP_SIMULATIONSERIES (SimulationSeriesGroup_ID BIGINT NOT NULL, seriesList_ID BIGINT NOT NULL, PRIMARY KEY (SimulationSeriesGroup_ID, seriesList_ID))
 CREATE TABLE CustomGraph_PROPERTIES (ID BIGINT, USER_NAME VARCHAR(255), PROPERTIES REAL)
 CREATE TABLE CustomGraph_TYPES (ID BIGINT, USER_NAME VARCHAR(255), TYPES INTEGER)
@@ -66,3 +66,5 @@ ALTER TABLE SimulationDataset_COOPERATIONVALUES ADD CONSTRAINT SmlationDatasetCO
 ALTER TABLE SimulationDataset_PAYOFFVALUES ADD CONSTRAINT SimulationDataset_PAYOFFVALUESSimulationDataset_ID FOREIGN KEY (SimulationDataset_ID) REFERENCES SIMULATIONDATASET (ID)
 CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT NUMERIC(38), PRIMARY KEY (SEQ_NAME))
 INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0)
+CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(50) NOT NULL, SEQ_COUNT NUMERIC(38), PRIMARY KEY (SEQ_NAME))
+INSERT INTO SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0)