diff options
author | 2017-10-19 18:22:00 +0200 | |
---|---|---|
committer | 2017-10-20 14:04:05 +0200 | |
commit | db07436b0112e2aea5e543066d4cdb387536ce7f (patch) | |
tree | df3ce91cd2d26ea947635263bef9d5e299c8b0e2 /src/test/java/com | |
parent | db6e13b2e2bf1f5eb52909381bce65a099278e12 (diff) |
Change the KeyValueConsumer to extend BiConsumer for improved consumer usage.
RELNOTES: None
PiperOrigin-RevId: 172754760
Diffstat (limited to 'src/test/java/com')
3 files changed, 8 insertions, 8 deletions
diff --git a/src/test/java/com/google/devtools/build/android/AndroidDataSerializerAndDeserializerTest.java b/src/test/java/com/google/devtools/build/android/AndroidDataSerializerAndDeserializerTest.java index 198e5a0112..0afaf0cfa5 100644 --- a/src/test/java/com/google/devtools/build/android/AndroidDataSerializerAndDeserializerTest.java +++ b/src/test/java/com/google/devtools/build/android/AndroidDataSerializerAndDeserializerTest.java @@ -282,7 +282,7 @@ public class AndroidDataSerializerAndDeserializerTest { } @Override - public void consume(DataKey key, T value) { + public void accept(DataKey key, T value) { target.put(key, value); } diff --git a/src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java b/src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java index f873f36768..ee04e88a09 100644 --- a/src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java +++ b/src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java @@ -1376,7 +1376,7 @@ public class DataResourceXmlTest { } @Override - public void consume(DataKey key, DataResource value) { + public void accept(DataKey key, DataResource value) { target.put(key, value); } } diff --git a/src/test/java/com/google/devtools/build/android/ParsedAndroidDataBuilder.java b/src/test/java/com/google/devtools/build/android/ParsedAndroidDataBuilder.java index 19710f7e35..21e79dae94 100644 --- a/src/test/java/com/google/devtools/build/android/ParsedAndroidDataBuilder.java +++ b/src/test/java/com/google/devtools/build/android/ParsedAndroidDataBuilder.java @@ -148,12 +148,12 @@ public class ParsedAndroidDataBuilder { @Nullable Factory factory, @Nullable Path root, KeyValueConsumer<DataKey, DataResource> consumer) { - consumer.consume(factory.parse(rawKey), DataValueFile.of(source)); + consumer.accept(factory.parse(rawKey), DataValueFile.of(source)); } @Override void accept(@Nullable Path defaultRoot, KeyValueConsumer<DataKey, DataAsset> target) { - target.consume( + target.accept( RelativeAssetPath.Factory.of(chooseRoot(defaultRoot).resolve("assets")) .create(source.getPath()), DataValueFile.of(source)); @@ -169,7 +169,7 @@ public class ParsedAndroidDataBuilder { Path defaultRoot, KeyValueConsumer<DataKey, DataResource> consumer) { Path res = chooseRoot(defaultRoot).resolve("res"); - consumer.consume(factory.parse(rawKey), DataValueFile.of(res.resolve(path))); + consumer.accept(factory.parse(rawKey), DataValueFile.of(res.resolve(path))); } @Override @@ -177,7 +177,7 @@ public class ParsedAndroidDataBuilder { @Nullable Path defaultRoot, KeyValueConsumer<DataKey, DataAsset> consumer) { Path assets = chooseRoot(defaultRoot).resolve("assets"); Path fullPath = assets.resolve(path); - consumer.consume( + consumer.accept( RelativeAssetPath.Factory.of(assets).create(fullPath), DataValueFile.of(fullPath)); } }; @@ -209,7 +209,7 @@ public class ParsedAndroidDataBuilder { Path defaultRoot, KeyValueConsumer<DataKey, DataResource> consumer) { Path res = (root == null ? defaultRoot : root).resolve("res"); - consumer.consume( + consumer.accept( factory.parse(rawFqn), DataResourceXml.createWithNamespaces( res.resolve(path), value, Namespaces.from(prefixToUri))); @@ -229,7 +229,7 @@ public class ParsedAndroidDataBuilder { FullyQualifiedName.Factory factory, Path defaultRoot, KeyValueConsumer<DataKey, DataResource> consumer) { - consumer.consume( + consumer.accept( factory.parse(rawFqn), DataResourceXml.createWithNamespaces( dataSource, value, Namespaces.from(prefixToUri))); |