From 05defeb681548dd835551fdc5a345cfe6f5d441b Mon Sep 17 00:00:00 2001 From: wuth Date: Tue, 1 Jul 2025 11:01:53 +0800 Subject: [PATCH 1/6] Update OpenIndexDialogFactory.java Null exception occured when click on Luke desktop browser button https://github.com/apache/lucene/issues/13345 --- .../components/dialog/menubar/OpenIndexDialogFactory.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/OpenIndexDialogFactory.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/OpenIndexDialogFactory.java index d7270551638b..3f032d85c0e1 100644 --- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/OpenIndexDialogFactory.java +++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/OpenIndexDialogFactory.java @@ -293,7 +293,11 @@ private File getLastOpenedDirectory() { if (!history.isEmpty()) { Path path = Paths.get(history.get(0)); if (Files.exists(path)) { - return path.getParent().toAbsolutePath().toFile(); + if(path.getParent() != null) { + return path.getParent().toAbsolutePath().toFile(); + }else { + return path.toAbsolutePath().toFile(); + } } } return null; From 1da4c33eca1a8fa19f73bc41a796fc086049822a Mon Sep 17 00:00:00 2001 From: wuth Date: Wed, 2 Jul 2025 04:10:43 +0800 Subject: [PATCH 2/6] Create tidy.yml --- .github/workflows/tidy.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/tidy.yml diff --git a/.github/workflows/tidy.yml b/.github/workflows/tidy.yml new file mode 100644 index 000000000000..71a8f6391022 --- /dev/null +++ b/.github/workflows/tidy.yml @@ -0,0 +1,34 @@ +on: + workflow_dispatch: + + pull_request: + branches: + - '*' + + push: + branches: + - 'main' + - 'branch_10x' + +env: + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} + +jobs: + tidy-code: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 # 检出仓库代码 + + - name: Set up JDK + uses: actions/setup-java@v2 + with: + java-version: '24' # 指定 Java 版本（根据项目调整） + distribution: 'adopt' + + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v2 # 初始化 Gradle 并启用缓存 + + - name: Run tidy task + run: ./gradlew tidy + run: ./gradlew tidy # 执行自定义 tidy 任务 From 81eb8b88c4d530dab1a0398c98f0fe22c73a052d Mon Sep 17 00:00:00 2001 From: wuth Date: Wed, 2 Jul 2025 09:56:39 +0800 Subject: [PATCH 3/6] Update tidy.yml --- .github/workflows/tidy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tidy.yml b/.github/workflows/tidy.yml index 71a8f6391022..74fae7c4aedb 100644 --- a/.github/workflows/tidy.yml +++ b/.github/workflows/tidy.yml @@ -12,23 +12,23 @@ on: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - + jobs: tidy-code: runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@v2 # 检出仓库代码 - + - name: Set up JDK uses: actions/setup-java@v2 with: java-version: '24' # 指定 Java 版本（根据项目调整） distribution: 'adopt' - + - name: Set up Gradle uses: gradle/actions/setup-gradle@v2 # 初始化 Gradle 并启用缓存 - + - name: Run tidy task run: ./gradlew tidy run: ./gradlew tidy # 执行自定义 tidy 任务 From 48e1ff853acfd9435cd92acbd501e104f0b30231 Mon Sep 17 00:00:00 2001 From: wuth Date: Wed, 2 Jul 2025 09:58:09 +0800 Subject: [PATCH 4/6] Update tidy.yml --- .github/workflows/tidy.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/tidy.yml b/.github/workflows/tidy.yml index 74fae7c4aedb..006bd63f69fb 100644 --- a/.github/workflows/tidy.yml +++ b/.github/workflows/tidy.yml @@ -1,6 +1,4 @@ on: - workflow_dispatch: - pull_request: branches: - '*' From c0b8c5fb2da9a9f0c2e64f10b2c49f042810c2c1 Mon Sep 17 00:00:00 2001 From: wuth Date: Wed, 2 Jul 2025 10:42:14 +0800 Subject: [PATCH 5/6] Update OpenIndexDialogFactory.java checkGoogleJavaFormat --- .../components/dialog/menubar/OpenIndexDialogFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/OpenIndexDialogFactory.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/OpenIndexDialogFactory.java index 3f032d85c0e1..e3cd1c45c7a7 100644 --- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/OpenIndexDialogFactory.java +++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/OpenIndexDialogFactory.java @@ -293,9 +293,9 @@ private File getLastOpenedDirectory() { if (!history.isEmpty()) { Path path = Paths.get(history.get(0)); if (Files.exists(path)) { - if(path.getParent() != null) { + if (path.getParent() != null) { return path.getParent().toAbsolutePath().toFile(); - }else { + } else { return path.toAbsolutePath().toFile(); } } From edf369dbf00842e2e5aa4c7304d6e5fcee7d959e Mon Sep 17 00:00:00 2001 From: wuth Date: Wed, 2 Jul 2025 12:14:37 +0800 Subject: [PATCH 6/6] Delete .github/workflows/tidy.yml --- .github/workflows/tidy.yml | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 .github/workflows/tidy.yml diff --git a/.github/workflows/tidy.yml b/.github/workflows/tidy.yml deleted file mode 100644 index 006bd63f69fb..000000000000 --- a/.github/workflows/tidy.yml +++ /dev/null @@ -1,32 +0,0 @@ -on: - pull_request: - branches: - - '*' - - push: - branches: - - 'main' - - 'branch_10x' - -env: - DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - -jobs: - tidy-code: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v2 # 检出仓库代码 - - - name: Set up JDK - uses: actions/setup-java@v2 - with: - java-version: '24' # 指定 Java 版本（根据项目调整） - distribution: 'adopt' - - - name: Set up Gradle - uses: gradle/actions/setup-gradle@v2 # 初始化 Gradle 并启用缓存 - - - name: Run tidy task - run: ./gradlew tidy - run: ./gradlew tidy # 执行自定义 tidy 任务