Remove debug logging + minor cleanups (#76)

* Remove debug logging + minor cleanups * Test fix and spotless
jenkinsci · Dec 11, 2024 · a4b1998 · a4b1998
1 parent a2e0f7d
commit a4b1998
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/gravatar/boundary/GravatarImageURLVerifier.java b/src/main/java/org/jenkinsci/plugins/gravatar/boundary/GravatarImageURLVerifier.java
@@ -76,9 +76,7 @@ public boolean verify(String email) {
             LOG.finer("Resolved gravatar for " + email + ". Found: " + gravatarExistsForEmail);
         } catch (URISyntaxException e) {
             LOG.warning("Gravatar URL is malformed, " + imageURL);
-        } catch (IOException e) {
-            LOG.fine("Could not connect to the Gravatar URL, " + e);
-        } catch (InterruptedException e) {
+        } catch (IOException | InterruptedException e) {
             LOG.fine("Could not connect to the Gravatar URL, " + e);
         }
         return gravatarExistsForEmail;
@@ -90,8 +88,7 @@ protected Gravatar gravatar() {
     }
 
     private boolean responseCodeIsOK(int gravatarResponseCode) {
-        System.err.println("gravatarResponseCode: " + gravatarResponseCode);
-        return (gravatarResponseCode == HttpURLConnection.HTTP_OK)
-                || (gravatarResponseCode == HttpURLConnection.HTTP_NOT_MODIFIED);
+        return gravatarResponseCode == HttpURLConnection.HTTP_OK
+                || gravatarResponseCode == HttpURLConnection.HTTP_NOT_MODIFIED;
     }
 }
diff --git a/src/main/java/org/jenkinsci/plugins/gravatar/factory/GravatarFactory.java b/src/main/java/org/jenkinsci/plugins/gravatar/factory/GravatarFactory.java
@@ -2,7 +2,6 @@
 
 import de.bripkens.gravatar.DefaultImage;
 import de.bripkens.gravatar.Gravatar;
-import jenkins.model.Jenkins;
 
 public class GravatarFactory {
 
@@ -19,11 +18,6 @@ public Gravatar testGravatar() {
     }
 
     private Gravatar gravatar() {
-        return new Gravatar().setHttps(useHttps());
-    }
-
-    private boolean useHttps() {
-        final Jenkins jenkins = Jenkins.getInstanceOrNull();
-        return jenkins != null && jenkins.isRootUrlSecure();
+        return new Gravatar().setHttps(true);
     }
 }
diff --git a/src/test/java/org/jenkinsci/plugins/gravatar/UserGravatarResolverIntegrationTest.java b/src/test/java/org/jenkinsci/plugins/gravatar/UserGravatarResolverIntegrationTest.java
@@ -95,7 +95,7 @@ public void testGravatarIsUsedForUser() throws Exception {
                 .getElementById("main-panel")
                 .getElementsByTagName("img")
                 .get(0);
-        assertThat(element.getAttribute("src"), startsWith("http://www.gravatar.com"));
+        assertThat(element.getAttribute("src"), startsWith("https://secure.gravatar.com"));
     }
 
     private void prefetchImage(User user) {