From 16d047e81e8055ae1f2be4010d21d382827354eb Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 23 Sep 2015 14:41:19 -0700 Subject: [PATCH] GUAC-1193: Remove after() and before() functions from ConnectionRecordSet. They would not be used. --- .../net/auth/ConnectionRecordSet.java | 38 +------------------ .../simple/SimpleConnectionRecordSet.java | 13 ------- 2 files changed, 2 insertions(+), 49 deletions(-) diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ConnectionRecordSet.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ConnectionRecordSet.java index 3e40474a4..58bab513f 100644 --- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ConnectionRecordSet.java +++ b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ConnectionRecordSet.java @@ -23,7 +23,6 @@ package org.glyptodon.guacamole.net.auth; import java.util.Collection; -import java.util.Date; import org.glyptodon.guacamole.GuacamoleException; /** @@ -78,43 +77,10 @@ public interface ConnectionRecordSet { */ Collection asCollection() throws GuacamoleException; - /** - * Returns the subset of connection records to only those that began after - * the given date and time. - * - * @param date - * The date and time after which all connection records within the - * resulting subset should begin. - * - * @return - * The subset of connection history records which begin after the - * specified date and time. - * - * @throws GuacamoleException - * If an error occurs while restricting the current subset. - */ - ConnectionRecordSet after(Date date) throws GuacamoleException; - - /** - * Returns the subset of connection records to only those that ended before - * the given date and time. - * - * @param date - * The date and time before which all connection records within the - * resulting subset should end. - * - * @return - * The subset of connection history records which end before the - * specified date and time. - * - * @throws GuacamoleException - * If an error occurs while restricting the current subset. - */ - ConnectionRecordSet before(Date date) throws GuacamoleException; - /** * Returns the subset of connection records to only those where the - * connection name or user identifier contain the given value. + * connection name, user identifier, or any associated date field contain + * the given value. * * @param value * The value which all connection records within the resulting subset diff --git a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionRecordSet.java b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionRecordSet.java index c9bb2b4bc..28be3955b 100644 --- a/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionRecordSet.java +++ b/guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/simple/SimpleConnectionRecordSet.java @@ -24,7 +24,6 @@ package org.glyptodon.guacamole.net.auth.simple; import java.util.Collection; import java.util.Collections; -import java.util.Date; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.net.auth.ConnectionRecord; import org.glyptodon.guacamole.net.auth.ConnectionRecordSet; @@ -42,18 +41,6 @@ public class SimpleConnectionRecordSet implements ConnectionRecordSet { return Collections.emptyList(); } - @Override - public ConnectionRecordSet after(Date date) - throws GuacamoleException { - return this; - } - - @Override - public ConnectionRecordSet before(Date date) - throws GuacamoleException { - return this; - } - @Override public ConnectionRecordSet contains(String value) throws GuacamoleException {