move to newest basepom version

SingularityService/pom.xml

@@ -236,12 +236,12 @@
     </dependency>
 
     <dependency>
-      <groupId>com.codahale.metrics</groupId>
+      <groupId>io.dropwizard.metrics</groupId>
       <artifactId>metrics-core</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>com.codahale.metrics</groupId>
+      <groupId>io.dropwizard.metrics</groupId>
       <artifactId>metrics-healthchecks</artifactId>
     </dependency>
 
@@ -280,16 +280,6 @@
       <artifactId>jackson-datatype-guava</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-core</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-server</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-validator</artifactId>
@@ -363,6 +353,11 @@
       <artifactId>HorizonCore</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>com.squarespace.jersey2-guice</groupId>
+      <artifactId>jersey2-guice-impl</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

SingularityService/src/main/java/com/hubspot/singularity/WebExceptions.java

@@ -6,9 +6,6 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 
-import com.sun.jersey.api.ConflictException;
-import com.sun.jersey.api.NotFoundException;
-
 public final class WebExceptions {
 
   private WebExceptions() {
@@ -63,14 +60,14 @@ public static WebApplicationException conflict(String message, Object... args) {
     if (args.length > 0) {
       message = format(message, args);
     }
-    throw new ConflictException(message);
+    throw new WebApplicationException(message, Status.CONFLICT);
   }
 
   public static WebApplicationException notFound(String message, Object... args) {
     if (args.length > 0) {
       message = format(message, args);
     }
-    throw new NotFoundException(message);
+    throw new WebApplicationException(message, Status.NOT_FOUND);
   }
 
   public static WebApplicationException forbidden(String message, Object... args) {

SingularityService/src/main/java/com/hubspot/singularity/jersey/JerseyBinder.java

@@ -1,11 +1,10 @@
 package com.hubspot.singularity.jersey;
 
+import javax.ws.rs.container.ContainerRequestFilter;
+
 import com.google.inject.Binder;
 import com.google.inject.binder.LinkedBindingBuilder;
 import com.google.inject.multibindings.Multibinder;
-import com.sun.jersey.spi.container.ContainerRequestFilter;
-import com.sun.jersey.spi.container.ContainerResponseFilter;
-import com.sun.jersey.spi.container.ResourceFilterFactory;
 
 /**
  * Convenience binder for the various Jersey SPI specific filters.
@@ -22,16 +21,4 @@ public static LinkedBindingBuilder<ContainerRequestFilter> bindContainerRequestF
     Multibinder<ContainerRequestFilter> requestFilterBinder = Multibinder.newSetBinder(binder, ContainerRequestFilter.class);
     return requestFilterBinder.addBinding();
   }
-
-  public static LinkedBindingBuilder<ContainerResponseFilter> bindContainerResponseFilter(Binder binder)
-  {
-    Multibinder<ContainerResponseFilter> responseFilterBinder = Multibinder.newSetBinder(binder, ContainerResponseFilter.class);
-    return responseFilterBinder.addBinding();
-  }
-
-  public static LinkedBindingBuilder<ResourceFilterFactory> bindResourceFilter(Binder binder)
-  {
-    Multibinder<ResourceFilterFactory> resourceFilterBinder = Multibinder.newSetBinder(binder, ResourceFilterFactory.class);
-    return resourceFilterBinder.addBinding();
-  }
 }

SingularityService/src/main/java/com/hubspot/singularity/jersey/ReplaceES419LanguageFilter.java

@@ -3,13 +3,11 @@
 import java.util.List;
 
 import javax.inject.Inject;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MultivaluedMap;
 
-import com.sun.jersey.core.header.InBoundHeaders;
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerRequestFilter;
-
 /**
  * Replaces language header containing es-419 (LATAM spanish) with es-ES.
  */
@@ -23,8 +21,8 @@ public class ReplaceES419LanguageFilter implements ContainerRequestFilter {
   {}
 
   @Override
-  public ContainerRequest filter(ContainerRequest request) {
-    MultivaluedMap<String, String> headers = request.getRequestHeaders();
+  public void filter(ContainerRequestContext request) {
+    MultivaluedMap<String, String> headers = request.getHeaders();
     if (headers.containsKey(HttpHeaders.ACCEPT_LANGUAGE)) {
       List<String> acceptLanguageValues = headers.remove(HttpHeaders.ACCEPT_LANGUAGE);
 
@@ -38,10 +36,6 @@ public ContainerRequest filter(ContainerRequest request) {
       }
 
       headers.put(HttpHeaders.ACCEPT_LANGUAGE, acceptLanguageValues);
-
-      request.setHeaders((InBoundHeaders) headers);
     }
-
-    return request;
   }
 }

SingularityService/src/main/java/com/hubspot/singularity/resources/AbstractMachineResource.java

@@ -5,6 +5,9 @@
 import java.util.List;
 import java.util.UUID;
 
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response.Status;
+
 import com.google.common.base.Optional;
 import com.hubspot.singularity.MachineState;
 import com.hubspot.singularity.SingularityAction;
@@ -17,8 +20,6 @@
 import com.hubspot.singularity.data.AbstractMachineManager.StateChangeResult;
 import com.hubspot.singularity.data.SingularityValidator;
 import com.hubspot.singularity.expiring.SingularityExpiringMachineState;
-import com.sun.jersey.api.ConflictException;
-import com.sun.jersey.api.NotFoundException;
 
 public abstract class AbstractMachineResource<T extends SingularityMachineAbstraction<T>> {
 
@@ -63,10 +64,10 @@ private void changeState(String objectId, MachineState newState, Optional<Singul
 
     switch (result) {
       case FAILURE_NOT_FOUND:
-        throw new NotFoundException(String.format("Couldn't find an active %s with id %s (result: %s)", getObjectTypeString(), objectId, result.name()));
+        throw new WebApplicationException(String.format("Couldn't find an active %s with id %s (result: %s)", getObjectTypeString(), objectId, result.name()), Status.NOT_FOUND);
       case FAILURE_ALREADY_AT_STATE:
       case FAILURE_ILLEGAL_TRANSITION:
-        throw new ConflictException(String.format("%s - %s %s is in %s state", result.name(), getObjectTypeString(), objectId, newState));
+        throw new WebApplicationException(String.format("%s - %s %s is in %s state", result.name(), getObjectTypeString(), objectId, newState), Status.CONFLICT);
       default:
         break;
     }

SingularityService/src/test/java/com/hubspot/singularity/SingularityCuratorTestBase.java

@@ -10,6 +10,7 @@
 import com.hubspot.horizon.HttpClient;
 import com.hubspot.mesos.client.MesosClient;
 import com.hubspot.singularity.scheduler.SingularityTestModule;
+import com.squarespace.jersey2.guice.JerseyGuiceUtils;
 
 public class SingularityCuratorTestBase {
 
@@ -27,6 +28,7 @@ public class SingularityCuratorTestBase {
 
   @Before
   public final void curatorSetup() throws Exception {
+    JerseyGuiceUtils.reset();
     singularityTestModule = new SingularityTestModule(useDBTests);
 
     singularityTestModule.getInjector().injectMembers(this);

SingularityService/src/test/java/com/hubspot/singularity/scheduler/SingularityDeploysTest.java

@@ -5,6 +5,8 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import javax.ws.rs.WebApplicationException;
+
 import org.apache.mesos.Protos.TaskState;
 import org.junit.Assert;
 import org.junit.Test;
@@ -28,7 +30,6 @@
 import com.hubspot.singularity.SingularityUpdatePendingDeployRequest;
 import com.hubspot.singularity.TaskCleanupType;
 import com.hubspot.singularity.api.SingularityDeployRequest;
-import com.sun.jersey.api.ConflictException;
 
 public class SingularityDeploysTest extends SingularitySchedulerTestBase {
 
@@ -816,7 +817,7 @@ public void testUsesNewRequestDataFromPendingDeploy() {
   }
 
 
-  @Test(expected = ConflictException.class)
+  @Test(expected = WebApplicationException.class)
   public void testCannotUpdateRequestDuringPendingDeployWithNewData() {
     initRequest();
     SingularityRequest request = requestResource.getRequest(requestId).getRequest();

SingularityService/src/test/java/com/hubspot/singularity/scheduler/SingularitySchedulerTestBase.java

@@ -92,6 +92,7 @@
 import com.hubspot.singularity.resources.TaskResource;
 import com.hubspot.singularity.smtp.SingularityMailer;
 import com.ning.http.client.AsyncHttpClient;
+import com.squarespace.jersey2.guice.JerseyGuiceUtils;
 
 public class SingularitySchedulerTestBase extends SingularityCuratorTestBase {
 

SingularityService/src/test/java/com/hubspot/singularity/scheduler/SingularityTestModule.java

@@ -25,14 +25,16 @@
 import com.google.common.collect.Lists;
 import com.google.common.net.HostAndPort;
 import com.google.inject.Binder;
+import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Module;
 import com.google.inject.OutOfScopeException;
 import com.google.inject.Provider;
 import com.google.inject.Scopes;
+import com.google.inject.Stage;
 import com.google.inject.TypeLiteral;
 import com.google.inject.util.Modules;
-import com.hubspot.dropwizard.guicier.DropwizardAwareModule;
+import com.hubspot.dropwizard.guicier.DropwizardModule;
 import com.hubspot.dropwizard.guicier.GuiceBundle;
 import com.hubspot.jackson.datatype.protobuf.ProtobufModule;
 import com.hubspot.mesos.client.SingularityMesosClientModule;
@@ -74,16 +76,21 @@
 import io.dropwizard.setup.Environment;
 import net.kencochrane.raven.Raven;
 
-public class SingularityTestModule extends DropwizardAwareModule<SingularityConfiguration> {
+public class SingularityTestModule implements Module {
   private final TestingServer ts;
-  private final GuiceBundle guiceBundle;
+  private final DropwizardModule dropwizardModule;
+  private final ObjectMapper om = Jackson.newObjectMapper()
+      .setSerializationInclusion(Include.NON_NULL)
+      .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+      .registerModule(new ProtobufModule());
+  private final Environment environment = new Environment("test-env", om, null, new MetricRegistry(), null);
 
   private final boolean useDBTests;
 
   public SingularityTestModule(boolean useDbTests) throws Exception {
     this.useDBTests = useDbTests;
 
-    guiceBundle = GuiceBundle.defaultBuilder(SingularityConfiguration.class).build();
+    dropwizardModule = new DropwizardModule(environment);
 
     LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
     Logger rootLogger = context.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
@@ -96,19 +103,19 @@ public SingularityTestModule(boolean useDbTests) throws Exception {
   }
 
   public Injector getInjector() throws Exception {
-    return guiceBundle.getInjector();
+    return Guice.createInjector(Stage.PRODUCTION, dropwizardModule, this);
   }
 
   public void start() throws Exception {
     // Start all the managed instances in dropwizard.
-    Set<LifeCycle> managedObjects = ImmutableSet.copyOf(getEnvironment().lifecycle().getManagedObjects());
+    Set<LifeCycle> managedObjects = ImmutableSet.copyOf(environment.lifecycle().getManagedObjects());
     for (LifeCycle managed : managedObjects) {
       managed.start();
     }
   }
 
   public void stop() throws Exception {
-    ImmutableSet<LifeCycle> managedObjects = ImmutableSet.copyOf(getEnvironment().lifecycle().getManagedObjects());
+    ImmutableSet<LifeCycle> managedObjects = ImmutableSet.copyOf(environment.lifecycle().getManagedObjects());
     for (LifeCycle managed : Lists.reverse(managedObjects.asList())) {
       managed.stop();
     }
@@ -145,14 +152,7 @@ public void configure(Binder binder) {
             binder.bind(LoadBalancerClient.class).toInstance(tlbc);
             binder.bind(TestingLoadBalancerClient.class).toInstance(tlbc);
 
-            ObjectMapper om = Jackson.newObjectMapper()
-              .setSerializationInclusion(Include.NON_NULL)
-              .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-              .registerModule(new ProtobufModule());
-
             binder.bind(ObjectMapper.class).toInstance(om);
-
-            Environment environment = new Environment("test-env", om, null, new MetricRegistry(), null);
             binder.bind(Environment.class).toInstance(environment);
 
             binder.bind(HostAndPort.class).annotatedWith(named(HTTP_HOST_AND_PORT)).toInstance(HostAndPort.fromString("localhost:8080"));
@@ -203,13 +203,13 @@ public void configure(Binder binder) {
     mainBinder.install(new SingularityMesosClientModule());
     mainBinder.install(new SingularityEventModule(configuration));
     mainBinder.install(Modules.override(new SingularityAuthModule(configuration))
-            .with(new Module() {
-              @Override
-              public void configure(Binder binder) {
-                binder.bind(SingularityAuthenticator.class).to(SingularityTestAuthenticator.class);
-                binder.bind(SingularityTestAuthenticator.class).in(Scopes.SINGLETON);
-              }
-            }));
+        .with(new Module() {
+          @Override
+          public void configure(Binder binder) {
+            binder.bind(SingularityAuthenticator.class).to(SingularityTestAuthenticator.class);
+            binder.bind(SingularityTestAuthenticator.class).in(Scopes.SINGLETON);
+          }
+        }));
 
     mainBinder.bind(DeployResource.class);
     mainBinder.bind(RequestResource.class);

pom.xml

@@ -131,7 +131,7 @@
       <dependency>
         <groupId>com.hubspot.jackson</groupId>
         <artifactId>jackson-datatype-protobuf</artifactId>
-        <version>0.9.2</version>
+        <version>0.9.3</version>
       </dependency>
 
       <dependency>
@@ -149,7 +149,7 @@
       <dependency>
         <groupId>com.h2database</groupId>
         <artifactId>h2</artifactId>
-        <version>1.4.187</version>
+        <version>1.4.193</version>
       </dependency>
 
       <dependency>