Refactoring of jvm folder (#428)

masesgroup · May 31, 2024 · 9096f8d · 9096f8d
1 parent 442da5e
commit 9096f8d
Show file tree

Hide file tree

Showing 106 changed files with 321 additions and 475 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -69,7 +69,9 @@ jobs:
 
       - name: Pre compile
         run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" /p:NoWarn="0108%3B1030%3B0618" src/net/JNet/JNet.csproj
-
+        env:
+          GITHUB_SIMPLIFIED_GENERATION: true
+
       - name: Set up Apache Maven Central
         uses: actions/setup-java@v4
         with: # running setup-java again overwrites the settings.xml
@@ -82,10 +84,6 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
-      - name: Install local file to be used within Javadoc plugin of generated POM
-        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.13 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
-        shell: bash
-
       - name: Create Jars
         run: mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package
         env:
@@ -132,7 +130,9 @@ jobs:
 
       - name: Pre compile
         run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" /p:NoWarn="0108%3B1030%3B0618" src\net\JNet\JNet.csproj
-
+        env:
+          GITHUB_SIMPLIFIED_GENERATION: true
+
       - name: Set up Apache Maven Central
         uses: actions/setup-java@v4
         with: # running setup-java again overwrites the settings.xml
@@ -145,10 +145,6 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
-      - name: Install local file to be used within Javadoc plugin of generated POM
-        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.13 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
-        shell: bash
-
       - name: Create Jars for JNet
         run: mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package
         env:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -114,12 +114,9 @@ jobs:
 
     - name: Maven preparation (step 1)
       if: matrix.language == 'java' 
-      run: dotnet build --no-incremental --configuration Release --framework net8.0 /p:Platform="Any CPU" /p:NoWarn="0108%3B1030%3B0618" ./src/net/JNet.sln
-
-    - name: Maven preparation (step 2)
-      if: matrix.language == 'java' 
-      run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.13 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
-      shell: bash
+      run: dotnet build --no-incremental --configuration Release --framework net8.0 /p:Platform="Any CPU" /p:NoWarn="0108%3B1030%3B0618" ./src/net/JNet/JNet.csproj
+      env:
+        GITHUB_SIMPLIFIED_GENERATION: true
 
     - if: matrix.language == 'java' 
       run: mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -25,7 +25,9 @@ jobs:
 
       - name: Pre compile
         run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" /p:NoWarn="0108%3B1030%3B0618" src/net/JNet/JNet.csproj
-
+        env:
+          GITHUB_SIMPLIFIED_GENERATION: true
+
       - name: Set up Apache Maven Central
         uses: actions/setup-java@v4
         with: # running setup-java again overwrites the settings.xml
@@ -38,10 +40,6 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
-      - name: Install local file to be used within Javadoc plugin of generated POM
-        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.13 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
-        shell: bash
-
       - name: Create Jars
         run: mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package
         env:

diff --git a/.github/workflows/generateclasses.yaml b/.github/workflows/generateclasses.yaml
@@ -46,11 +46,7 @@ jobs:
           server-password: MAVEN_CENTRAL_TOKEN # env variable for token in deploy
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
-
-      - name: Install local file to be used within Javadoc plugin of generated POM
-        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.13 -Dpackaging=jar -Dfile=../../../binReflector/net8.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
-        shell: bash
-
+
       - name: Create Jars
         run: mvn "-Djcobridgepath=../../../binReflector/net8.0/JCOBridge.jar" --file ./src/jvm/jnet/pom.xml --no-transfer-progress package
         env:

diff --git a/.github/workflows/pullrequest.yaml b/.github/workflows/pullrequest.yaml
@@ -67,7 +67,9 @@ jobs:
 
       - name: Pre compile
         run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" /p:NoWarn="0108%3B1030%3B0618" src/net/JNet/JNet.csproj
-
+        env:
+          GITHUB_SIMPLIFIED_GENERATION: true
+
       - name: Set up Apache Maven Central
         uses: actions/setup-java@v4
         with: # running setup-java again overwrites the settings.xml
@@ -80,10 +82,6 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
-      - name: Install local file to be used within Javadoc plugin of generated POM
-        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.13 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
-        shell: bash
-
       - name: Create Jars
         run: mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package
         env:
@@ -118,7 +116,9 @@ jobs:
 
       - name: Pre compile
         run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" /p:NoWarn="0108%3B1030%3B0618" src\net\JNet\JNet.csproj
-
+        env:
+          GITHUB_SIMPLIFIED_GENERATION: true
+
       - name: Set up Apache Maven Central
         uses: actions/setup-java@v4
         with: # running setup-java again overwrites the settings.xml
@@ -131,10 +131,6 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
-      - name: Install local file to be used within Javadoc plugin of generated POM
-        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.13 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
-        shell: bash
-
       - name: Create Jars
         run: mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package
         env:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -30,7 +30,9 @@ jobs:
 
       - name: Pre compile
         run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" /p:NoWarn="0108%3B1030%3B0618" src\net\JNet\JNet.csproj
-
+        env:
+          GITHUB_SIMPLIFIED_GENERATION: true
+
       - name: Set up Apache Maven Central
         uses: actions/setup-java@v4
         with: # running setup-java again overwrites the settings.xml
@@ -43,10 +45,6 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
-      - name: Install local file to be used within Javadoc plugin of generated POM
-        run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.13 -Dpackaging=jar -Dfile=../../../bin/net8.0/JCOBridge.jar -f ./src/jvm/jnet/pom.xml
-        shell: bash
-
       - name: Create Jars
         run: mvn --file ./src/jvm/jnet/pom.xml --no-transfer-progress package
         env:

diff --git a/src/jvm/jnet/pom.xml b/src/jvm/jnet/pom.xml
@@ -165,33 +165,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.6.0</version>
-                <configuration>
-                    <links>
-                        <link>https://www.jcobridge.com/api-java_${jcobridgeversion}</link>
-                    </links>
-                    <quiet>true</quiet>
-                    <source>8</source>
-                    <additionalDependencies>
-                        <additionalDependency>
-                            <groupId>JCOBridge</groupId>
-                            <artifactId>JCOBridge</artifactId>
-                            <version>${jcobridgeversion}</version>
-                        </additionalDependency>
-                    </additionalDependencies>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>

diff --git a/.../main/java/org/mases/jnet/JNetHelper.java → .../org/mases/jnet/developed/JNetHelper.java b/.../main/java/org/mases/jnet/JNetHelper.java → .../org/mases/jnet/developed/JNetHelper.java
@@ -16,7 +16,7 @@
  *  Refer to LICENSE for more information.
  */
 
-package org.mases.jnet;
+package org.mases.jnet.developed;
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;

diff --git a/...a/org/mases/jnet/JNetReflectorHelper.java → ...s/jnet/developed/JNetReflectorHelper.java b/...a/org/mases/jnet/JNetReflectorHelper.java → ...s/jnet/developed/JNetReflectorHelper.java
@@ -16,7 +16,7 @@
  *  Refer to LICENSE for more information.
  */
 
-package org.mases.jnet;
+package org.mases.jnet.developed;
 
 import org.burningwave.core.assembler.ComponentContainer;
 import org.burningwave.core.assembler.ComponentSupplier;

diff --git a/...et/lang/JNetUncaughtExceptionHandler.java → ...d/java/lang/UncaughtExceptionHandler.java b/...et/lang/JNetUncaughtExceptionHandler.java → ...d/java/lang/UncaughtExceptionHandler.java
@@ -16,18 +16,18 @@
  *  Refer to LICENSE for more information.
  */
 
-package org.mases.jnet.lang;
+package org.mases.jnet.developed.java.lang;
 
 import org.mases.jcobridge.JCListener;
 import org.mases.jcobridge.JCNativeException;
 import org.mases.jcobridge.JCObject;
 
 /**
- * The {@link JNetUncaughtExceptionHandler} class represents a generic implementation of
+ * The {@link UncaughtExceptionHandler} class represents a generic implementation of
  * {@link Thread.UncaughtExceptionHandler}
  */
-public class JNetUncaughtExceptionHandler extends JCListener implements Thread.UncaughtExceptionHandler {
-    public JNetUncaughtExceptionHandler(String key) throws JCNativeException {
+public class UncaughtExceptionHandler extends JCListener implements Thread.UncaughtExceptionHandler {
+    public UncaughtExceptionHandler(String key) throws JCNativeException {
         super(key);
     }
 

diff --git a/...a/org/mases/jnet/util/JNetComparator.java → .../jnet/developed/java/util/Comparator.java b/...a/org/mases/jnet/util/JNetComparator.java → .../jnet/developed/java/util/Comparator.java
@@ -16,22 +16,21 @@
  *  Refer to LICENSE for more information.
  */
 
-package org.mases.jnet.util;
+package org.mases.jnet.developed.java.util;
 
 import org.mases.jcobridge.*;
 
-import java.util.Comparator;
 import java.util.function.Function;
 import java.util.function.ToDoubleFunction;
 import java.util.function.ToIntFunction;
 import java.util.function.ToLongFunction;
 
 /**
- * The {@link JNetComparator} class represents a generic implementation
- * of {@link Comparator}
+ * The {@link Comparator} class represents a generic implementation
+ * of {@link java.util.Comparator}
  */
-public class JNetComparator extends JCListener implements Comparator {
-    public JNetComparator(String key) throws JCNativeException {
+public class Comparator extends JCListener implements java.util.Comparator {
+    public Comparator(String key) throws JCNativeException {
         super(key);
     }
 

diff --git a/...rg/mases/jnet/util/JNetEventListener.java → ...et/developed/java/util/EventListener.java b/...rg/mases/jnet/util/JNetEventListener.java → ...et/developed/java/util/EventListener.java
@@ -16,14 +16,10 @@
  *  Refer to LICENSE for more information.
  */
 
-/*
-*  This file is generated by MASES.JNetReflector (ver. 1.5.5.0)
-*/
-
-package org.mases.jnet.util;
+package org.mases.jnet.developed.java.util;
 
-public final class JNetEventListener extends org.mases.jcobridge.JCListener implements java.util.EventListener {
-    public JNetEventListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class EventListener extends org.mases.jcobridge.JCListener implements java.util.EventListener {
+    public EventListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 

diff --git a/...es/jnet/util/function/JNetBiConsumer.java → ...eloped/java/util/function/BiConsumer.java b/...es/jnet/util/function/JNetBiConsumer.java → ...eloped/java/util/function/BiConsumer.java
@@ -16,18 +16,16 @@
  *  Refer to LICENSE for more information.
  */
 
-package org.mases.jnet.util.function;
+package org.mases.jnet.developed.java.util.function;
 
 import org.mases.jcobridge.*;
 
-import java.util.function.BiConsumer;
-
 /**
- * The {@link JNetBiConsumer} class represents a generic implementation of
- * {@link BiConsumer}
+ * The {@link BiConsumer} class represents a generic implementation of
+ * {@link java.util.function.BiConsumer}
  */
-public final class JNetBiConsumer extends JCListener implements BiConsumer {
-    public JNetBiConsumer(String key) throws JCNativeException {
+public final class BiConsumer extends JCListener implements java.util.function.BiConsumer {
+    public BiConsumer(String key) throws JCNativeException {
         super(key);
     }
 

diff --git a/...es/jnet/util/function/JNetBiFunction.java → ...eloped/java/util/function/BiFunction.java b/...es/jnet/util/function/JNetBiFunction.java → ...eloped/java/util/function/BiFunction.java
@@ -16,18 +16,16 @@
  *  Refer to LICENSE for more information.
  */
 
-package org.mases.jnet.util.function;
+package org.mases.jnet.developed.java.util.function;
 
 import org.mases.jcobridge.*;
 
-import java.util.function.BiFunction;
-
 /**
- * The {@link JNetBiFunction} class represents a generic implementation of
- * {@link BiFunction}
+ * The {@link BiFunction} class represents a generic implementation of
+ * {@link java.util.function.BiFunction}
  */
-public final class JNetBiFunction extends JCListener implements BiFunction {
-    public JNetBiFunction(String key) throws JCNativeException {
+public final class BiFunction extends JCListener implements java.util.function.BiFunction {
+    public BiFunction(String key) throws JCNativeException {
         super(key);
     }
 

diff --git a/...s/jnet/util/function/JNetBiPredicate.java → ...loped/java/util/function/BiPredicate.java b/...s/jnet/util/function/JNetBiPredicate.java → ...loped/java/util/function/BiPredicate.java
@@ -16,18 +16,16 @@
  *  Refer to LICENSE for more information.
  */
 
-package org.mases.jnet.util.function;
+package org.mases.jnet.developed.java.util.function;
 
 import org.mases.jcobridge.*;
 
-import java.util.function.BiPredicate;
-
 /**
- * The {@link JNetBiPredicate} class represents a generic implementation of
- * {@link BiPredicate}
+ * The {@link BiPredicate} class represents a generic implementation of
+ * {@link java.util.function.BiPredicate}
  */
-public final class JNetBiPredicate extends JCListener implements BiPredicate {
-    public JNetBiPredicate(String key) throws JCNativeException {
+public final class BiPredicate extends JCListener implements java.util.function.BiPredicate {
+    public BiPredicate(String key) throws JCNativeException {
         super(key);
     }
 

diff --git a/...net/util/function/JNetBinaryOperator.java → ...ed/java/util/function/BinaryOperator.java b/...net/util/function/JNetBinaryOperator.java → ...ed/java/util/function/BinaryOperator.java
@@ -16,18 +16,16 @@
  *  Refer to LICENSE for more information.
  */
 
-package org.mases.jnet.util.function;
+package org.mases.jnet.developed.java.util.function;
 
 import org.mases.jcobridge.*;
 
-import java.util.function.BinaryOperator;
-
 /**
- * The {@link JNetBinaryOperator} class represents a generic implementation of
- * {@link BinaryOperator}
+ * The {@link BinaryOperator} class represents a generic implementation of
+ * {@link java.util.function.BinaryOperator}
  */
-public final class JNetBinaryOperator extends JCListener implements BinaryOperator {
-    public JNetBinaryOperator(String key) throws JCNativeException {
+public final class BinaryOperator extends JCListener implements java.util.function.BinaryOperator {
+    public BinaryOperator(String key) throws JCNativeException {
         super(key);
     }