Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/deprecationwarning' into jetty-9.3.x

This commit is contained in:
Joakim Erdfelt 2015-12-02 11:38:30 -07:00
parent 1bd0602c9f 6d3d912b0b
commit c83bf80702
2 changed files with 91 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
View File

@ -62,6 +62,7 @@ import org.eclipse.jetty.server.handler.gzip.GzipHandler;
import org.eclipse.jetty.server.session.SessionHandler;
import org.eclipse.jetty.servlet.BaseHolder.Source;
import org.eclipse.jetty.util.DecoratedObjectFactory;
import org.eclipse.jetty.util.DeprecationWarning;
import org.eclipse.jetty.util.annotation.ManagedAttribute;
import org.eclipse.jetty.util.annotation.ManagedObject;
import org.eclipse.jetty.util.component.LifeCycle;
@ -90,7 +91,7 @@ public class ServletContextHandler extends ContextHandler
public interface ServletContainerInitializerCaller extends LifeCycle {};
protected final DecoratedObjectFactory _objFactory = new DecoratedObjectFactory();
protected final DecoratedObjectFactory _objFactory;
protected Class<? extends SecurityHandler> _defaultSecurityHandlerClass=org.eclipse.jetty.security.ConstraintSecurityHandler.class;
protected SessionHandler _sessionHandler;
protected SecurityHandler _securityHandler;
@ -150,6 +151,9 @@ public class ServletContextHandler extends ContextHandler
_sessionHandler = sessionHandler;
_securityHandler = securityHandler;
_servletHandler = servletHandler;
_objFactory = new DecoratedObjectFactory();
_objFactory.addDecorator(new DeprecationWarning());
if (contextPath!=null)
setContextPath(contextPath);

86
jetty-util/src/main/java/org/eclipse/jetty/util/DeprecationWarning.java Normal file
View File

@ -0,0 +1,86 @@
//
// ========================================================================
// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.util;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
public class DeprecationWarning implements Decorator
{
private static final Logger LOG = Log.getLogger(DeprecationWarning.class);
@Override
public <T> T decorate(T o)
{
if (o == null)
{
return null;
}
Class<?> clazz = o.getClass();
try
{
Deprecated depr = clazz.getAnnotation(Deprecated.class);
if (depr != null)
{
LOG.warn("Using @Deprecated Class {}",clazz.getName());
}
}
catch (Throwable t)
{
LOG.ignore(t);
}
verifyIndirectTypes(clazz.getSuperclass(),clazz,"Class");
for (Class<?> ifaceClazz : clazz.getInterfaces())
{
verifyIndirectTypes(ifaceClazz,clazz,"Interface");
}
return o;
}
private void verifyIndirectTypes(Class<?> superClazz, Class<?> clazz, String typeName)
{
try
{
// Report on super class deprecation too
while (superClazz != null && superClazz != Object.class)
{
Deprecated supDepr = superClazz.getAnnotation(Deprecated.class);
if (supDepr != null)
{
LOG.warn("Using indirect @Deprecated {} {} - (seen from {})",typeName,superClazz.getName(),clazz);
}
superClazz = superClazz.getSuperclass();
}
}
catch (Throwable t)
{
LOG.ignore(t);
}
}
@Override
public void destroy(Object o)
{
}
}