From 3cff00b5b86b3c282e7b3f74963c60f256ede650 Mon Sep 17 00:00:00 2001 From: Redkale Date: Mon, 27 May 2024 15:07:10 +0800 Subject: [PATCH 1/2] Delete src/test/java/org/redkale/test/convert/BiFunctionConvertTest.java --- .../test/convert/BiFunctionConvertTest.java | 78 ------------------- 1 file changed, 78 deletions(-) delete mode 100644 src/test/java/org/redkale/test/convert/BiFunctionConvertTest.java diff --git a/src/test/java/org/redkale/test/convert/BiFunctionConvertTest.java b/src/test/java/org/redkale/test/convert/BiFunctionConvertTest.java deleted file mode 100644 index 38dfe88ed..000000000 --- a/src/test/java/org/redkale/test/convert/BiFunctionConvertTest.java +++ /dev/null @@ -1,78 +0,0 @@ -///* -// * To change this license header, choose License Headers in Project Properties. -// * To change this template file, choose Tools | Templates -// * and open the template in the editor. -// */ -//package org.redkale.test.convert; -// -//import org.junit.jupiter.api.Assertions; -//import org.junit.jupiter.api.Test; -//import org.redkale.convert.ConvertField; -//import org.redkale.convert.json.JsonConvert; -//import org.redkale.util.Attribute; -// -///* -// * test -// * -// * @author zhangjx -// */ -//public class BiFunctionConvertTest { -// -// @Test -// public void run() throws Throwable { -// GamePlayer player1 = new GamePlayer(); -// player1.userid = 1; -// player1.username = "玩家1"; -// player1.cards = new int[] {11, 12, 13, 14, 15}; -// GamePlayer player2 = new GamePlayer(); -// player2.userid = 2; -// player2.username = "玩家2"; -// player2.cards = new int[] {21, 22, 23, 24, 25}; -// GamePlayer player3 = new GamePlayer(); -// player3.userid = 3; -// player3.username = "玩家3"; -// player3.cards = new int[] {31, 32, 33, 34, 35}; -// GameTable table = new GameTable(); -// table.tableid = 100; -// table.players = new GamePlayer[] {player1, player2, player3}; -// JsonConvert convert1 = JsonConvert.root(); -// System.out.println(convert1.convertTo(table)); -// JsonConvert convert2 = convert1.newConvert( -// (Attribute t, Object u) -> { -// if (t.field().equals("cards") && u instanceof GamePlayer) { -// int userid = ((GamePlayer) u).userid; -// if (userid == 3) return null; // 玩家3的cards不输出 -// return t.get(u); -// } -// return t.get(u); -// }, -// (Object u) -> { -// if (table != u) return null; -// // return new ConvertField[]{new ConvertField("extcol1", 30), new ConvertField("extcol2", "扩展字段值")}; -// return ConvertField.ofArray("extcol1", 30, "extcol2", "扩展字段值"); -// }); -// System.out.println(convert2.convertTo(table)); -// Assertions.assertEquals( -// "{\"players\":[{\"cards\":[11,12,13,14,15],\"userid\":1,\"username\":\"玩家1\"},{\"cards\":[21,22,23,24,25],\"userid\":2,\"username\":\"玩家2\"},{\"userid\":3,\"username\":\"玩家3\"}],\"tableid\":100,\"extcol1\":30,\"extcol2\":\"扩展字段值\"}", -// convert2.convertTo(table)); -// // {"players":[{"cards":[11,12,13,14,15],"userid":1,"username":"玩家1"},{"cards":[21,22,23,24,25],"userid":2,"username":"玩家2"},{"cards":[31,32,33,34,35],"userid":3,"username":"玩家3"}],"tableid":100} -// // {"players":[{"cards":[11,12,13,14,15],"userid":1,"username":"玩家1"},{"cards":[21,22,23,24,25],"userid":2,"username":"玩家2"},{"userid":3,"username":"玩家3"}],"tableid":100,"extcol1":30,"extcol2":"扩展字段值"} -// } -// -// public static class GamePlayer { -// -// public int userid; -// -// public String username; -// -// public int[] cards; -// } -// -// public static class GameTable { -// -// public int tableid; -// -// public GamePlayer[] players; -// } -// -//} From 6632846f10f3cb083928d439c4eb2c1fe0f16bb2 Mon Sep 17 00:00:00 2001 From: Redkale Date: Mon, 27 May 2024 15:21:34 +0800 Subject: [PATCH 2/2] Create maven.yml --- .github/workflows/maven.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/maven.yml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 000000000..350f97c19 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,35 @@ +# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven + +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +name: Maven CI + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + cache: maven + - name: Build with Maven + run: mvn -B package --file pom.xml + + # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive + - name: Update dependency graph + uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6