Merge pull request #4021 from eclipse/jetty-10.0.x-remove-deprecations

Removing @Deprecated methods / classes from jetty-9.4.x merge
This commit is contained in:
Joakim Erdfelt 2019-09-24 13:37:54 -05:00 committed by GitHub
commit 6ebc7840da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 37 deletions

View File

@ -497,27 +497,6 @@ public class HttpClient extends ContainerLifeCycle
return uri;
}
/**
* Returns a {@link Destination} for the given scheme, host and port.
* Applications may use {@link Destination}s to create {@link Connection}s
* that will be outside HttpClient's pooling mechanism, to explicitly
* control the connection lifecycle (in particular their termination with
* {@link Connection#close()}).
*
* @param scheme the destination scheme
* @param host the destination host
* @param port the destination port
* @return the destination
* @see #getDestinations()
* @deprecated use {@link #resolveDestination(Request)} instead
*/
@Deprecated
public Destination getDestination(String scheme, String host, int port)
{
Origin origin = createOrigin(scheme, host, port);
return resolveDestination(new HttpDestination.Key(origin, null));
}
public Destination resolveDestination(Request request)
{
Origin origin = createOrigin(request.getScheme(), request.getHost(), request.getPort());

View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.security.jaspi.modules;
package org.eclipse.jetty.security.jaspi;
import java.io.IOException;
import java.util.Map;
@ -31,11 +31,11 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.security.jaspi.modules.BaseAuthModule;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.security.Constraint;
@Deprecated
public class BasicAuthModule extends BaseAuthModule
{
private static final Logger LOG = Log.getLogger(BasicAuthModule.class);

View File

@ -10,7 +10,7 @@
<protected>true</protected>
<serverAuthContext>
<serverAuthModule>
<className>org.eclipse.jetty.security.jaspi.modules.BasicAuthModule</className>
<className>org.eclipse.jetty.security.jaspi.BasicAuthModule</className>
<options>
org.eclipse.jetty.security.jaspi.modules.RealmName=TestRealm
</options>

View File

@ -23,7 +23,6 @@ import java.io.ObjectInputStream;
import java.io.Serializable;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionActivationListener;
import javax.servlet.http.HttpSessionBindingEvent;
import javax.servlet.http.HttpSessionBindingListener;
import javax.servlet.http.HttpSessionEvent;
@ -113,16 +112,4 @@ public class SessionAuthentication extends AbstractUserAuthentication
_session = se.getSession();
}
}
@Override
@Deprecated
public void valueBound(HttpSessionBindingEvent event)
{
}
@Override
@Deprecated
public void valueUnbound(HttpSessionBindingEvent event)
{
}
}