Issue #3308 Remove deprecated session methods (#3309)

Signed-off-by: Jan Bartel <janb@webtide.com>

jetty-server/src/main/java/org/eclipse/jetty/server/session/Session.java

@@ -144,15 +144,6 @@ public class Session implements SessionHandler.SessionIf
             };
         }
 
-        /**
-         * For backward api compatibility only. 
-         * @see #schedule(long)
-         */
-        @Deprecated
-        public void schedule ()
-        {
-            schedule(calculateInactivityTimeout(System.currentTimeMillis()));
-        }
 
         /**
          * @param time the timeout to set; -1 means that the timer will not be
@@ -544,12 +535,6 @@ public class Session implements SessionHandler.SessionIf
     }
 
 
-    @Deprecated
-    public void updateInactivityTimer() 
-    {
-        //for backward api compatibility only
-    }
-    
     /**
      * Calculate what the session timer setting should be based on:
      * the time remaining before the session expires 
@@ -1058,18 +1043,6 @@ public class Session implements SessionHandler.SessionIf
         return result;
     }
 
-    /* ------------------------------------------------------------- */
-    /**
-     * Call HttpSessionAttributeListeners as part of invalidating a Session.
-     * 
-     * @throws IllegalStateException if no session manager can be find
-     */
-    @Deprecated
-    protected void doInvalidate() throws IllegalStateException
-    {
-        finishInvalidate();
-    }
-
     /* ------------------------------------------------------------- */
     /**
      * Call HttpSessionAttributeListeners as part of invalidating a Session.

jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionCache.java

@@ -91,25 +91,6 @@ public interface SessionCache extends LifeCycle
      */
     Session newSession (SessionData data);
     
-    /**
-     * Change the id of a session.
-     * 
-     * This method has been superceded by the 4 arg renewSessionId method and
-     * should no longer be called.
-     * 
-     * @param oldId the old id
-     * @param newId the new id
-     * @return the changed Session
-     * @throws Exception if anything went wrong
-     * @deprecated use
-     *             {@link #renewSessionId(String oldId, String newId, String oldExtendedId, String newExtendedId)}
-     */
-    @Deprecated
-    default Session renewSessionId(String oldId, String newId) throws Exception
-    {
-        return null;
-    }
-    
 
     /**
      * Change the id of a Session.
@@ -121,10 +102,7 @@ public interface SessionCache extends LifeCycle
      * @return the Session after changing its id
      * @throws Exception if any error occurred
      */
-    default Session renewSessionId(String oldId, String newId, String oldExtendedId, String newExtendedId) throws Exception
+    Session renewSessionId(String oldId, String newId, String oldExtendedId, String newExtendedId) throws Exception;
-    {
-        return renewSessionId(oldId, newId);
-    }
 
     
     

jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java

@@ -1372,16 +1372,6 @@ public class SessionHandler extends ScopedHandler
         }
     }
     
-    /**
-     * @see #sessionInactivityTimerExpired(Session, long)
-     */
-    @Deprecated
-    public void sessionInactivityTimerExpired (Session session)
-    {
-        //for backwards compilation compatibility only
-        sessionInactivityTimerExpired(session, System.currentTimeMillis());
-    }
-    
 
     /* ------------------------------------------------------------ */
     /**