Temporarily restore break to dev against

palantir · Jul 3, 2019 · 7f70265 · 7f70265
1 parent bcb9f96
commit 7f70265
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/...er-compose-rule-core/src/main/java/com/palantir/docker/compose/CustomImmutablesStyle.java b/...er-compose-rule-core/src/main/java/com/palantir/docker/compose/CustomImmutablesStyle.java
@@ -20,5 +20,5 @@
 import org.immutables.value.Value.Style;
 
 @Target({ElementType.PACKAGE, ElementType.TYPE})
-@Style(depluralize = true, strictBuilder = true)
+@Style(depluralize = true, strictBuilder = true, overshadowImplementation = true)
 @interface CustomImmutablesStyle {}
diff --git a/docker-compose-rule-junit4/src/main/java/com/palantir/docker/compose/DockerComposeRule.java b/docker-compose-rule-junit4/src/main/java/com/palantir/docker/compose/DockerComposeRule.java
@@ -303,6 +303,11 @@ public Builder waitingForHostNetworkedPort(int port, HealthCheck<DockerPort> hea
         public Builder clusterWaits(Iterable<? extends ClusterWait> elements) {
             return addAllClusterWaits(elements);
         }
+
+        @Override
+        public DockerComposeRule build() {
+            return super.build();
+        }
     }
 
 }
diff --git a/...ompose-rule-junit4/src/test/java/com/palantir/docker/compose/DockerComposeRuleShould.java b/...ompose-rule-junit4/src/test/java/com/palantir/docker/compose/DockerComposeRuleShould.java
@@ -86,7 +86,7 @@ public class DockerComposeRuleShould {
     private DockerComposeFiles mockFiles = mock(DockerComposeFiles.class);
     private DockerMachine machine = mock(DockerMachine.class);
     private LogCollector logCollector = mock(LogCollector.class);
-    private ImmutableDockerComposeRule rule;
+    private DockerComposeRule rule;
 
     @Before public void
     setup() {