From 42fd2bc8c692db04c220b8ed128c90373a201134 Mon Sep 17 00:00:00 2001
From: Roy Williams <royw@fb.com>
Date: Mon, 7 Apr 2014 09:33:07 -0700
Subject: [PATCH] Fix findbugs perf issues

Summary: perf issues flagged by findbugs

Test Plan: Unit Tests
---
 findbugsfilter.xml                                  | 7 +++++++
 src/com/facebook/buck/apple/clang/HeaderMap.java    | 2 +-
 src/com/facebook/buck/cli/TargetsCommand.java       | 9 ++++-----
 src/com/facebook/buck/test/XmlTestResultParser.java | 2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 findbugsfilter.xml

diff --git a/findbugsfilter.xml b/findbugsfilter.xml
new file mode 100644
index 00000000000..7ad2ffbd895
--- /dev/null
+++ b/findbugsfilter.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<FindBugsFilter>
+  <Match classregex=".*ApkDescription$">
+      <BugCode name="OS"/>
+  </Match>
+</FindBugsFilter>
diff --git a/src/com/facebook/buck/apple/clang/HeaderMap.java b/src/com/facebook/buck/apple/clang/HeaderMap.java
index 4050a158428..b67d24d3307 100644
--- a/src/com/facebook/buck/apple/clang/HeaderMap.java
+++ b/src/com/facebook/buck/apple/clang/HeaderMap.java
@@ -454,7 +454,7 @@ private int addString(String str) {
     }
     putStringByte((byte) 0);
 
-    addedStrings.put(str, new Integer(offset));
+    addedStrings.put(str, offset);
     return offset;
   }
 }
diff --git a/src/com/facebook/buck/cli/TargetsCommand.java b/src/com/facebook/buck/cli/TargetsCommand.java
index 5d05c6b4765..5278e0ee88d 100644
--- a/src/com/facebook/buck/cli/TargetsCommand.java
+++ b/src/com/facebook/buck/cli/TargetsCommand.java
@@ -210,11 +210,10 @@ private void printJsonForTargetsInternal(
     getStdOut().println("[");
 
     ObjectMapper mapper = new ObjectMapper();
-    Iterator<String> keySetIterator = buildIndex.keySet().iterator();
+    Iterator<BuildRule> valueIterator = buildIndex.values().iterator();
 
-    while (keySetIterator.hasNext()) {
-      String key = keySetIterator.next();
-      BuildRule buildRule = buildIndex.get(key);
+    while (valueIterator.hasNext()) {
+      BuildRule buildRule = valueIterator.next();
       BuildTarget buildTarget = buildRule.getBuildTarget();
 
       List<Map<String, Object>> rules;
@@ -273,7 +272,7 @@ private void printJsonForTargetsInternal(
         throw Throwables.propagate(e);
       }
       String output = stringWriter.getBuffer().toString();
-      if (keySetIterator.hasNext()) {
+      if (valueIterator.hasNext()) {
         output += ",";
       }
       getStdOut().println(output);
diff --git a/src/com/facebook/buck/test/XmlTestResultParser.java b/src/com/facebook/buck/test/XmlTestResultParser.java
index 9cdbcc920bf..009200a4f5d 100644
--- a/src/com/facebook/buck/test/XmlTestResultParser.java
+++ b/src/com/facebook/buck/test/XmlTestResultParser.java
@@ -62,7 +62,7 @@ private static TestCaseSummary doParse(String xml) throws IOException {
     for (int i = 0; i < testElements.getLength(); i++) {
       Element node = (Element)testElements.item(i);
       String testName = node.getAttribute("name");
-      long time = Long.valueOf(node.getAttribute("time"));
+      long time = Long.parseLong(node.getAttribute("time"));
       String typeString = node.getAttribute("type");
       ResultType type = ResultType.valueOf(typeString);