1) codahale wanted "socket+ssl" not "blocking+ssl"

2) Clean up some stray imports
sullis · Apr 14, 2012 · 0a6449e · 0a6449e
1 parent ecc813e
commit 0a6449e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/dropwizard-core/src/main/java/com/yammer/dropwizard/config/HttpConfiguration.java b/dropwizard-core/src/main/java/com/yammer/dropwizard/config/HttpConfiguration.java
@@ -69,7 +69,7 @@ public enum ConnectorType {
     private String rootPath = "/*";
 
     @NotNull
-    @Pattern(regexp = "(blocking(?:\\+ssl)?|nonblocking(?:\\+ssl)?|legacy)",
+    @Pattern(regexp = "(blocking?|nonblocking(?:\\+ssl)?|legacy|socket\\+ssl)",
              flags = {Pattern.Flag.CASE_INSENSITIVE})
     @JsonProperty
     private String connectorType = "blocking";
@@ -183,7 +183,7 @@ public ConnectorType getConnectorType() {
             return ConnectorType.SOCKET;
         } else if ("nonblocking".equalsIgnoreCase(connectorType)) {
             return ConnectorType.SELECT_CHANNEL;
-        } else if ("blocking+ssl".equalsIgnoreCase(connectorType)) {
+        } else if ("socket+ssl".equalsIgnoreCase(connectorType)) {
             return ConnectorType.SOCKET_SSL;
         } else if ("nonblocking+ssl".equalsIgnoreCase(connectorType)) {
             return ConnectorType.SELECT_CHANNEL_SSL;

diff --git a/dropwizard-core/src/main/java/com/yammer/dropwizard/config/SslConfiguration.java b/dropwizard-core/src/main/java/com/yammer/dropwizard/config/SslConfiguration.java
@@ -1,7 +1,6 @@
 package com.yammer.dropwizard.config;
 
 import com.google.common.base.Optional;
-import com.yammer.dropwizard.validation.ValidationMethod;
 import org.codehaus.jackson.annotate.JsonProperty;
 import org.eclipse.jetty.util.ssl.SslContextFactory;