Extend from an abstract base class to avoid duplication of utility methods in RuleErrorConsumers
RELNOTES: None.
PiperOrigin-RevId: 172387755
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
index e948dd3..94423b6 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
@@ -56,6 +56,7 @@
import com.google.devtools.build.lib.events.Event;
import com.google.devtools.build.lib.events.ExtendedEventHandler.Postable;
import com.google.devtools.build.lib.events.Location;
+import com.google.devtools.build.lib.packages.AbstractRuleErrorConsumer;
import com.google.devtools.build.lib.packages.AspectDescriptor;
import com.google.devtools.build.lib.packages.Attribute;
import com.google.devtools.build.lib.packages.Attribute.ConfigurationTransition;
@@ -1849,10 +1850,9 @@
}
}
- /**
- * Helper class for reporting errors and warnings.
- */
- public static final class ErrorReporter implements RuleErrorConsumer {
+ /** Helper class for reporting errors and warnings. */
+ public static final class ErrorReporter extends AbstractRuleErrorConsumer
+ implements RuleErrorConsumer {
private final AnalysisEnvironment env;
private final Rule rule;
private final String ruleClassNameForLogging;
@@ -1882,30 +1882,10 @@
}
@Override
- public RuleErrorException throwWithRuleError(String message) throws RuleErrorException {
- ruleError(message);
- throw new RuleErrorException();
- }
-
- @Override
- public RuleErrorException throwWithAttributeError(String attrName, String message)
- throws RuleErrorException {
- attributeError(attrName, message);
- throw new RuleErrorException();
- }
-
- @Override
public boolean hasErrors() {
return env.hasErrors();
}
- @Override
- public void assertNoErrors() throws RuleErrorException {
- if (hasErrors()) {
- throw new RuleErrorException();
- }
- }
-
public void reportWarning(Location location, String message) {
env.getEventHandler().handle(Event.warn(location, message));
}
diff --git a/src/main/java/com/google/devtools/build/lib/packages/AbstractRuleErrorConsumer.java b/src/main/java/com/google/devtools/build/lib/packages/AbstractRuleErrorConsumer.java
new file mode 100644
index 0000000..df039d5
--- /dev/null
+++ b/src/main/java/com/google/devtools/build/lib/packages/AbstractRuleErrorConsumer.java
@@ -0,0 +1,41 @@
+// Copyright 2017 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.devtools.build.lib.packages;
+
+import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException;
+
+/** Defines several helper methods to avoid duplication between {@link RuleErrorConsumer}s. */
+public abstract class AbstractRuleErrorConsumer implements RuleErrorConsumer {
+
+ @Override
+ public RuleErrorException throwWithRuleError(String message) throws RuleErrorException {
+ ruleError(message);
+ throw new RuleErrorException();
+ }
+
+ @Override
+ public RuleErrorException throwWithAttributeError(String attrName, String message)
+ throws RuleErrorException {
+ attributeError(attrName, message);
+ throw new RuleErrorException();
+ }
+
+ @Override
+ public void assertNoErrors() throws RuleErrorException {
+ if (hasErrors()) {
+ throw new RuleErrorException();
+ }
+ }
+}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/LocationExpanderTest.java b/src/test/java/com/google/devtools/build/lib/analysis/LocationExpanderTest.java
index a60cd7c..7fe4066 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/LocationExpanderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/LocationExpanderTest.java
@@ -16,7 +16,7 @@
import static com.google.common.truth.Truth.assertThat;
-import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException;
+import com.google.devtools.build.lib.packages.AbstractRuleErrorConsumer;
import com.google.devtools.build.lib.packages.RuleErrorConsumer;
import java.util.ArrayList;
import java.util.List;
@@ -27,7 +27,8 @@
/** Unit tests for {@link LocationExpander}. */
@RunWith(JUnit4.class)
public class LocationExpanderTest {
- private static final class Capture implements RuleErrorConsumer {
+ private static final class Capture extends AbstractRuleErrorConsumer
+ implements RuleErrorConsumer {
private final List<String> warnsOrErrors = new ArrayList<>();
@Override
@@ -51,29 +52,9 @@
}
@Override
- public RuleErrorException throwWithRuleError(String message) throws RuleErrorException {
- ruleError(message);
- throw new RuleErrorException();
- }
-
- @Override
- public RuleErrorException throwWithAttributeError(String attrName, String message)
- throws RuleErrorException {
- attributeError(attrName, message);
- throw new RuleErrorException();
- }
-
- @Override
public boolean hasErrors() {
return !warnsOrErrors.isEmpty();
}
-
- @Override
- public void assertNoErrors() throws RuleErrorException {
- if (hasErrors()) {
- throw new RuleErrorException();
- }
- }
}
private LocationExpander makeExpander(RuleErrorConsumer ruleErrorConsumer) throws Exception {
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/ResourceTestBase.java b/src/test/java/com/google/devtools/build/lib/rules/android/ResourceTestBase.java
index cd1992d..c15216a 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/ResourceTestBase.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/ResourceTestBase.java
@@ -24,7 +24,7 @@
import com.google.devtools.build.lib.actions.Root;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
-import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException;
+import com.google.devtools.build.lib.packages.AbstractRuleErrorConsumer;
import com.google.devtools.build.lib.packages.RuleErrorConsumer;
import com.google.devtools.build.lib.vfs.FileSystem;
import com.google.devtools.build.lib.vfs.Path;
@@ -49,7 +49,8 @@
};
/** A faked {@link RuleErrorConsumer} that validates that only expected errors were reported. */
- public static final class FakeRuleErrorConsumer implements RuleErrorConsumer {
+ public static final class FakeRuleErrorConsumer extends AbstractRuleErrorConsumer
+ implements RuleErrorConsumer {
private String ruleErrorMessage = null;
private String attributeErrorAttribute = null;
private String attributeErrorMessage = null;
@@ -82,30 +83,10 @@
}
@Override
- public RuleErrorException throwWithRuleError(String message) throws RuleErrorException {
- ruleError(message);
- throw new RuleErrorException();
- }
-
- @Override
- public RuleErrorException throwWithAttributeError(String attrName, String message)
- throws RuleErrorException {
- attributeError(attrName, message);
- throw new RuleErrorException();
- }
-
- @Override
public boolean hasErrors() {
return ruleErrorMessage != null || attributeErrorMessage != null;
}
- @Override
- public void assertNoErrors() throws RuleErrorException {
- if (hasErrors()) {
- throw new RuleErrorException();
- }
- }
-
public Collection<String> getAndClearRuleWarnings() {
Collection<String> warnings = ImmutableList.copyOf(ruleWarnings);
ruleWarnings.clear();
