3.74 of 5: Remove DataKey from DataValue, FileDataResource and XmlDataResource.

This is mostly mechanical, cleaning up the vestigal marks of combining the value and key. The only mildly odd change is making the OverwritableConsumer and NonOverwritableConsumer package visible, for testing purposes.

--
MOS_MIGRATED_REVID=118474980

1 files changed, 4 insertions, 6 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/XmlResourceValues.java b/src/tools/android/java/com/google/devtools/build/android/XmlResourceValues.java
index 3a3e5e3d9e..dc12b84126 100644
--- a/src/tools/android/java/com/google/devtools/build/android/XmlResourceValues.java
+++ b/src/tools/android/java/com/google/devtools/build/android/XmlResourceValues.java
@@ -92,7 +92,6 @@ public class XmlResourceValues {
       XMLEventReader eventReader,
       StartElement start)
       throws XMLStreamException {
-    String styleableName = getElementName(start);
     List<String> members = new ArrayList<>();
     for (XMLEvent element = eventReader.nextTag();
         !isEndTag(element, TAG_DECLARE_STYLEABLE);
@@ -100,15 +99,14 @@ public class XmlResourceValues {
       if (isStartTag(element, TAG_ATTR)) {
         StartElement attr = element.asStartElement();
         members.add(getElementName(attr));
-        String attrName = getElementName(attr);
-        FullyQualifiedName fqn = fqnFactory.create(ResourceType.ATTR, attrName);
         overwritingConsumer.consume(
-            fqn, XmlDataResource.of(fqn, path, parseAttr(eventReader, start)));
+            fqnFactory.create(ResourceType.ATTR, getElementName(attr)),
+            XmlDataResource.of(path, parseAttr(eventReader, start)));
       }
     }
-    FullyQualifiedName fqn = fqnFactory.create(ResourceType.STYLEABLE, styleableName);
     nonOverwritingConsumer.consume(
-        fqn, XmlDataResource.of(fqn, path, StyleableXmlResourceValue.of(members)));
+        fqnFactory.create(ResourceType.STYLEABLE, getElementName(start)),
+        XmlDataResource.of(path, StyleableXmlResourceValue.of(members)));
   }
 
   static XmlResourceValue parseAttr(XMLEventReader eventReader, StartElement start)