From 8b04237a7a972f02f57afde36ab211728535688f Mon Sep 17 00:00:00 2001 From: Mariano Goldman Date: Mon, 6 Sep 2021 12:44:00 -0300 Subject: [PATCH 1/3] update ci configuration --- .github/workflows/format.yml | 38 ++++++++++++++++++++++++++++++++++++ .github/workflows/test.yml | 32 +++++++++++++++++------------- 2 files changed, 56 insertions(+), 14 deletions(-) create mode 100644 .github/workflows/format.yml diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml new file mode 100644 index 0000000..32dde36 --- /dev/null +++ b/.github/workflows/format.yml @@ -0,0 +1,38 @@ +name: Format + +on: + push: + branches: + - "master" + - "develop" + pull_request: + types: [ ready_for_review, synchronize, opened ] + +jobs: + format: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + with: + ref: ${{ github.head_ref }} + + - name: Merge Conflict finder + uses: olivernybroe/action-conflict-finder@v1.1 + + - name: Use Java Version 8 + uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: 8 + cache: 'gradle' + + - name: Format code + run: gradle format + + - name: Commit fixed code + uses: stefanzweifel/git-auto-commit-action@v4 + with: + commit_message: "style: resolve style guide violations" + branch: ${{ github.head_ref }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5ddda25..e90892c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,25 +6,29 @@ on: - "master" - "develop" pull_request: - types: [ready_for_review, synchronize, opened] + types: [ ready_for_review, synchronize, opened ] jobs: unit: runs-on: ubuntu-latest strategy: matrix: - # test against latest update of each major Java version, as well as specific updates of LTS versions: - java: [ 8, 9, 10, 11, 12, 13 ] + # test against the latest update of each major Java version, as well as specific updates of LTS versions: + java: [ 8, 11, 15, 16 ] steps: - - uses: actions/checkout@v1 - - name: Use Java Version ${{ matrix.java }} - uses: actions/setup-java@v1 - with: - java-version: ${{ matrix.java }} - - name: Install - run: gradle dependencies - - name: Test - run: gradle test && gradle jacocoTestReport - - name: Codecov - run: bash <(curl -s https://codecov.io/bash) -t ${{ secrets.CODECOV_TOKEN }} + - uses: actions/checkout@v2 + + - name: Use Java Version ${{ matrix.java }} + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java }} + + - name: Install + run: gradle dependencies + + - name: Test + run: gradle test && gradle jacocoTestReport + + - name: Codecov + run: bash <(curl -s https://codecov.io/bash) -t ${{ secrets.CODECOV_TOKEN }} From f8caad93cfcf7d42f05df3fba6846f65668d0961 Mon Sep 17 00:00:00 2001 From: marianogoldman Date: Mon, 6 Sep 2021 16:48:10 +0000 Subject: [PATCH 2/3] style: resolve style guide violations --- .../arkecosystem/client/api/Blockchain.java | 1 - .../org/arkecosystem/client/api/Blocks.java | 1 - .../org/arkecosystem/client/api/Entities.java | 5 +- .../org/arkecosystem/client/api/Locks.java | 3 +- .../org/arkecosystem/client/api/Node.java | 1 - .../org/arkecosystem/client/api/Peers.java | 1 - .../org/arkecosystem/client/api/Rounds.java | 1 - .../client/api/SupportsParams.java | 1 - .../arkecosystem/client/api/Transactions.java | 1 - .../org/arkecosystem/client/api/Votes.java | 1 - .../org/arkecosystem/client/api/Wallets.java | 1 - .../org/arkecosystem/client/http/Client.java | 9 +- .../arkecosystem/client/http/DotHelper.java | 12 +- .../client/api/BlockchainTest.java | 1 - .../arkecosystem/client/api/BlocksTest.java | 13 +-- .../client/api/DelegatesTest.java | 19 +-- .../arkecosystem/client/api/EntitiesTest.java | 15 +-- .../arkecosystem/client/api/LocksTest.java | 15 +-- .../org/arkecosystem/client/api/NodeTest.java | 1 - .../arkecosystem/client/api/PeersTest.java | 7 +- .../arkecosystem/client/api/RoundsTest.java | 1 - .../client/api/TransactionsTest.java | 15 +-- .../arkecosystem/client/api/VotesTest.java | 7 +- .../arkecosystem/client/api/WalletsTest.java | 33 ++---- .../client/http/DotHelperTest.java | 110 ++++++++++++------ 25 files changed, 128 insertions(+), 147 deletions(-) diff --git a/src/main/java/org/arkecosystem/client/api/Blockchain.java b/src/main/java/org/arkecosystem/client/api/Blockchain.java index b31a822..26c5f6a 100644 --- a/src/main/java/org/arkecosystem/client/api/Blockchain.java +++ b/src/main/java/org/arkecosystem/client/api/Blockchain.java @@ -2,7 +2,6 @@ import java.io.IOException; import java.util.Map; - import org.arkecosystem.client.http.Client; public class Blockchain { diff --git a/src/main/java/org/arkecosystem/client/api/Blocks.java b/src/main/java/org/arkecosystem/client/api/Blocks.java index b037675..a7d58a6 100644 --- a/src/main/java/org/arkecosystem/client/api/Blocks.java +++ b/src/main/java/org/arkecosystem/client/api/Blocks.java @@ -3,7 +3,6 @@ import java.io.IOException; import java.util.LinkedHashMap; import java.util.Map; - import org.arkecosystem.client.http.Client; public class Blocks implements SupportsParams { diff --git a/src/main/java/org/arkecosystem/client/api/Entities.java b/src/main/java/org/arkecosystem/client/api/Entities.java index cc91dd8..b54fc0f 100644 --- a/src/main/java/org/arkecosystem/client/api/Entities.java +++ b/src/main/java/org/arkecosystem/client/api/Entities.java @@ -1,12 +1,11 @@ package org.arkecosystem.client.api; -import org.arkecosystem.client.http.Client; - import java.io.IOException; import java.util.LinkedHashMap; import java.util.Map; +import org.arkecosystem.client.http.Client; -public class Entities implements SupportsParams { +public class Entities implements SupportsParams { private final Client client; private final Map params = new LinkedHashMap<>(); diff --git a/src/main/java/org/arkecosystem/client/api/Locks.java b/src/main/java/org/arkecosystem/client/api/Locks.java index 260341f..3226841 100644 --- a/src/main/java/org/arkecosystem/client/api/Locks.java +++ b/src/main/java/org/arkecosystem/client/api/Locks.java @@ -32,8 +32,7 @@ public Map searchUnlocked() throws IOException { return this.client.post("locks/unlocked", params); } - public Map searchUnlocked(Map parameters) - throws IOException { + public Map searchUnlocked(Map parameters) throws IOException { return this.client.post("locks/unlocked", parameters); } } diff --git a/src/main/java/org/arkecosystem/client/api/Node.java b/src/main/java/org/arkecosystem/client/api/Node.java index 4cfb5e6..907616c 100644 --- a/src/main/java/org/arkecosystem/client/api/Node.java +++ b/src/main/java/org/arkecosystem/client/api/Node.java @@ -3,7 +3,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; - import org.arkecosystem.client.http.Client; public class Node { diff --git a/src/main/java/org/arkecosystem/client/api/Peers.java b/src/main/java/org/arkecosystem/client/api/Peers.java index a6707d4..918fd13 100644 --- a/src/main/java/org/arkecosystem/client/api/Peers.java +++ b/src/main/java/org/arkecosystem/client/api/Peers.java @@ -3,7 +3,6 @@ import java.io.IOException; import java.util.LinkedHashMap; import java.util.Map; - import org.arkecosystem.client.http.Client; public class Peers implements SupportsParams { diff --git a/src/main/java/org/arkecosystem/client/api/Rounds.java b/src/main/java/org/arkecosystem/client/api/Rounds.java index d177fdc..1039e25 100644 --- a/src/main/java/org/arkecosystem/client/api/Rounds.java +++ b/src/main/java/org/arkecosystem/client/api/Rounds.java @@ -2,7 +2,6 @@ import java.io.IOException; import java.util.Map; - import org.arkecosystem.client.http.Client; public class Rounds { diff --git a/src/main/java/org/arkecosystem/client/api/SupportsParams.java b/src/main/java/org/arkecosystem/client/api/SupportsParams.java index 05bd105..3e7ac2e 100644 --- a/src/main/java/org/arkecosystem/client/api/SupportsParams.java +++ b/src/main/java/org/arkecosystem/client/api/SupportsParams.java @@ -3,5 +3,4 @@ public interface SupportsParams { T param(String name, Object value); - } diff --git a/src/main/java/org/arkecosystem/client/api/Transactions.java b/src/main/java/org/arkecosystem/client/api/Transactions.java index 7a07d10..5026507 100644 --- a/src/main/java/org/arkecosystem/client/api/Transactions.java +++ b/src/main/java/org/arkecosystem/client/api/Transactions.java @@ -5,7 +5,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; - import org.arkecosystem.client.http.Client; public class Transactions implements SupportsParams { diff --git a/src/main/java/org/arkecosystem/client/api/Votes.java b/src/main/java/org/arkecosystem/client/api/Votes.java index e8b3ddd..f86a615 100644 --- a/src/main/java/org/arkecosystem/client/api/Votes.java +++ b/src/main/java/org/arkecosystem/client/api/Votes.java @@ -3,7 +3,6 @@ import java.io.IOException; import java.util.LinkedHashMap; import java.util.Map; - import org.arkecosystem.client.http.Client; public class Votes implements SupportsParams { diff --git a/src/main/java/org/arkecosystem/client/api/Wallets.java b/src/main/java/org/arkecosystem/client/api/Wallets.java index 4db39ac..f3ecd30 100644 --- a/src/main/java/org/arkecosystem/client/api/Wallets.java +++ b/src/main/java/org/arkecosystem/client/api/Wallets.java @@ -3,7 +3,6 @@ import java.io.IOException; import java.util.LinkedHashMap; import java.util.Map; - import org.arkecosystem.client.http.Client; public class Wallets implements SupportsParams { diff --git a/src/main/java/org/arkecosystem/client/http/Client.java b/src/main/java/org/arkecosystem/client/http/Client.java index 0069d69..951b2c9 100644 --- a/src/main/java/org/arkecosystem/client/http/Client.java +++ b/src/main/java/org/arkecosystem/client/http/Client.java @@ -23,8 +23,7 @@ public Client(String host) { this.headers = Headers.of(headers); } - public Map get(String url, Map params) - throws IOException { + public Map get(String url, Map params) throws IOException { HttpUrl.Builder httpBuilder = HttpUrl.parse(this.host + url).newBuilder(); for (Map.Entry entry : DotHelper.toDot(params).entrySet()) { @@ -37,8 +36,7 @@ public Map get(String url, Map params) new Request.Builder().headers(this.headers).url(httpBuilder.build()).build(); Response response = client.newCall(request).execute(); - return new Gson() - .fromJson(response.body().string(), Map.class); + return new Gson().fromJson(response.body().string(), Map.class); } public Map get(String url) throws IOException { @@ -49,8 +47,7 @@ public Map post(String url, Map payload) throws RequestBody body = RequestBody.create(JSON, new Gson().toJson(payload)); Request request = new Request.Builder().url(this.host + url).post(body).build(); Response response = client.newCall(request).execute(); - return new Gson() - .fromJson(response.body().string(), Map.class); + return new Gson().fromJson(response.body().string(), Map.class); } public OkHttpClient getClient() { diff --git a/src/main/java/org/arkecosystem/client/http/DotHelper.java b/src/main/java/org/arkecosystem/client/http/DotHelper.java index c56e1b5..24e1ed6 100644 --- a/src/main/java/org/arkecosystem/client/http/DotHelper.java +++ b/src/main/java/org/arkecosystem/client/http/DotHelper.java @@ -14,12 +14,18 @@ public static Map toDot(Map params) { } @SuppressWarnings("unchecked") - private static Map toDot(Map params, Map accum, String prepend) { + private static Map toDot( + Map params, Map accum, String prepend) { for (Map.Entry entry : params.entrySet()) { if (entry.getValue() instanceof Map) { - accum.putAll(toDot((Map) entry.getValue(), accum, prepend + entry.getKey() + ".")); + accum.putAll( + toDot( + (Map) entry.getValue(), + accum, + prepend + entry.getKey() + ".")); } else if (entry.getValue() instanceof List) { - Map stringObjectMap = listAsMapWithNumericKeys((List) entry.getValue()); + Map stringObjectMap = + listAsMapWithNumericKeys((List) entry.getValue()); toDot(stringObjectMap, accum, prepend + entry.getKey() + "."); } else if (entry.getValue() != null) { accum.put(prepend + entry.getKey(), entry.getValue().toString()); diff --git a/src/test/java/org/arkecosystem/client/api/BlockchainTest.java b/src/test/java/org/arkecosystem/client/api/BlockchainTest.java index f40191a..e9c127c 100644 --- a/src/test/java/org/arkecosystem/client/api/BlockchainTest.java +++ b/src/test/java/org/arkecosystem/client/api/BlockchainTest.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.util.Map; - import org.arkecosystem.client.Connection; import org.arkecosystem.client.MockHelper; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/arkecosystem/client/api/BlocksTest.java b/src/test/java/org/arkecosystem/client/api/BlocksTest.java index 6d1ac82..fc517e4 100644 --- a/src/test/java/org/arkecosystem/client/api/BlocksTest.java +++ b/src/test/java/org/arkecosystem/client/api/BlocksTest.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.util.Map; - import org.arkecosystem.client.Connection; import org.arkecosystem.client.MockHelper; import org.junit.jupiter.api.Test; @@ -21,10 +20,8 @@ void all() throws IOException { @Test void allWithParams() throws IOException { Connection connection = MockHelper.connection(); - Map actual = connection.api().blocks - .param("page", 1) - .param("limit", 100) - .all(); + Map actual = + connection.api().blocks.param("page", 1).param("limit", 100).all(); assertTrue((boolean) actual.get("success")); } @@ -59,10 +56,8 @@ void transactions() throws IOException { @Test void transactionsWithParams() throws IOException { Connection connection = MockHelper.connection(); - Map actual = connection.api().blocks - .param("page", 1) - .param("limit", 100) - .transactions("dummy"); + Map actual = + connection.api().blocks.param("page", 1).param("limit", 100).transactions("dummy"); assertTrue((boolean) actual.get("success")); } } diff --git a/src/test/java/org/arkecosystem/client/api/DelegatesTest.java b/src/test/java/org/arkecosystem/client/api/DelegatesTest.java index 4433a68..ed2c4d6 100644 --- a/src/test/java/org/arkecosystem/client/api/DelegatesTest.java +++ b/src/test/java/org/arkecosystem/client/api/DelegatesTest.java @@ -5,7 +5,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; - import org.arkecosystem.client.Connection; import org.arkecosystem.client.MockHelper; import org.junit.jupiter.api.Test; @@ -22,10 +21,8 @@ void all() throws IOException { @Test void allWithParams() throws IOException { Connection connection = MockHelper.connection(); - Map actual = connection.api().delegates - .param("page", 1) - .param("limit", 100) - .all(); + Map actual = + connection.api().delegates.param("page", 1).param("limit", 100).all(); assertTrue((boolean) actual.get("success")); } @@ -53,10 +50,8 @@ void voters() throws IOException { @Test void votersWithParams() throws IOException { Connection connection = MockHelper.connection(); - Map actual = connection.api().delegates - .param("page", 1) - .param("limit", 100) - .voters("dummy"); + Map actual = + connection.api().delegates.param("page", 1).param("limit", 100).voters("dummy"); assertTrue((boolean) actual.get("success")); } @@ -70,10 +65,8 @@ void search() throws IOException { @Test void searchWithParams() throws IOException { Connection connection = MockHelper.connection(); - Map actual = connection.api().delegates - .param("page", 1) - .param("limit", 100) - .search(); + Map actual = + connection.api().delegates.param("page", 1).param("limit", 100).search(); assertTrue((boolean) actual.get("success")); } } diff --git a/src/test/java/org/arkecosystem/client/api/EntitiesTest.java b/src/test/java/org/arkecosystem/client/api/EntitiesTest.java index 169987f..ae3424d 100644 --- a/src/test/java/org/arkecosystem/client/api/EntitiesTest.java +++ b/src/test/java/org/arkecosystem/client/api/EntitiesTest.java @@ -1,13 +1,12 @@ package org.arkecosystem.client.api; -import org.arkecosystem.client.Connection; -import org.arkecosystem.client.MockHelper; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.arkecosystem.client.Connection; +import org.arkecosystem.client.MockHelper; +import org.junit.jupiter.api.Test; public class EntitiesTest { @@ -21,10 +20,8 @@ void all() throws IOException { @Test void allWithParams() throws IOException { Connection connection = MockHelper.connection(); - Map actual = connection.api().entities - .param("page", 1) - .param("limit", 100) - .all(); + Map actual = + connection.api().entities.param("page", 1).param("limit", 100).all(); assertTrue((boolean) actual.get("success")); } diff --git a/src/test/java/org/arkecosystem/client/api/LocksTest.java b/src/test/java/org/arkecosystem/client/api/LocksTest.java index 301076c..232e80a 100644 --- a/src/test/java/org/arkecosystem/client/api/LocksTest.java +++ b/src/test/java/org/arkecosystem/client/api/LocksTest.java @@ -5,7 +5,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; - import org.arkecosystem.client.Connection; import org.arkecosystem.client.MockHelper; import org.junit.jupiter.api.Test; @@ -22,10 +21,8 @@ void all() throws IOException { @Test void allWithParams() throws IOException { Connection connection = MockHelper.connection(); - Map actual = connection.api().locks - .param("page", 1) - .param("limit", 100) - .all(); + Map actual = + connection.api().locks.param("page", 1).param("limit", 100).all(); assertTrue((boolean) actual.get("success")); } @@ -39,18 +36,14 @@ void show() throws IOException { @Test void searchUnlocked() throws IOException { Connection connection = MockHelper.connection(); - Map actual = - connection.api().locks.searchUnlocked(new HashMap<>()); + Map actual = connection.api().locks.searchUnlocked(new HashMap<>()); assertTrue((boolean) actual.get("success")); } @Test void searchUnlockedWithParams() throws IOException { Connection connection = MockHelper.connection(); - Map actual = - connection.api().locks - .param("page", 1) - .searchUnlocked(); + Map actual = connection.api().locks.param("page", 1).searchUnlocked(); assertTrue((boolean) actual.get("success")); } } diff --git a/src/test/java/org/arkecosystem/client/api/NodeTest.java b/src/test/java/org/arkecosystem/client/api/NodeTest.java index 7bb1a3e..a4b5b24 100644 --- a/src/test/java/org/arkecosystem/client/api/NodeTest.java +++ b/src/test/java/org/arkecosystem/client/api/NodeTest.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.util.Map; - import org.arkecosystem.client.Connection; import org.arkecosystem.client.MockHelper; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/arkecosystem/client/api/PeersTest.java b/src/test/java/org/arkecosystem/client/api/PeersTest.java index 86e53dd..ef727ee 100644 --- a/src/test/java/org/arkecosystem/client/api/PeersTest.java +++ b/src/test/java/org/arkecosystem/client/api/PeersTest.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.util.Map; - import org.arkecosystem.client.Connection; import org.arkecosystem.client.MockHelper; import org.junit.jupiter.api.Test; @@ -21,10 +20,8 @@ void all() throws IOException { @Test void allWithParams() throws IOException { Connection connection = MockHelper.connection(); - Map actual = connection.api().peers - .param("page", 1) - .param("limit", 100) - .all(); + Map actual = + connection.api().peers.param("page", 1).param("limit", 100).all(); assertTrue((boolean) actual.get("success")); } diff --git a/src/test/java/org/arkecosystem/client/api/RoundsTest.java b/src/test/java/org/arkecosystem/client/api/RoundsTest.java index 0e11630..b2175d2 100644 --- a/src/test/java/org/arkecosystem/client/api/RoundsTest.java +++ b/src/test/java/org/arkecosystem/client/api/RoundsTest.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.util.Map; - import org.arkecosystem.client.Connection; import org.arkecosystem.client.MockHelper; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/arkecosystem/client/api/TransactionsTest.java b/src/test/java/org/arkecosystem/client/api/TransactionsTest.java index 29c934b..79970aa 100644 --- a/src/test/java/org/arkecosystem/client/api/TransactionsTest.java +++ b/src/test/java/org/arkecosystem/client/api/TransactionsTest.java @@ -5,7 +5,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Map; - import org.arkecosystem.client.Connection; import org.arkecosystem.client.MockHelper; import org.junit.jupiter.api.Test; @@ -22,10 +21,8 @@ void all() throws IOException { @Test void allWithParams() throws IOException { Connection connection = MockHelper.connection(); - Map actual = connection.api().transactions - .param("page", 1) - .param("limit", 100) - .all(); + Map actual = + connection.api().transactions.param("page", 1).param("limit", 100).all(); assertTrue((boolean) actual.get("success")); } @@ -53,17 +50,15 @@ void allUnconfirmed() throws IOException { @Test void allUnconfirmedWithParams() throws IOException { Connection connection = MockHelper.connection(); - Map actual = connection.api().transactions - .param("page", 1) - .allUnconfirmed(); + Map actual = + connection.api().transactions.param("page", 1).allUnconfirmed(); assertTrue((boolean) actual.get("success")); } @Test void showUnconfirmed() throws IOException { Connection connection = MockHelper.connection(); - Map actual = - connection.api().transactions.showUnconfirmed("dummy"); + Map actual = connection.api().transactions.showUnconfirmed("dummy"); assertTrue((boolean) actual.get("success")); } diff --git a/src/test/java/org/arkecosystem/client/api/VotesTest.java b/src/test/java/org/arkecosystem/client/api/VotesTest.java index 6eb1188..9ef32f0 100644 --- a/src/test/java/org/arkecosystem/client/api/VotesTest.java +++ b/src/test/java/org/arkecosystem/client/api/VotesTest.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.util.Map; - import org.arkecosystem.client.Connection; import org.arkecosystem.client.MockHelper; import org.junit.jupiter.api.Test; @@ -21,10 +20,8 @@ void all() throws IOException { @Test void allWithParams() throws IOException { Connection connection = MockHelper.connection(); - Map actual = connection.api().votes - .param("page", 1) - .param("limit", 100) - .all(); + Map actual = + connection.api().votes.param("page", 1).param("limit", 100).all(); assertTrue((boolean) actual.get("success")); } diff --git a/src/test/java/org/arkecosystem/client/api/WalletsTest.java b/src/test/java/org/arkecosystem/client/api/WalletsTest.java index d73c6ed..d09f275 100644 --- a/src/test/java/org/arkecosystem/client/api/WalletsTest.java +++ b/src/test/java/org/arkecosystem/client/api/WalletsTest.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.util.Map; - import org.arkecosystem.client.Connection; import org.arkecosystem.client.MockHelper; import org.junit.jupiter.api.Test; @@ -21,10 +20,8 @@ void all() throws IOException { @Test void allWithParams() throws IOException { Connection connection = MockHelper.connection(); - Map actual = connection.api().wallets - .param("page", 1) - .param("limit", 100) - .all(); + Map actual = + connection.api().wallets.param("page", 1).param("limit", 100).all(); assertTrue((boolean) actual.get("success")); } @@ -45,9 +42,8 @@ void transactions() throws IOException { @Test void transactionsWithParams() throws IOException { Connection connection = MockHelper.connection(); - Map actual = connection.api().wallets - .param("page", 1) - .transactions("dummy"); + Map actual = + connection.api().wallets.param("page", 1).transactions("dummy"); assertTrue((boolean) actual.get("success")); } @@ -61,26 +57,23 @@ void sentTransactions() throws IOException { @Test void sentTransactionsWithParams() throws IOException { Connection connection = MockHelper.connection(); - Map actual = connection.api().wallets - .param("page", 1) - .sentTransactions("dummy"); + Map actual = + connection.api().wallets.param("page", 1).sentTransactions("dummy"); assertTrue((boolean) actual.get("success")); } @Test void receivedTransactions() throws IOException { Connection connection = MockHelper.connection(); - Map actual = - connection.api().wallets.receivedTransactions("dummy"); + Map actual = connection.api().wallets.receivedTransactions("dummy"); assertTrue((boolean) actual.get("success")); } @Test void receivedTransactionsWithParams() throws IOException { Connection connection = MockHelper.connection(); - Map actual = connection.api().wallets - .param("page", 1) - .receivedTransactions("dummy"); + Map actual = + connection.api().wallets.param("page", 1).receivedTransactions("dummy"); assertTrue((boolean) actual.get("success")); } @@ -94,9 +87,7 @@ void votes() throws IOException { @Test void votesWithParams() throws IOException { Connection connection = MockHelper.connection(); - Map actual = connection.api().wallets - .param("page", 1) - .votes("dummy"); + Map actual = connection.api().wallets.param("page", 1).votes("dummy"); assertTrue((boolean) actual.get("success")); } @@ -117,9 +108,7 @@ void top() throws IOException { @Test void topWithParams() throws IOException { Connection connection = MockHelper.connection(); - Map actual = connection.api().wallets - .param("page", 1) - .top(); + Map actual = connection.api().wallets.param("page", 1).top(); assertTrue((boolean) actual.get("success")); } } diff --git a/src/test/java/org/arkecosystem/client/http/DotHelperTest.java b/src/test/java/org/arkecosystem/client/http/DotHelperTest.java index 2e5c84f..7826613 100644 --- a/src/test/java/org/arkecosystem/client/http/DotHelperTest.java +++ b/src/test/java/org/arkecosystem/client/http/DotHelperTest.java @@ -1,30 +1,44 @@ package org.arkecosystem.client.http; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; +import org.junit.jupiter.api.Test; class DotHelperTest { @Test void hierarchiesToDot() { - Map map = new HashMap() {{ - put("address", new HashMap() {{ - put("street", "7 Michigan St"); - put("city", "Jersey"); - }}); - put("level1", new HashMap() {{ - put("level2", new HashMap() {{ - put("level3", "value"); - }}); - }}); - put("nulls", null); - }}; + Map map = + new HashMap() { + { + put( + "address", + new HashMap() { + { + put("street", "7 Michigan St"); + put("city", "Jersey"); + } + }); + put( + "level1", + new HashMap() { + { + put( + "level2", + new HashMap() { + { + put("level3", "value"); + } + }); + } + }); + put("nulls", null); + } + }; Map newMap = DotHelper.toDot(map); @@ -35,9 +49,12 @@ void hierarchiesToDot() { @Test void nullValueToDot() { - Map map = new HashMap() {{ - put("nulls", null); - }}; + Map map = + new HashMap() { + { + put("nulls", null); + } + }; Map newMap = DotHelper.toDot(map); @@ -46,9 +63,12 @@ void nullValueToDot() { @Test void stringValueToDot() { - Map map = new HashMap() {{ - put("q", "query"); - }}; + Map map = + new HashMap() { + { + put("q", "query"); + } + }; Map newMap = DotHelper.toDot(map); @@ -57,9 +77,12 @@ void stringValueToDot() { @Test void integerValueToDot() { - Map map = new HashMap() {{ - put("number", 4); - }}; + Map map = + new HashMap() { + { + put("number", 4); + } + }; Map newMap = DotHelper.toDot(map); @@ -68,18 +91,31 @@ void integerValueToDot() { @Test void listToDot() { - Map map = new HashMap() {{ - put("addresses", new ArrayList() {{ - add(new HashMap() {{ - put("street", "7 Michigan St"); - put("city", "Jersey"); - }}); - add(new HashMap() {{ - put("street", "29A Harold Ln"); - put("city", "Manhattan"); - }}); - }}); - }}; + Map map = + new HashMap() { + { + put( + "addresses", + new ArrayList() { + { + add( + new HashMap() { + { + put("street", "7 Michigan St"); + put("city", "Jersey"); + } + }); + add( + new HashMap() { + { + put("street", "29A Harold Ln"); + put("city", "Manhattan"); + } + }); + } + }); + } + }; Map newMap = DotHelper.toDot(map); From 08e3cd86da3d2f3d0e99bf913019568f2343ad2c Mon Sep 17 00:00:00 2001 From: Mariano Goldman Date: Mon, 6 Sep 2021 13:53:02 -0300 Subject: [PATCH 3/3] unified CI config --- .github/workflows/format.yml | 38 ------------------------------------ .github/workflows/test.yml | 28 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 38 deletions(-) delete mode 100644 .github/workflows/format.yml diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml deleted file mode 100644 index 32dde36..0000000 --- a/.github/workflows/format.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Format - -on: - push: - branches: - - "master" - - "develop" - pull_request: - types: [ ready_for_review, synchronize, opened ] - -jobs: - format: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v2 - with: - ref: ${{ github.head_ref }} - - - name: Merge Conflict finder - uses: olivernybroe/action-conflict-finder@v1.1 - - - name: Use Java Version 8 - uses: actions/setup-java@v2 - with: - distribution: 'adopt' - java-version: 8 - cache: 'gradle' - - - name: Format code - run: gradle format - - - name: Commit fixed code - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: "style: resolve style guide violations" - branch: ${{ github.head_ref }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e90892c..8c7c56a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,6 +9,34 @@ on: types: [ ready_for_review, synchronize, opened ] jobs: + format: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + with: + ref: ${{ github.head_ref }} + + - name: Merge Conflict finder + uses: olivernybroe/action-conflict-finder@v1.1 + + - name: Use Java Version 8 + uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: 8 + cache: 'gradle' + + - name: Format code + run: gradle format + + - name: Commit fixed code + uses: stefanzweifel/git-auto-commit-action@v4 + with: + commit_message: "style: resolve style guide violations" + branch: ${{ github.head_ref }} + unit: runs-on: ubuntu-latest strategy: