Changeset 18651 in josm for trunk

Timestamp:

2023-02-08T22:22:05+01:00 (15 months ago)

Author:

taylor.smock

Message:

See #20768/r18650: Add OAuth 2.0 support

This fixes tests that don't have the HTTP factory set or have "​http://invalid"
set as the OSM API url.

It also fixes 2 static analysis warnings.

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/oauth/OAuthParameters.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/OsmConnection.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgentTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java

@@ -100 +100 @@
         final String redirectUri;
         final String baseUrl;
-        if (apiUrl != null && !Config.getUrls().getDefaultOsmApiUrl().equals(apiUrl)) {
+        if (apiUrl != null && !Config.getUrls().getDefaultOsmApiUrl().equals(apiUrl) && !"http://invalid".equals(apiUrl)) {
             clientId = "";
             clientSecret = "";

trunk/src/org/openstreetmap/josm/io/OsmConnection.java

@@ -11 +11 @@
 import java.util.Base64;
 import java.util.Objects;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 
@@ -214 +214 @@
             RemoteControl.start();
         }
-        AtomicBoolean done = new AtomicBoolean();
+        CountDownLatch done = new CountDownLatch(1);
         Consumer<IOAuthToken> consumer = authToken -> {
                     if (!remoteControlIsRunning) {
@@ -223 +223 @@
                     OAuthAccessTokenHolder.getInstance().setAccessToken(OsmApi.getOsmApi().getServerUrl(), authToken);
                     OAuthAccessTokenHolder.getInstance().save(CredentialsManager.getInstance());
-                    synchronized (done) {
-                        done.set(true);
-                        done.notifyAll();
-                    }
+                    done.countDown();
                 };
         new OAuth20Authorization().authorize(oAuth20Parameters,
@@ -235 +232 @@
             // Only wait at most 5 minutes
             int counter = 0;
-            while (!done.get() && counter < 5) {
+            while (done.getCount() >= 0 && counter < 5) {
                 try {
-                    done.wait(TimeUnit.MINUTES.toMillis(1));
+                    if (done.await(1, TimeUnit.MINUTES)) {
+                        break;
+                    }
                 } catch (InterruptedException e) {
                     Thread.currentThread().interrupt();

trunk/test/unit/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgentTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.io.auth;
+
+import org.openstreetmap.josm.testutils.annotations.HTTP;
 
 /**
  * Test {@link JosmPreferencesCredentialAgent}
  */
+@HTTP
 class JosmPreferencesCredentialAgentTest implements CredentialsAgentTest<JosmPreferencesCredentialAgent> {