Rename previous to beforeAttach / beforeSwap

Author: mcculls

components/context/src/main/java/datadog/context/ThreadLocalContextManager.java

@@ -30,8 +30,8 @@ public ContextScope attach(Context context) {
   ContextScope doAttach(Context context, @Nullable ContextContinuationImpl continuation) {
     ContextHolder holder = CONTEXT_HOLDER.get();
 
-    Context previous = holder.current;
-    if (context == previous) {
+    Context beforeAttach = holder.current;
+    if (context == beforeAttach) {
       if (continuation != null) {
         // already attached, safe to release early to avoid resource leak
         continuation.releaseOnScopeClose();
@@ -41,32 +41,32 @@ ContextScope doAttach(Context context, @Nullable ContextContinuationImpl continu
     }
 
     ContextListener[] ls = listeners;
-    notifyDetach(previous, ls);
+    notifyDetach(beforeAttach, ls);
     holder.current = context;
     notifyAttach(context, ls);
 
     if (continuation == null) {
-      return new ContextScopeImpl(context, holder, previous);
+      return new ContextScopeImpl(context, holder, beforeAttach);
     } else {
-      return new ResumedScopeImpl(context, holder, previous, continuation);
+      return new ResumedScopeImpl(context, holder, beforeAttach, continuation);
     }
   }
 
   @Override
   public Context swap(Context context) {
     ContextHolder holder = CONTEXT_HOLDER.get();
 
-    Context previous = holder.current;
-    if (context == previous) {
-      return previous;
+    Context beforeSwap = holder.current;
+    if (context == beforeSwap) {
+      return beforeSwap;
     }
 
     ContextListener[] ls = listeners;
-    notifyDetach(previous, ls);
+    notifyDetach(beforeSwap, ls);
     holder.current = context;
     notifyAttach(context, ls);
 
-    return previous;
+    return beforeSwap;
   }
 
   @Override
@@ -147,14 +147,14 @@ private static class ContextScopeImpl implements ContextScope {
 
     private final Context context;
     private final ContextHolder holder;
-    private final Context previous;
+    private final Context beforeAttach;
 
     private boolean closed;
 
-    ContextScopeImpl(Context context, ContextHolder holder, Context previous) {
+    ContextScopeImpl(Context context, ContextHolder holder, Context beforeAttach) {
       this.context = context;
       this.holder = holder;
-      this.previous = previous;
+      this.beforeAttach = beforeAttach;
     }
 
     @Override
@@ -168,8 +168,8 @@ public void close() {
       if (!closed && context == holder.current) {
         ContextListener[] ls = INSTANCE.listeners;
         notifyDetach(context, ls);
-        holder.current = previous;
-        notifyAttach(previous, ls);
+        holder.current = beforeAttach;
+        notifyAttach(beforeAttach, ls);
         closed = true;
       }
     }
@@ -181,9 +181,9 @@ private static final class ResumedScopeImpl extends ContextScopeImpl {
     ResumedScopeImpl(
         Context context,
         ContextHolder holder,
-        Context previous,
+        Context beforeAttach,
         @Nullable ContextContinuationImpl continuation) {
-      super(context, holder, previous);
+      super(context, holder, beforeAttach);
       this.continuation = continuation;
     }