/*
 * The MIT License
 *
 * Copyright (c) 2016, CloudBees, Inc.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 */
package hudson.security;

import javax.annotation.CheckForNull;
import org.acegisecurity.Authentication;
import org.acegisecurity.context.SecurityContext;
import org.acegisecurity.context.SecurityContextHolder;

/**
 * A {@link AutoCloseable} that captures the previous {@link SecurityContext} and restores it on {@link #close()}
 *
 * @since FIXME
 */
public class ACLContext implements AutoCloseable {

    /**
     * The previous context.
     */
    private final SecurityContext previousContext;

    /**
     * Private constructor to ensure only instance creation is from {@link ACL#as(Authentication)}.
     * @param previousContext
     */
    ACLContext(SecurityContext previousContext) {
        this.previousContext = previousContext;
    }

    /**
     * Accessor for the previous context.
     * @return the previous context.
     */
    @CheckForNull
    public SecurityContext getPreviousContext() {
        return previousContext;
    }

    /** {@inheritDoc} */
    @Override
    public void close() {
        SecurityContextHolder.setContext(previousContext);
    }
}

@@ -1200,16 +1200,49 @@
 orNull;%0A
+import javax.annotation.Nonnull;%0A
 import o
@@ -1615,24 +1615,37 @@
 xt.%0A     */%0A
+    @Nonnull%0A
     private 
@@ -1821,16 +1821,37 @@
 sContext
+ the previous context
 %0A     */
@@ -1866,16 +1866,25 @@
 Context(
+@Nonnull 
 Security
@@ -2065,25 +2065,20 @@
 */%0A    @
-CheckForN
+Nonn
 ull%0A    

Clarify that the previousContext is never `null` per JavaDoc for `SecurityContextHolder.getContext()`