From d4e8e63b2668d432fa4e7287afe5420711e962e1 Mon Sep 17 00:00:00 2001 From: Clement Dessoude Date: Sat, 13 Mar 2021 10:45:20 +0100 Subject: [PATCH 1/3] fix: put space after annotation in UnannClassTypes --- .../prettier-plugin-java/src/printers/classes.js | 1 + .../{args-spec.js => blank_lines-spec.js} | 0 .../test/unit-test/bug-fixes/_input.java | 10 ++++++++++ .../test/unit-test/bug-fixes/_output.java | 13 +++++++++++++ .../test/unit-test/bug-fixes/bug-fixes-spec.js | 3 +++ 5 files changed, 27 insertions(+) rename packages/prettier-plugin-java/test/unit-test/blank_lines/{args-spec.js => blank_lines-spec.js} (100%) create mode 100644 packages/prettier-plugin-java/test/unit-test/bug-fixes/_input.java create mode 100644 packages/prettier-plugin-java/test/unit-test/bug-fixes/_output.java create mode 100644 packages/prettier-plugin-java/test/unit-test/bug-fixes/bug-fixes-spec.js diff --git a/packages/prettier-plugin-java/src/printers/classes.js b/packages/prettier-plugin-java/src/printers/classes.js index 95fd9ef0..bf6688cc 100644 --- a/packages/prettier-plugin-java/src/printers/classes.js +++ b/packages/prettier-plugin-java/src/printers/classes.js @@ -354,6 +354,7 @@ class ClassesPrettierVisitor { currentSegment = []; } else if (token.name === "annotation") { currentSegment.push(this.visit([token])); + currentSegment.push(" "); } else { currentSegment.push(token); if ( diff --git a/packages/prettier-plugin-java/test/unit-test/blank_lines/args-spec.js b/packages/prettier-plugin-java/test/unit-test/blank_lines/blank_lines-spec.js similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/blank_lines/args-spec.js rename to packages/prettier-plugin-java/test/unit-test/blank_lines/blank_lines-spec.js diff --git a/packages/prettier-plugin-java/test/unit-test/bug-fixes/_input.java b/packages/prettier-plugin-java/test/unit-test/bug-fixes/_input.java new file mode 100644 index 00000000..ce929b44 --- /dev/null +++ b/packages/prettier-plugin-java/test/unit-test/bug-fixes/_input.java @@ -0,0 +1,10 @@ +class T { + // Fix for https://github.com/jhipster/prettier-java/issues/453 + SomeClass.@Valid SomeInnerClass someInnerClass = someClass.getInteractions().get(0); + + // Fix for https://github.com/jhipster/prettier-java/issues/444 + void process( + Map.@NonNull Entry entry, + @NonNull Map context + ) {} +} diff --git a/packages/prettier-plugin-java/test/unit-test/bug-fixes/_output.java b/packages/prettier-plugin-java/test/unit-test/bug-fixes/_output.java new file mode 100644 index 00000000..94283120 --- /dev/null +++ b/packages/prettier-plugin-java/test/unit-test/bug-fixes/_output.java @@ -0,0 +1,13 @@ +class T { + + // Fix for https://github.com/jhipster/prettier-java/issues/453 + SomeClass.@Valid SomeInnerClass someInnerClass = someClass + .getInteractions() + .get(0); + + // Fix for https://github.com/jhipster/prettier-java/issues/444 + void process( + Map.@NonNull Entry entry, + @NonNull Map context + ) {} +} diff --git a/packages/prettier-plugin-java/test/unit-test/bug-fixes/bug-fixes-spec.js b/packages/prettier-plugin-java/test/unit-test/bug-fixes/bug-fixes-spec.js new file mode 100644 index 00000000..c5a78b07 --- /dev/null +++ b/packages/prettier-plugin-java/test/unit-test/bug-fixes/bug-fixes-spec.js @@ -0,0 +1,3 @@ +describe("prettier-java", () => { + require("../../test-utils").testSample(__dirname); +}); From a24fa47efc56a2d651a6f4c3da415cbdc8ac99c3 Mon Sep 17 00:00:00 2001 From: Clement Dessoude Date: Sat, 13 Mar 2021 13:43:07 +0100 Subject: [PATCH 2/3] chore: remove couchbase from jhipster test as it does not compile Failing JHipster daily builds for months --- packages/java-parser/scripts/clone-samples.js | 4 ---- packages/java-parser/test/samples-spec.js | 1 - packages/prettier-plugin-java/scripts/clone-samples.js | 4 ---- .../test/repository-test/jhipster-2-test.js | 1 - 4 files changed, 10 deletions(-) diff --git a/packages/java-parser/scripts/clone-samples.js b/packages/java-parser/scripts/clone-samples.js index 51898735..fd88a51f 100644 --- a/packages/java-parser/scripts/clone-samples.js +++ b/packages/java-parser/scripts/clone-samples.js @@ -72,10 +72,6 @@ const sampleRepos = [ repoUrl: "https://github.com/jhipster/jhipster-sample-app-dto", branch: "main" }, - { - repoUrl: "https://github.com/jhipster/jhipster-sample-app-couchbase", - branch: "main" - }, { repoUrl: "https://github.com/jhipster/jhipster-sample-app-cassandra", branch: "main" diff --git a/packages/java-parser/test/samples-spec.js b/packages/java-parser/test/samples-spec.js index f4756cc2..a4d3bc91 100644 --- a/packages/java-parser/test/samples-spec.js +++ b/packages/java-parser/test/samples-spec.js @@ -15,7 +15,6 @@ describe("The Java Parser", () => { createSampleSpecs("jhipster-online"); createSampleSpecs("jhipster-sample-app"); createSampleSpecs("jhipster-sample-app-cassandra"); - createSampleSpecs("jhipster-sample-app-couchbase"); createSampleSpecs("jhipster-sample-app-dto"); createSampleSpecs("jhipster-sample-app-elasticsearch"); createSampleSpecs("jhipster-sample-app-gateway"); diff --git a/packages/prettier-plugin-java/scripts/clone-samples.js b/packages/prettier-plugin-java/scripts/clone-samples.js index d1220ad7..c545cd50 100644 --- a/packages/prettier-plugin-java/scripts/clone-samples.js +++ b/packages/prettier-plugin-java/scripts/clone-samples.js @@ -69,10 +69,6 @@ const jhipster2 = [ repoUrl: "https://github.com/jhipster/jhipster-sample-app-dto", branch: "main" }, - { - repoUrl: "https://github.com/jhipster/jhipster-sample-app-couchbase", - branch: "main" - }, { repoUrl: "https://github.com/jhipster/jhipster-sample-app-cassandra", branch: "main" diff --git a/packages/prettier-plugin-java/test/repository-test/jhipster-2-test.js b/packages/prettier-plugin-java/test/repository-test/jhipster-2-test.js index d366fdd6..38a83c3b 100644 --- a/packages/prettier-plugin-java/test/repository-test/jhipster-2-test.js +++ b/packages/prettier-plugin-java/test/repository-test/jhipster-2-test.js @@ -5,7 +5,6 @@ const { testRepositorySample } = require("../test-utils"); const jhipsterRepository = [ "jhipster-sample-app-elasticsearch", "jhipster-sample-app-dto", - "jhipster-sample-app-couchbase", "jhipster-sample-app-cassandra", "jhipster-sample-app-mongodb", "jhipster-sample-app-react" From 119fb62c70c00c07a8c25dab31c446205794b263 Mon Sep 17 00:00:00 2001 From: Clement Dessoude Date: Sat, 13 Mar 2021 14:04:17 +0100 Subject: [PATCH 3/3] chore: add java setup step in github ci --- .github/workflows/github-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml index e0f6fec9..0b0dbcd1 100644 --- a/.github/workflows/github-ci.yml +++ b/.github/workflows/github-ci.yml @@ -36,6 +36,9 @@ jobs: - uses: actions/setup-node@v1 with: node-version: ${{ matrix.node_version }} + - uses: actions/setup-java@v1 + with: + java-version: '11.x' - name: Install dependencies run: yarn - name: Run CI @@ -56,6 +59,9 @@ jobs: - uses: actions/setup-node@v1 with: node-version: ${{ matrix.node_version }} + - uses: actions/setup-java@v1 + with: + java-version: '11.x' - name: Install dependencies run: yarn - name: Run e2e tests