address feedback

Author: tinder-maxwellelliott

src/main/java/com/bazel_diff/BazelClient.java

@@ -20,7 +20,7 @@
 
 interface BazelClient {
     List<BazelTarget> queryAllTargets() throws IOException;
-    Set<String> queryForImpactedTargets(Set<String> impactedTargets, String avoidQuery, Boolean hashAllTargets) throws IOException;
+    Set<String> queryForImpactedTargets(Set<String> impactedTargets, String avoidQuery) throws IOException;
     Set<BazelSourceFileTarget> convertFilepathsToSourceTargets(Set<Path> filepaths) throws IOException, NoSuchAlgorithmException;
     Set<BazelSourceFileTarget> queryAllSourcefileTargets() throws IOException, NoSuchAlgorithmException;
 }
@@ -47,17 +47,12 @@ public List<BazelTarget> queryAllTargets() throws IOException {
     }
 
     @Override
-    public Set<String> queryForImpactedTargets(Set<String> impactedTargets, String avoidQuery, Boolean hashAllTargets) throws IOException {
+    public Set<String> queryForImpactedTargets(Set<String> impactedTargets, String avoidQuery) throws IOException {
         Set<String> impactedTargetNames = new HashSet<>();
         String targetQuery = impactedTargets.stream()
                                             .map(target -> String.format("'%s'", target))
                                             .collect(Collectors.joining(" + "));
-        String query = "";
-        if (hashAllTargets != null && hashAllTargets) {
-            query = targetQuery;
-        } else {
-            query = String.format("rdeps(//... except '//external:all-targets', %s)", targetQuery);
-        }
+        String query = query = String.format("rdeps(//... except '//external:all-targets', %s)", targetQuery);
         if (avoidQuery != null) {
             query = String.format("(%s) except (%s)", query, avoidQuery);
         }

src/main/java/com/bazel_diff/TargetHashingClient.java

@@ -46,7 +46,10 @@ public Set<String> getImpactedTargets(
                 impactedTargets.add(entry.getKey());
             }
         }
-        return bazelClient.queryForImpactedTargets(impactedTargets, avoidQuery, hashAllTargets);
+        if (hashAllTargets != null && hashAllTargets && avoidQuery == null) {
+            return impactedTargets;
+        }
+        return bazelClient.queryForImpactedTargets(impactedTargets, avoidQuery);
     }
 
     private byte[] createDigestForTarget(

test/java/com/bazel_diff/TargetHashingClientImplTests.java

@@ -118,7 +118,7 @@ public void hashAllBazelTargets_sourceTargets_modifiedSources() throws IOExcepti
 
     @Test
     public void getImpactedTargets() throws IOException {
-        when(bazelClientMock.queryForImpactedTargets(anySet(), anyObject(), Matchers.eq(false))).thenReturn(
+        when(bazelClientMock.queryForImpactedTargets(anySet(), anyObject())).thenReturn(
                 new HashSet<>(Arrays.asList("rule1", "rule3"))
         );
         TargetHashingClientImpl client = new TargetHashingClientImpl(bazelClientMock);
@@ -138,7 +138,7 @@ public void getImpactedTargets() throws IOException {
 
     @Test
     public void getImpactedTargets_withAvoidQuery() throws IOException {
-        when(bazelClientMock.queryForImpactedTargets(anySet(), eq("some_query"), Matchers.eq(false))).thenReturn(
+        when(bazelClientMock.queryForImpactedTargets(anySet(), eq("some_query"))).thenReturn(
                 new HashSet<>(Arrays.asList("rule1"))
         );
         TargetHashingClientImpl client = new TargetHashingClientImpl(bazelClientMock);
@@ -157,7 +157,7 @@ public void getImpactedTargets_withAvoidQuery() throws IOException {
 
     @Test
     public void getImpactedTargets_withHashAllTargets() throws IOException {
-        when(bazelClientMock.queryForImpactedTargets(anySet(), anyObject(), Matchers.eq(true))).thenReturn(
+        when(bazelClientMock.queryForImpactedTargets(anySet(), anyObject())).thenReturn(
                 new HashSet<>(Arrays.asList("rule1"))
         );
         TargetHashingClientImpl client = new TargetHashingClientImpl(bazelClientMock);
@@ -171,12 +171,13 @@ public void getImpactedTargets_withHashAllTargets() throws IOException {
         Set<String> impactedTargets = client.getImpactedTargets(hash1, hash2, null, true);
         Set<String> expectedSet = new HashSet<>();
         expectedSet.add("rule1");
+        expectedSet.add("rule3");
         assertEquals(expectedSet, impactedTargets);
     }
 
     @Test
     public void getImpactedTargets_withHashAllTargets_withAvoidQuery() throws IOException {
-        when(bazelClientMock.queryForImpactedTargets(anySet(), eq("some_query"), Matchers.eq(true))).thenReturn(
+        when(bazelClientMock.queryForImpactedTargets(anySet(), eq("some_query"))).thenReturn(
                 new HashSet<>(Arrays.asList("rule1"))
         );
         TargetHashingClientImpl client = new TargetHashingClientImpl(bazelClientMock);