Small polishing things

bkrieger · Feb 15, 2017 · acbf0f0 · acbf0f0
1 parent cc68899
commit acbf0f0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/AtlasDbFactory.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/AtlasDbFactory.java
@@ -36,7 +36,7 @@ public interface AtlasDbFactory {
  default TimestampStoreInvalidator createTimestampStoreInvalidator(KeyValueService rawKvs) {
  return () -> {
  Logger log = LoggerFactory.getLogger(AtlasDbFactory.class);
- log.warn("AtlasDB doesn't yet support automated migration for KVS type: " + getType() + ".");
+ log.warn("AtlasDB doesn't yet support automated migration for KVS type {}.", getType());
  return NO_OP_FAST_FORWARD_TIMESTAMP;
  };
  }

diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/startup/TimelockMigratorTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/startup/TimelockMigratorTest.java
@@ -77,7 +77,10 @@ public class TimelockMigratorTest {
  @Before
  public void setUp() {
  when(invalidator.backupAndInvalidate()).thenReturn(BACKUP_TIMESTAMP);
- wireMockRule.stubFor(PING_MAPPING.willReturn(aResponse().withStatus(200).withBody("\"pong\"")));
+ wireMockRule.stubFor(PING_MAPPING.willReturn(aResponse()
+ .withStatus(200)
+ .withBody("pong")
+ .withHeader("Content-Type", "text/plain")));
  }
 
  @Test

diff --git a/timestamp-api/src/main/java/com/palantir/timestamp/TimestampManagementService.java b/timestamp-api/src/main/java/com/palantir/timestamp/TimestampManagementService.java
@@ -15,6 +15,8 @@
  */
 package com.palantir.timestamp;
 
+import javax.annotation.CheckReturnValue;
+import javax.annotation.meta.When;
 import javax.ws.rs.DefaultValue;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -49,7 +51,8 @@ void fastForwardTimestamp(
 
  @GET
  @Path("ping")
- @Produces(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.TEXT_PLAIN)
+ @CheckReturnValue(when = When.NEVER)
  default String ping() {
  return "pong";
  }