PLUGINAPI-42 Use new types for identity providers, deprecate javax methods

Author: ericg138

plugin-api/src/main/java/org/sonar/api/server/authentication/BaseIdentityProvider.java

@@ -21,6 +21,8 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.sonar.api.server.http.HttpRequest;
+import org.sonar.api.server.http.HttpResponse;
 
 /**
  * @since 5.4
@@ -35,16 +37,36 @@ public interface BaseIdentityProvider extends IdentityProvider {
 
   interface Context {
 
+    /**
+     * Get the received HTTP request.
+     *
+     * @since 9.16
+     */
+    HttpRequest getHttpRequest();
+
+    /**
+     * Get the HTTP response to send.
+     *
+     * @since 9.16
+     */
+    HttpResponse getHttpResponse();
+
     /**
      * Get the received HTTP request.
      * Note - {@code getRequest().getSession()} must not be used in order to support
      * future clustering of web servers without stateful server sessions.
+     *
+     * @deprecated since 9.16. Use {@link #getHttpRequest()} instead.
      */
+    @Deprecated(since = "9.16", forRemoval = true)
     HttpServletRequest getRequest();
 
     /**
      * Get the HTTP response to send
+     *
+     * @deprecated since 9.16. Use {@link #getHttpResponse()} instead.
      */
+    @Deprecated(since = "9.16", forRemoval = true)
     HttpServletResponse getResponse();
 
     /**

plugin-api/src/main/java/org/sonar/api/server/authentication/OAuth2IdentityProvider.java

@@ -21,6 +21,8 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.sonar.api.server.http.HttpRequest;
+import org.sonar.api.server.http.HttpResponse;
 
 /**
  * @since 5.4
@@ -45,16 +47,36 @@ interface OAuth2Context {
      */
     String getCallbackUrl();
 
+    /**
+     * Get the received HTTP request.
+     *
+     * @since 9.16
+     */
+    HttpRequest getHttpRequest();
+
+    /**
+     * Get the HTTP response to send.
+     *
+     * @since 9.16
+     */
+    HttpResponse getHttpResponse();
+
     /**
      * Get the received HTTP request.
      * Note - {@code getRequest().getSession()} must not be used in order to support
      * future clustering of web servers without stateful server sessions.
+     *
+     * @deprecated since 9.16. Use {@link #getHttpRequest()} instead.
      */
+    @Deprecated(since = "9.16", forRemoval = true)
     HttpServletRequest getRequest();
 
     /**
      * Get the HTTP response to send
+     *
+     * @deprecated since 9.16. Use {@link #getHttpResponse()} instead.
      */
+    @Deprecated(since = "9.16", forRemoval = true)
     HttpServletResponse getResponse();
   }