Skip to content
Browse files

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

2) Clean up some stray imports
  • Loading branch information...
1 parent ecc813e commit 0a6449efaa4eae529017415d449e65b7bca9ead4 @cheddar cheddar committed Apr 13, 2012
View
4 dropwizard-core/src/main/java/com/yammer/dropwizard/config/HttpConfiguration.java
@@ -69,7 +69,7 @@
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;
View
1 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;

0 comments on commit 0a6449e

Please sign in to comment.
Something went wrong with that request. Please try again.