/**
 * Waffle (https://github.com/Waffle/waffle)
 *
 * Copyright (c) 2010-2018 Application Security, Inc.
 *
 * All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse
 * Public License v1.0 which accompanies this distribution, and is available at
 * https://www.eclipse.org/legal/epl-v10.html.
 *
 * Contributors: Application Security, Inc.
 */
package waffle.mock.http;

import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;

import javax.servlet.ServletContext;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionContext;

/**
 * Simple Http Session.
 *
 * @author dblock[at]dblock[dot]org
 */
public class SimpleHttpSession implements HttpSession {

    /** The attributes. */
    private final Map<String, Object> attributes = new HashMap<>();

    @Override
    public Object getAttribute(final String attributeName) {
        return this.attributes.get(attributeName);
    }

    @Override
    public Enumeration<String> getAttributeNames() {
        return null;
    }

    @Override
    public long getCreationTime() {
        return 0;
    }

    @Override
    public String getId() {
        return null;
    }

    @Override
    public long getLastAccessedTime() {
        return 0;
    }

    @Override
    public int getMaxInactiveInterval() {
        return 0;
    }

    @Override
    public ServletContext getServletContext() {
        return null;
    }

    // TODO Simply remove this if it is ever actually removed from servlet-api
    @Deprecated
    @Override
    public HttpSessionContext getSessionContext() {
        return null;
    }

    // TODO Simply remove this if it is ever actually removed from servlet-api
    @Deprecated
    @Override
    public Object getValue(final String arg0) {
        return null;
    }

    @Deprecated
    @Override
    public String[] getValueNames() {
        return new String[0];
    }

    @Override
    public void invalidate() {
        // Do Nothing
    }

    @Override
    public boolean isNew() {
        return false;
    }

    @Deprecated
    @Override
    public void putValue(final String arg0, final Object arg1) {
        // Do Nothing
    }

    @Override
    public void removeAttribute(final String attributeName) {
        this.attributes.remove(attributeName);
    }

    @Deprecated
    @Override
    public void removeValue(final String arg0) {
        // Do Nothing
    }

    @Override
    public void setAttribute(final String attributeName, final Object attributeValue) {
        this.attributes.put(attributeName, attributeValue);
    }

    @Override
    public void setMaxInactiveInterval(final int arg0) {
        // Do Nothing
    }
}

@@ -73,10 +73,10 @@
 0-20
-18
+20
  App
@@ -1471,38 +1471,41 @@
 ll;%0A    %7D%0A%0A    /
-/ TODO
+**%0A     *
  Simply remove t
@@ -1548,32 +1548,97 @@
 rom servlet-api%0A
+     *%0A     * @deprecated Remove this once servlet does.%0A     */%0A
     @Deprecated%0A
@@ -1740,14 +1740,17 @@
    /
-/ TODO
+**%0A     *
  Sim
@@ -1809,24 +1809,89 @@
 servlet-api%0A
+     *%0A     * @deprecated Remove this once servlet does.%0A     */%0A
     @Depreca
@@ -1976,32 +1976,179 @@
 rn null;%0A    %7D%0A%0A
+    /**%0A     * Simply remove this if it is ever actually removed from servlet-api%0A     *%0A     * @deprecated Remove this once servlet does.%0A     */%0A
     @Deprecated%0A
@@ -2374,32 +2374,179 @@
 n false;%0A    %7D%0A%0A
+    /**%0A     * Simply remove this if it is ever actually removed from servlet-api%0A     *%0A     * @deprecated Remove this once servlet does.%0A     */%0A
     @Deprecated%0A
@@ -2779,24 +2779,171 @@
 me);%0A    %7D%0A%0A
+    /**%0A     * Simply remove this if it is ever actually removed from servlet-api%0A     *%0A     * @deprecated Remove this once servlet does.%0A     */%0A
     @Depreca

Move deprecated todo comments into javadocs and use deprecated more clearly