From 564940d73ab135f2dd0573623b8934ed1cd7b9d1 Mon Sep 17 00:00:00 2001 From: Greg Estren Date: Tue, 14 Feb 2017 21:30:29 +0000 Subject: Remove type checking requirement from AttributeMap.has. This overrides the traditional has(String name, Type<>T> type) with has(String name) and removes the type check outright from isConfigurable. Ideally we'd remove the old version in this same change. But there are enough uses of it that that's not a risk-free change and is safer as followup changes. -- PiperOrigin-RevId: 147513593 MOS_MIGRATED_REVID=147513593 --- .../build/lib/packages/DelegatingAttributeMapper.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/packages/DelegatingAttributeMapper.java') diff --git a/src/main/java/com/google/devtools/build/lib/packages/DelegatingAttributeMapper.java b/src/main/java/com/google/devtools/build/lib/packages/DelegatingAttributeMapper.java index e57476c551..3f0d2b0eef 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/DelegatingAttributeMapper.java +++ b/src/main/java/com/google/devtools/build/lib/packages/DelegatingAttributeMapper.java @@ -46,8 +46,8 @@ public class DelegatingAttributeMapper implements AttributeMap { } @Override - public boolean isConfigurable(String attributeName, Type type) { - return delegate.isConfigurable(attributeName, type); + public boolean isConfigurable(String attributeName) { + return delegate.isConfigurable(attributeName); } @Override @@ -98,7 +98,12 @@ public class DelegatingAttributeMapper implements AttributeMap { } @Override - public boolean has(String attrName, Type type) { + public boolean has(String attrName) { + return delegate.has(attrName); + } + + @Override + public boolean has(String attrName, Type type) { return delegate.has(attrName, type); } } -- cgit v1.2.3