From c56d95d28ca4a924ca5f74ee60d4ea72e2b269d4 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Tue, 4 Apr 2017 08:34:39 +0200 Subject: [PATCH] WW-4779 Marks as deprecated the profiling layer --- .../opensymphony/xwork2/interceptor/TimerInterceptor.java | 3 +++ .../opensymphony/xwork2/util/profiling/ObjectProfiler.java | 6 ++++++ .../xwork2/util/profiling/ProfilingTimerBean.java | 3 +++ .../opensymphony/xwork2/util/profiling/UtilTimerStack.java | 3 +++ 4 files changed, 15 insertions(+) diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/TimerInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/TimerInterceptor.java index d2cc53472..e5433abd6 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/TimerInterceptor.java +++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/TimerInterceptor.java @@ -91,7 +91,10 @@ import org.apache.logging.log4j.Logger; * * @author Jason Carreira * @author Claus Ibsen + * + * @deprecated will be dropped with next major release (2.6) */ +@Deprecated public class TimerInterceptor extends AbstractInterceptor { private static final Logger LOG = LogManager.getLogger(TimerInterceptor.class); diff --git a/core/src/main/java/com/opensymphony/xwork2/util/profiling/ObjectProfiler.java b/core/src/main/java/com/opensymphony/xwork2/util/profiling/ObjectProfiler.java index 733bce3cc..fee258863 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/profiling/ObjectProfiler.java +++ b/core/src/main/java/com/opensymphony/xwork2/util/profiling/ObjectProfiler.java @@ -33,7 +33,9 @@ import java.lang.reflect.Proxy; /** * @author Scott Farquhar + * @deprecated will be dropped with next major release (2.6) */ +@Deprecated public class ObjectProfiler { /** @@ -135,6 +137,10 @@ public class ObjectProfiler { } +/** + * @deprecated will be dropped with next major release (2.6) + */ +@Deprecated class TimerInvocationHandler implements InvocationHandler { protected Object target; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/profiling/ProfilingTimerBean.java b/core/src/main/java/com/opensymphony/xwork2/util/profiling/ProfilingTimerBean.java index b94f0abaf..11554e0ee 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/profiling/ProfilingTimerBean.java +++ b/core/src/main/java/com/opensymphony/xwork2/util/profiling/ProfilingTimerBean.java @@ -35,7 +35,10 @@ import java.util.List; * @author Mike Cannon-Brookes * @author Scott Farquhar * @version $Date$ $Id$ + * + * @deprecated will be dropped with next major release (2.6) */ +@Deprecated public class ProfilingTimerBean implements java.io.Serializable { private static final long serialVersionUID = -6180672043920208784L; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/profiling/UtilTimerStack.java b/core/src/main/java/com/opensymphony/xwork2/util/profiling/UtilTimerStack.java index 092cb8d9a..c1772b838 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/profiling/UtilTimerStack.java +++ b/core/src/main/java/com/opensymphony/xwork2/util/profiling/UtilTimerStack.java @@ -266,7 +266,10 @@ import org.apache.logging.log4j.Logger; *

* * + * + * @deprecated will be dropped with next major release (2.6) */ +@Deprecated public class UtilTimerStack { // A reference to the current ProfilingTimerBean