Merge pull request #375 from JarvisCraft/1.0.0-rc.10

JarvisCraft · Jul 1, 2022 · 6ddafd1 · 6ddafd1
2 parents 0a88810 + bb32458
commit 6ddafd1
Show file tree

Hide file tree

Showing 29 changed files with 567 additions and 256 deletions.
diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml
@@ -19,22 +19,22 @@ jobs:
       security-events: write
 
     steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v3.0.2
 
     - name: Set up Java 17
-      uses: actions/setup-java@v2.5.0
+      uses: actions/setup-java@v3.4.0
       with:
         distribution: 'zulu'
         java-version: '17'
         cache: 'maven'
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1.0.31
+      uses: github/codeql-action/init@v2.1.15
       with:
         languages: java
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1.0.31
+      uses: github/codeql-action/autobuild@v2.1.15
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1.0.31
+      uses: github/codeql-action/analyze@v2.1.15
diff --git a/.github/workflows/deploy-release.yaml b/.github/workflows/deploy-release.yaml
@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2.4.0
+      - uses: actions/checkout@v3.0.2
 
       - name: Set up Java 17 & Deployment credentials
-        uses: actions/setup-java@v2.5.0
+        uses: actions/setup-java@v3.4.0
         with:
           distribution: 'zulu'
           java-version: '17'
@@ -24,7 +24,7 @@ jobs:
           gpg-private-key: ${{ secrets.CODE_SIGNING_GPG_PRIVATE_KEY }}
           gpg-passphrase: CODE_SIGNING_GPG_KEY_PASSPHRASE
 
-      - uses: jactions/[email protected].0
+      - uses: jactions/[email protected].1
         id: get_version
 
       - name: Deploy release

diff --git a/.github/workflows/deploy-snapshot.yaml b/.github/workflows/deploy-snapshot.yaml
@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2.4.0
+      - uses: actions/checkout@v3.0.2
 
       - name: Set up Java 17 & Deployment credentials
-        uses: actions/setup-java@v2.5.0
+        uses: actions/setup-java@v3.4.0
         with:
           distribution: 'zulu'
           java-version: '17'
@@ -24,7 +24,7 @@ jobs:
           gpg-private-key: ${{ secrets.CODE_SIGNING_GPG_PRIVATE_KEY }}
           gpg-passphrase: CODE_SIGNING_GPG_KEY_PASSPHRASE
 
-      - uses: jactions/[email protected].0
+      - uses: jactions/[email protected].1
         id: get_version
 
       - name: Deploy snapshot

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -8,27 +8,28 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2.4.0
+      - uses: actions/checkout@v3.0.2
 
       - name: Set up Java 17
-        uses: actions/setup-java@v2.5.0
+        uses: actions/setup-java@v3.4.0
         with:
           distribution: 'zulu'
           java-version: '17'
           cache: 'maven'
 
       - name: Run tests
-        run: mvn -B test
+        # note: `package` is used instead of `test` in order to support MultiReleaseJar
+        run: mvn -B package
 
   check-javadocs:
     name: Check Javadocs
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2.4.0
+      - uses: actions/checkout@v3.0.2
 
       - name: Set up Java 17
-        uses: actions/setup-java@v2.5.0
+        uses: actions/setup-java@v3.4.0
         with:
           distribution: 'zulu'
           java-version: '17'

diff --git a/SECURITY.md b/SECURITY.md
@@ -2,17 +2,18 @@
 
 ## Supported Versions
 
-| Version      | Supported          |
-|--------------| ------------------ |
-| [1.0.0-rc.9] | :heavy_check_mark: |
-| < 1.0.0-rc.9 | :x:                |
+| Version       | Supported          |
+|---------------| ------------------ |
+| [1.0.0-rc.10] | :heavy_check_mark: |
+| < 1.0.0-rc.10 | :x:                |
 
 ## Reporting a Vulnerability
 
-In order to report a vulnerability simply create an [issues](https://github.com/JarvisCraft/padla/issues) for it.
+In order to report a vulnerability simply create
+an [issues](https://github.com/JarvisCraft/padla/issues) for it.
 
 These are checked regularly and are the primary support channel.
 
 <!-- Version links -->
 
-[1.0.0-rc.8]: https://mvnrepository.com/artifact/ru.progrm-jarvis/padla/1.0.0-rc.8
+[1.0.0-rc.10]: https://mvnrepository.com/artifact/ru.progrm-jarvis/padla/1.0.0-rc.10
diff --git a/java-commons/pom.xml b/java-commons/pom.xml
@@ -5,8 +5,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>ru.progrm-jarvis</groupId>
-        <artifactId>padla</artifactId>
-        <version>1.0.0-rc.9</version>
+        <artifactId>padla-parent</artifactId>
+        <version>1.0.0-rc.10</version>
+        <relativePath>../padla-parent</relativePath>
     </parent>
     <artifactId>java-commons</artifactId>
 
@@ -31,6 +32,8 @@
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.javassist</groupId>
@@ -59,10 +62,12 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-all</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 </project>
diff --git a/java-commons/src/main/java/ru/progrm_jarvis/javacommons/annotation/Internal.java b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/annotation/Internal.java
diff --git a/java-commons/src/main/java/ru/progrm_jarvis/javacommons/classloading/ClassDefiner.java b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/classloading/ClassDefiner.java
@@ -14,56 +14,72 @@
  */
 public interface ClassDefiner {
 
-    /**Uns
+    /**
+     * Uns
      * Defines a class which may be garbage-collected.
      *
      * @param owner lookup whose access rights will be used for class definition
      * @param name name of the defined class
      * @param bytecode bytecode of the class
+     *
      * @return defined class
      */
-    Class<?> defineClass(@NonNull MethodHandles.Lookup owner,
-                         @Nullable String name, byte @NonNull [] bytecode);
+    @NotNull Class<?> defineClass(
+            MethodHandles.@NonNull Lookup owner,
+            @Nullable String name, byte @NonNull [] bytecode
+    );
 
     /**
      * Defines multiple classes which may be garbage-collected.
      *
      * @param owner lookup whose access rights will be used for class definition
      * @param bytecodes pairs whose first values are canonical class names
      * and the second values are those classes' bytecodes
+     *
      * @return defined class in the order their data was passed
      */
     @SuppressWarnings("unchecked")
-    Class<?>[] defineClasses(@NonNull MethodHandles.Lookup owner,
-                             @NonNull Pair<@Nullable String, byte @NotNull []>... bytecodes);
+    @NotNull Class<?> @NotNull [] defineClasses(
+            MethodHandles.@NonNull Lookup owner,
+            @NonNull Pair<@Nullable String, byte @NotNull []>... bytecodes
+    );
 
     /**
      * Defines multiple classes which may be garbage-collected.
      *
      * @param owner lookup whose access rights will be used for class definition
      * @param bytecodes bytecodes of the classes
+     *
      * @return defined class in the order their data was passed
      */
-    Class<?>[] defineClasses(@NonNull MethodHandles.Lookup owner,
-                             byte @NotNull [] @NonNull ... bytecodes);
+    @NotNull Class<?> @NotNull [] defineClasses(
+            MethodHandles.@NonNull Lookup owner,
+            byte @NotNull [] @NonNull ... bytecodes
+    );
 
     /**
      * Defines multiple classes which may be garbage-collected.
      *
      * @param owner lookup whose access rights will be used for class definition
      * @param bytecodes bytecodes of the classes
+     *
      * @return defined class in the order their data was passed
      */
-    List<Class<?>> defineClasses(@NonNull MethodHandles.Lookup owner,
-                                 @NonNull List<byte @NotNull []> bytecodes);
+    @NotNull List<@NotNull Class<?>> defineClasses(
+            MethodHandles.@NonNull Lookup owner,
+            @NonNull List<byte @NotNull []> bytecodes
+    );
 
     /**
      * Defines multiple classes which may be garbage-collected.
      *
      * @param owner lookup whose access rights will be used for class definition
      * @param namedBytecode map containing bytecodes by their classes' canonical names
+     *
      * @return defined classes by their names
      */
-    Map<String, Class<?>> defineClasses(@NonNull MethodHandles.Lookup owner,
-                                        @NonNull Map<@Nullable String, byte @NotNull []> namedBytecode);
+    @NotNull Map<@NotNull String, @NotNull Class<?>> defineClasses(
+            MethodHandles.@NonNull Lookup owner,
+            @NonNull Map<@Nullable String, byte @NotNull []> namedBytecode
+    );
 }