Merge branch 'master' into GCN-4643-java-source-level-check

apache · Jul 10, 2024 · bbf760e · bbf760e
2 parents 577601a + 50be12a
commit bbf760e
Show file tree

Hide file tree

Showing 52 changed files with 2,540 additions and 1,270 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -124,7 +124,7 @@ jobs:
     timeout-minutes: 40
     strategy:
       matrix:
-        java: [ '17', '21', '22' ]
+        java: [ '17', '21', '23-ea' ]
         exclude:
           - java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
       fail-fast: false
@@ -525,6 +525,18 @@ jobs:
       - name: Extract
         run: tar --zstd -xf build.tar.zst
 
+      - name: apisupport.project
+        run: ant $OPTS -f apisupport/apisupport.project test
+
+      - name: apisupport.refactoring
+        run: ant $OPTS -f apisupport/apisupport.refactoring test
+
+      - name: apisupport.wizards
+        run: ant $OPTS -f apisupport/apisupport.wizards test
+
+      - name: timers
+        run: ant $OPTS -f apisupport/timers test
+
       - name: ide/api.xml
         run: ant $OPTS -f ide/api.xml test
 
@@ -808,7 +820,7 @@ jobs:
     timeout-minutes: 50
     strategy:
       matrix:
-        java: [ '17', '21', '22' ]
+        java: [ '17', '21', '23-ea' ]
         exclude:
           - java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
       fail-fast: false
@@ -1403,56 +1415,6 @@ jobs:
           paths: "./*/*/build/test/*/results/TEST-*.xml"
 
 
-  # TODO merge this job into other jobs once tests are fixed
-  apisupport-modules-test:
-    name: APISupport Modules on Linux/JDK ${{ matrix.java }}
-    needs: base-build
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    strategy:
-      matrix:
-        java: [ '17' ]
-      fail-fast: false
-    steps:
-
-      - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v4
-        with:
-          java-version: ${{ matrix.java }}
-          distribution: ${{ env.DEFAULT_JAVA_DISTRIBUTION }}
-
-      - name: Setup Xvfb
-        run: |
-          echo "DISPLAY=:99.0" >> $GITHUB_ENV
-          Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
-
-      - name: Download Build
-        uses: actions/download-artifact@v4
-        with:
-          name: build
-
-      - name: Extract
-        run: tar --zstd -xf build.tar.zst
-
-      - name: apisupport.project
-        run: ant $OPTS -f apisupport/apisupport.project test
-
-      - name: apisupport.refactoring
-        run: ant $OPTS -f apisupport/apisupport.refactoring test
-
-      - name: apisupport.wizards
-        run: ant $OPTS -f apisupport/apisupport.wizards test
-
-      - name: timers
-        run: ant $OPTS -f apisupport/timers test
-
-      - name: Create Test Summary
-        uses: test-summary/action@v2
-        if: failure()
-        with:
-          paths: "./*/*/build/test/*/results/TEST-*.xml"
-
-
   java-hints-test:
     name: Java Hints ${{ matrix.config }} on Linux/JDK ${{ matrix.java }}
     # equals env.test_java == 'true'
@@ -1509,13 +1471,13 @@ jobs:
   java-debugger-test:
     name: Java Debugger tests on Linux/JDK ${{ matrix.java }}
     # equals env.test_java == 'true'
-    if: ${{ contains(github.event.pull_request.labels.*.name, 'Java') || contains(github.event.pull_request.labels.*.name, 'ci:all-tests') || github.event_name != 'pull_request' }}
+    if: ${{ contains(github.event.pull_request.labels.*.name, 'Java') || contains(github.event.pull_request.labels.*.name, 'debugger') || contains(github.event.pull_request.labels.*.name, 'ci:all-tests') || github.event_name != 'pull_request' }}
     needs: base-build
     runs-on: ubuntu-latest
     timeout-minutes: 60
     strategy:
       matrix:
-        java: [ '17', '21', '22' ]
+        java: [ '17', '21', '23-ea' ]
         exclude:
           - java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
       fail-fast: false
@@ -2658,7 +2620,6 @@ jobs:
       - java-hints-test
       - java-debugger-test
       - profiler-test
-      - apisupport-modules-test
       - build-tools
       - webcommon-test
       - php

diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/OCINode.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/OCINode.java
@@ -19,11 +19,11 @@
 package org.netbeans.modules.cloud.oracle;
 
 import com.oracle.bmc.auth.BasicAuthenticationDetailsProvider;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 import java.util.List;
 import javax.swing.Action;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import org.netbeans.modules.cloud.oracle.items.OCIItem;
 import org.openide.nodes.AbstractNode;
 import org.openide.nodes.Children;
@@ -121,10 +121,14 @@ public Node.Handle getHandle() {
         return super.getHandle();
     }
 
-    private final class RefreshListener implements ChangeListener {
+    private final class RefreshListener implements PropertyChangeListener {
         @Override
-        public void stateChanged(ChangeEvent e) {
-            refresh();
+        public void propertyChange(PropertyChangeEvent evt) {
+            if ("referenceName".equals(evt.getPropertyName())) {
+                fireDisplayNameChange("", getDisplayName());
+            } else {
+                refresh();
+            }
         }
     }
 

diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/AddADBAction.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/AddADBAction.java
@@ -75,14 +75,16 @@
 @NbBundle.Messages({
     "AddADB=Add Oracle Autonomous DB",
     "SelectProfile=Select OCI Profile",
-    "# {0} - tenancy name",
-    "# {1} - region id",
-    "SelectProfile_Description={0} (region: {1})",
     "SelectCompartment=Select Compartment",
     "SelectDatabase=Select Database",
     "NoDatabase=No Database available in this Compartment",
     "EnterUsername=Enter Username",
-    "EnterPassword=Enter Password"
+    "EnterPassword=Enter Password",
+    "MSG_CollectingProfiles=Searching for OCI Profiles",
+    "MSG_CollectingProfiles_Text=Loading OCI Profiles",
+    "MSG_CollectingItems=Loading OCI contents",
+    "MSG_CollectingItems_Text=Listing compartments and databases",
+    "SelectProfile_Description={0} (region: {1})"
 })
 public class AddADBAction implements ActionListener {
     private static final Logger LOGGER = Logger.getLogger(AddADBAction.class.getName());
@@ -92,12 +94,6 @@ public class AddADBAction implements ActionListener {
     private static final String PASSWORD = "password"; //NOI18N
     private static final int NUMBER_OF_INPUTS = 4;
 
-    @NbBundle.Messages({
-        "MSG_CollectingProfiles=Searching for OCI Profiles",
-        "MSG_CollectingProfiles_Text=Loading OCI Profiles",
-        "MSG_CollectingItems=Loading OCI contents",
-        "MSG_CollectingItems_Text=Listing compartments and databases",
-    })
     @Override
     public void actionPerformed(ActionEvent e) {
         addADB();
@@ -212,8 +208,7 @@ public NotifyDescriptor createInput(NotifyDescriptor.ComposedInput input, int nu
                         AbstractPasswordPanel.generatePassword(),
                         (String) result.get(USERNAME),
                         ((String) result.get(PASSWORD)).toCharArray(),
-                        selectedDatabase.getKey().getValue(),
-                        selectedDatabase.getCompartmentId());
+                        selectedDatabase);
                 action.addConnection(info);
                 return selectedDatabase;
             } catch (IOException ex) {