From 5fe999caa25755dec57d21bc3d694f67de4e45ab Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Tue, 8 Feb 2022 15:59:23 +1100
Subject: [PATCH] Issue #7545 - changes from review

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 .../jetty/security/openid/OpenIdConfiguration.java       | 9 ++++++---
 .../java/org/eclipse/jetty/test/openid/AdminPage.java    | 2 +-
 .../java/org/eclipse/jetty/test/openid/ErrorPage.java    | 2 +-
 .../java/org/eclipse/jetty/test/openid/HomePage.java     | 2 +-
 .../java/org/eclipse/jetty/test/openid/LoginPage.java    | 2 +-
 .../java/org/eclipse/jetty/test/openid/LogoutPage.java   | 2 +-
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdConfiguration.java b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdConfiguration.java
index df9a82703d4..8ab1255c3fb 100644
--- a/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdConfiguration.java
+++ b/jetty-openid/src/main/java/org/eclipse/jetty/security/openid/OpenIdConfiguration.java
@@ -88,9 +88,12 @@ public class OpenIdConfiguration extends ContainerLifeCycle
      * @param httpClient The {@link HttpClient} instance to use.
      */
     public OpenIdConfiguration(@Name("issuer") String issuer,
-                               @Name("authorizationEndpoint") String authorizationEndpoint, @Name("tokenEndpoint") String tokenEndpoint,
-                               @Name("clientId") String clientId, @Name("clientSecret") String clientSecret,
-                               @Name("authMethod") String authMethod, @Name("httpClient") HttpClient httpClient)
+                               @Name("authorizationEndpoint") String authorizationEndpoint,
+                               @Name("tokenEndpoint") String tokenEndpoint,
+                               @Name("clientId") String clientId,
+                               @Name("clientSecret") String clientSecret,
+                               @Name("authMethod") String authMethod,
+                               @Name("httpClient") HttpClient httpClient)
     {
         this.issuer = issuer;
         this.clientId = clientId;
diff --git a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/AdminPage.java b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/AdminPage.java
index e7f252b6b80..6957b1bb5e7 100644
--- a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/AdminPage.java
+++ b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/AdminPage.java
@@ -28,4 +28,4 @@ public class AdminPage extends HttpServlet
         Map<String, Object> userInfo = (Map<String, Object>)request.getSession().getAttribute("org.eclipse.jetty.security.openid.claims");
         response.getWriter().println(userInfo.get("sub") + ": success");
     }
-}
\ No newline at end of file
+}
diff --git a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/ErrorPage.java b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/ErrorPage.java
index c975847ac12..6869e21ce33 100644
--- a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/ErrorPage.java
+++ b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/ErrorPage.java
@@ -27,4 +27,4 @@ public class ErrorPage extends HttpServlet
         response.getWriter().println("not authorized");
         response.getWriter().println("<br><a href=\"" + request.getContextPath() + "\">Home</a>");
     }
-}
\ No newline at end of file
+}
diff --git a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/HomePage.java b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/HomePage.java
index ca5cca9c048..5ecdb0aedff 100644
--- a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/HomePage.java
+++ b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/HomePage.java
@@ -42,4 +42,4 @@ public class HomePage extends HttpServlet
             response.getWriter().println("<br><a href=\"" + request.getContextPath() + "/login\">Login</a>");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LoginPage.java b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LoginPage.java
index 7f0b351ff11..0abfbb4eab8 100644
--- a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LoginPage.java
+++ b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LoginPage.java
@@ -27,4 +27,4 @@ public class LoginPage extends HttpServlet
         response.getWriter().println("success");
         response.getWriter().println("<br><a href=\"" + request.getContextPath() + "\">Home</a>");
     }
-}
\ No newline at end of file
+}
diff --git a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LogoutPage.java b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LogoutPage.java
index ac79242c24b..13a6c044a6d 100644
--- a/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LogoutPage.java
+++ b/tests/test-webapps/test-openid-webapp/src/main/java/org/eclipse/jetty/test/openid/LogoutPage.java
@@ -26,4 +26,4 @@ public class LogoutPage extends HttpServlet
         request.getSession().invalidate();
         response.sendRedirect(request.getContextPath());
     }
-}
\ No newline at end of file
+}