Move CaseInsensitiveKeyMap to o.a.t.util.collections so it is availab…

…le outside of the WebSocket implementation (I want to re-use it in HTTP/2's PushBuilder) git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1708746 13f79535-47bb-0310-9956-ffa450edef68
apache · Oct 15, 2015 · ce4b607 · ce4b607
1 parent d11ebf4
commit ce4b607
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 3 deletions.
diff --git a/...mcat/websocket/CaseInsensitiveKeyMap.java → ...il/collections/CaseInsensitiveKeyMap.java b/...mcat/websocket/CaseInsensitiveKeyMap.java → ...il/collections/CaseInsensitiveKeyMap.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tomcat.websocket;
+package org.apache.tomcat.util.collections;
 
 import java.util.AbstractMap;
 import java.util.AbstractSet;

diff --git a/java/org/apache/tomcat/websocket/WsHandshakeResponse.java b/java/org/apache/tomcat/websocket/WsHandshakeResponse.java
@@ -23,6 +23,8 @@
 
 import javax.websocket.HandshakeResponse;
 
+import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
+
 /**
  * Represents the response to a WebSocket handshake.
  */

diff --git a/java/org/apache/tomcat/websocket/WsWebSocketContainer.java b/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
@@ -65,6 +65,7 @@
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.codec.binary.Base64;
+import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
 import org.apache.tomcat.util.res.StringManager;
 import org.apache.tomcat.websocket.pojo.PojoEndpointClient;
 

diff --git a/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java b/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
@@ -30,7 +30,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.websocket.server.HandshakeRequest;
 
-import org.apache.tomcat.websocket.CaseInsensitiveKeyMap;
+import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
 
 /**
  * Represents the request that this session was opened under.

diff --git a/test/org/apache/catalina/startup/TomcatBaseTest.java b/test/org/apache/catalina/startup/TomcatBaseTest.java
@@ -65,7 +65,7 @@
 import org.apache.catalina.webresources.StandardRoot;
 import org.apache.coyote.http11.Http11NioProtocol;
 import org.apache.tomcat.util.buf.ByteChunk;
-import org.apache.tomcat.websocket.CaseInsensitiveKeyMap;
+import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
 
 /**
  * Base test case that provides a Tomcat instance for each test - mainly so we

diff --git a/test/org/apache/tomcat/websocket/TestCaseInsensitiveKeyMap.java b/test/org/apache/tomcat/websocket/TestCaseInsensitiveKeyMap.java
@@ -22,6 +22,7 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
+import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
 import org.junit.Assert;
 import org.junit.Test;