diff --git a/examples/android_hello/gradle_report.json b/examples/android_hello/gradle_report.json
index 7fb6a6a24..0f3b2137e 100644
--- a/examples/android_hello/gradle_report.json
+++ b/examples/android_hello/gradle_report.json
@@ -1,12 +1,12 @@
 [
   {
-    "procedure": "void MainActivity.onCreate(Bundle)",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "app/src/main/java/infer/inferandroidexample/MainActivity.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void MainActivity.onCreate(Bundle)"
   },
   {
-    "procedure": "void MainActivity.writeToFile()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "app/src/main/java/infer/inferandroidexample/MainActivity.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void MainActivity.writeToFile()"
   }
 ]
\ No newline at end of file
diff --git a/infer/lib/python/BuckAnalyze b/infer/lib/python/BuckAnalyze
index c4dfe1d3f..0b55db77c 100755
--- a/infer/lib/python/BuckAnalyze
+++ b/infer/lib/python/BuckAnalyze
@@ -258,13 +258,12 @@ def get_buck_stats():
     SUCCESS_STATUS = 'success_type'
     buck_stats = {}
     try:
-        with open(trace_filename, 'r') as file_in:
-            trace = json.load(file_in)
-            for t in trace:
-                if SUCCESS_STATUS in t[ARGS]:
-                    status = t[ARGS][SUCCESS_STATUS]
-                    count = buck_stats.get(status, 0)
-                    buck_stats[status] = count + 1
+        trace = utils.load_json_from_path(trace_filename)
+        for t in trace:
+            if SUCCESS_STATUS in t[ARGS]:
+                status = t[ARGS][SUCCESS_STATUS]
+                count = buck_stats.get(status, 0)
+                buck_stats[status] = count + 1
 
         buck_stats_message = 'Buck build statistics:\n\n'
         for key, value in sorted(buck_stats.items()):
diff --git a/infer/lib/python/infer b/infer/lib/python/infer
index 351aa5647..e6d436ac5 100755
--- a/infer/lib/python/infer
+++ b/infer/lib/python/infer
@@ -170,11 +170,9 @@ def main():
         bugs_filename = os.path.join(args.infer_out,
                                      config.JSON_REPORT_FILENAME)
         try:
-            with codecs.open(bugs_filename, 'r',
-                             encoding=config.LOCALE) as bugs_file:
-                bugs = json.load(bugs_file)
-                if len(bugs) > 0:
-                    sys.exit(config.BUG_FOUND_ERROR_CODE)
+            bugs = utils.load_json_from_path(bugs_filename)
+            if len(bugs) > 0:
+                sys.exit(config.BUG_FOUND_ERROR_CODE)
         except OSError:
             pass
 
diff --git a/infer/lib/python/inferTraceBugs b/infer/lib/python/inferTraceBugs
index 58c651ccb..bca400a8a 100755
--- a/infer/lib/python/inferTraceBugs
+++ b/infer/lib/python/inferTraceBugs
@@ -376,9 +376,7 @@ def main():
     args = base_parser.parse_args()
 
     report_filename = os.path.join(args.infer_out, config.JSON_REPORT_FILENAME)
-    with codecs.open(report_filename, 'r',
-                     encoding=config.LOCALE) as report_file:
-        reports = json.load(report_file)
+    reports = utils.load_json_from_path(report_filename)
 
     if args.html:
         generate_html_report(args, reports)
diff --git a/infer/lib/python/inferlib/analyze.py b/infer/lib/python/inferlib/analyze.py
index d2c9d7ad2..aac497d7e 100644
--- a/infer/lib/python/inferlib/analyze.py
+++ b/infer/lib/python/inferlib/analyze.py
@@ -515,10 +515,8 @@ class Infer:
 
         # capture and compile mode do not create proc_stats.json
         if os.path.isfile(proc_stats_path):
-            with codecs.open(proc_stats_path, 'r',
-                             encoding=config.LOCALE) as proc_stats_file:
-                proc_stats = json.load(proc_stats_file)
-                self.stats['int'].update(proc_stats)
+            proc_stats = utils.load_json_from_path(proc_stats_path)
+            self.stats['int'].update(proc_stats)
 
     def save_stats(self):
         """Print timing information to infer_out/stats.json"""
diff --git a/infer/lib/python/inferlib/issues.py b/infer/lib/python/inferlib/issues.py
index f45c95bcb..46f5c957b 100644
--- a/infer/lib/python/inferlib/issues.py
+++ b/infer/lib/python/inferlib/issues.py
@@ -121,20 +121,18 @@ def clean_csv(args, csv_report):
 
 
 def clean_json(args, json_report):
-    collected_rows = []
-    with open(json_report, 'r') as file_in:
-        rows = json.load(file_in)
-        for row in rows:
-            filename = row[JSON_INDEX_FILENAME]
-            if os.path.isfile(filename):
-                if args.no_filtering \
-                   or _should_report_json(args.analyzer, row):
-                    collected_rows.append(row)
-        collected_rows = sorted(
-            collected_rows,
-            cmp=_compare_json_rows)
+    rows = utils.load_json_from_path(json_report)
+
+    def is_clean(row):
+        filename = row[JSON_INDEX_FILENAME]
+        return (os.path.isfile(filename) and
+                (args.no_filtering or
+                 _should_report_json(args.analyzer, row)))
+
+    rows = filter(is_clean, rows)
+    rows.sort(cmp=_compare_json_rows)
     temporary_file = tempfile.mktemp()
-    utils.dump_json_to_path(collected_rows, temporary_file)
+    utils.dump_json_to_path(rows, temporary_file)
     shutil.move(temporary_file, json_report)
 
 
diff --git a/infer/lib/python/inferlib/utils.py b/infer/lib/python/inferlib/utils.py
index f6f332eb8..cc9ee4f72 100644
--- a/infer/lib/python/inferlib/utils.py
+++ b/infer/lib/python/inferlib/utils.py
@@ -128,6 +128,11 @@ def run_command(cmd, debug_mode, infer_out, message, env=os.environ):
         raise e
 
 
+def load_json_from_path(path):
+    with codecs.open(path, 'r', encoding=config.LOCALE) as file_in:
+        return json.load(file_in, encoding=config.LOCALE)
+
+
 def dump_json_to_path(
         data, path,
         skipkeys=False, ensure_ascii=True, check_circular=True, allow_nan=True,
@@ -143,11 +148,9 @@ def dump_json_to_path(
 
 
 def merge_json_arrays_from_files(report_paths):
-    # TODO: use streams instead of loading the entire json in memory
     json_data = []
     for json_path in report_paths:
-        with codecs.open(json_path, 'r', encoding=config.LOCALE) as fd:
-            json_data = json_data + json.loads(fd.read())
+        json_data.extend(load_json_from_path(json_path))
     return json_data
 
 
diff --git a/infer/tests/ant_report.json b/infer/tests/ant_report.json
index 26c58a2ae..77b0469a5 100644
--- a/infer/tests/ant_report.json
+++ b/infer/tests/ant_report.json
@@ -1,662 +1,662 @@
 [
   {
-    "procedure": "void ContextLeaks.directLeak()",
+    "bug_type": "CONTEXT_LEAK",
     "file": "codetoanalyze/java/infer/ContextLeaks.java",
-    "bug_type": "CONTEXT_LEAK"
+    "procedure": "void ContextLeaks.directLeak()"
   },
   {
-    "procedure": "void ContextLeaks.indirectHandlerLeak()",
+    "bug_type": "CONTEXT_LEAK",
     "file": "codetoanalyze/java/infer/ContextLeaks.java",
-    "bug_type": "CONTEXT_LEAK"
+    "procedure": "void ContextLeaks.indirectHandlerLeak()"
   },
   {
-    "procedure": "void ContextLeaks.indirectLeak()",
+    "bug_type": "CONTEXT_LEAK",
     "file": "codetoanalyze/java/infer/ContextLeaks.java",
-    "bug_type": "CONTEXT_LEAK"
+    "procedure": "void ContextLeaks.indirectLeak()"
   },
   {
-    "procedure": "void ContextLeaks.leakAfterInstanceFieldWrite()",
+    "bug_type": "CONTEXT_LEAK",
     "file": "codetoanalyze/java/infer/ContextLeaks.java",
-    "bug_type": "CONTEXT_LEAK"
+    "procedure": "void ContextLeaks.leakAfterInstanceFieldWrite()"
   },
   {
-    "procedure": "void ContextLeaks.nonStaticInnerClassLeak()",
+    "bug_type": "CONTEXT_LEAK",
     "file": "codetoanalyze/java/infer/ContextLeaks.java",
-    "bug_type": "CONTEXT_LEAK"
+    "procedure": "void ContextLeaks.nonStaticInnerClassLeak()"
   },
   {
-    "procedure": "ContextLeaks$Singleton ContextLeaks.singletonLeak()",
+    "bug_type": "CONTEXT_LEAK",
     "file": "codetoanalyze/java/infer/ContextLeaks.java",
-    "bug_type": "CONTEXT_LEAK"
+    "procedure": "ContextLeaks$Singleton ContextLeaks.singletonLeak()"
   },
   {
-    "procedure": "InputStream TaintExample.socketIgnoreExceptionNoVerify(SSLSocketFactory)",
+    "bug_type": "TAINTED_VALUE_REACHING_SENSITIVE_FUNCTION",
     "file": "codetoanalyze/java/infer/TaintExample.java",
-    "bug_type": "TAINTED_VALUE_REACHING_SENSITIVE_FUNCTION"
+    "procedure": "InputStream TaintExample.socketIgnoreExceptionNoVerify(SSLSocketFactory)"
   },
   {
-    "procedure": "InputStream TaintExample.socketNotVerifiedSimple(SSLSocketFactory)",
+    "bug_type": "TAINTED_VALUE_REACHING_SENSITIVE_FUNCTION",
     "file": "codetoanalyze/java/infer/TaintExample.java",
-    "bug_type": "TAINTED_VALUE_REACHING_SENSITIVE_FUNCTION"
+    "procedure": "InputStream TaintExample.socketNotVerifiedSimple(SSLSocketFactory)"
   },
   {
-    "procedure": "InputStream TaintExample.socketVerifiedForgotToCheckRetval(SSLSocketFactory,HostnameVerifier,SSLSession)",
+    "bug_type": "TAINTED_VALUE_REACHING_SENSITIVE_FUNCTION",
     "file": "codetoanalyze/java/infer/TaintExample.java",
-    "bug_type": "TAINTED_VALUE_REACHING_SENSITIVE_FUNCTION"
+    "procedure": "InputStream TaintExample.socketVerifiedForgotToCheckRetval(SSLSocketFactory,HostnameVerifier,SSLSession)"
   },
   {
-    "procedure": "InputStream TaintExample.taintingShouldNotPreventInference(SSLSocketFactory)",
+    "bug_type": "TAINTED_VALUE_REACHING_SENSITIVE_FUNCTION",
     "file": "codetoanalyze/java/infer/TaintExample.java",
-    "bug_type": "TAINTED_VALUE_REACHING_SENSITIVE_FUNCTION"
+    "procedure": "InputStream TaintExample.taintingShouldNotPreventInference(SSLSocketFactory)"
   },
   {
-    "procedure": "int NullPointerExceptions.NPEvalueOfFromHashmapBad(HashMap,int)",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "int NullPointerExceptions.NPEvalueOfFromHashmapBad(HashMap,int)"
   },
   {
-    "procedure": "void ResourceLeaks.activityObtainTypedArrayAndLeak(Activity)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.activityObtainTypedArrayAndLeak(Activity)"
   },
   {
-    "procedure": "void NullPointerExceptions.badCheckShouldCauseNPE()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.badCheckShouldCauseNPE()"
   },
   {
-    "procedure": "void FilterInputStreamLeaks.bufferedInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/FilterInputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterInputStreamLeaks.bufferedInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void FilterOutputStreamLeaks.bufferedOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/FilterOutputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterOutputStreamLeaks.bufferedOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "void ReaderLeaks.bufferedReaderNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ReaderLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ReaderLeaks.bufferedReaderNotClosedAfterRead()"
   },
   {
-    "procedure": "void WriterLeaks.bufferedWriterNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/WriterLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void WriterLeaks.bufferedWriterNotClosedAfterWrite()"
   },
   {
-    "procedure": "void FilterInputStreamLeaks.checkedInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/FilterInputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterInputStreamLeaks.checkedInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void FilterOutputStreamLeaks.checkedOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/FilterOutputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterOutputStreamLeaks.checkedOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "void FilterInputStreamLeaks.cipherInputStreamNotClosedAfterSkip()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/FilterInputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterInputStreamLeaks.cipherInputStreamNotClosedAfterSkip()"
   },
   {
-    "procedure": "void FilterOutputStreamLeaks.cipherOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/FilterOutputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterOutputStreamLeaks.cipherOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "int CursorLeaks.completeDownloadNotClosed(DownloadManager)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/CursorLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "int CursorLeaks.completeDownloadNotClosed(DownloadManager)"
   },
   {
-    "procedure": "void ResourceLeaks.contextObtainTypedArrayAndLeak(Context)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.contextObtainTypedArrayAndLeak(Context)"
   },
   {
-    "procedure": "void ResourceLeaks.copyFileLeak(File,File)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.copyFileLeak(File,File)"
   },
   {
-    "procedure": "void ResourceLeaks.copyFileLeak(File,File)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.copyFileLeak(File,File)"
   },
   {
-    "procedure": "void NullPointerExceptions.cursorFromContentResolverNPE(String)",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.cursorFromContentResolverNPE(String)"
   },
   {
-    "procedure": "int CursorLeaks.cursorNotClosed(SQLiteDatabase)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/CursorLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "int CursorLeaks.cursorNotClosed(SQLiteDatabase)"
   },
   {
-    "procedure": "void FilterInputStreamLeaks.dataInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/FilterInputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterInputStreamLeaks.dataInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void FilterOutputStreamLeaks.dataOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/FilterOutputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterOutputStreamLeaks.dataOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "void FilterInputStreamLeaks.deflaterInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/FilterInputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterInputStreamLeaks.deflaterInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void ResourceLeaks.deflaterLeak()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.deflaterLeak()"
   },
   {
-    "procedure": "void FilterOutputStreamLeaks.deflaterOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/FilterOutputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterOutputStreamLeaks.deflaterOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "void NullPointerExceptions.derefNull()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.derefNull()"
   },
   {
-    "procedure": "void NullPointerExceptions.derefNullableGetter()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.derefNullableGetter()"
   },
   {
-    "procedure": "void FilterInputStreamLeaks.digestInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/FilterInputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterInputStreamLeaks.digestInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void FilterOutputStreamLeaks.digestOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/FilterOutputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterOutputStreamLeaks.digestOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "void Builtins.doNotBlockError(Object)",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/Builtins.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void Builtins.doNotBlockError(Object)"
   },
   {
-    "procedure": "void CloseableAsResourceExample.failToCloseWithCloseQuietly()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/CloseableAsResourceExample.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void CloseableAsResourceExample.failToCloseWithCloseQuietly()"
   },
   {
-    "procedure": "void AnalysisStops.fieldReadInCalleeMayCauseFalseNegative()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/AnalysisStops.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void AnalysisStops.fieldReadInCalleeMayCauseFalseNegative()"
   },
   {
-    "procedure": "void AnalysisStops.fieldReadInCalleeWithAngelicObjFieldMayCauseFalseNegative()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/AnalysisStops.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void AnalysisStops.fieldReadInCalleeWithAngelicObjFieldMayCauseFalseNegative()"
   },
   {
-    "procedure": "void ResourceLeaks.fileInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.fileInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void ResourceLeaks.fileOutputStreamNotClosed()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.fileOutputStreamNotClosed()"
   },
   {
-    "procedure": "void ResourceLeaks.fileOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.fileOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "int ResourceLeaks.fileOutputStreamTwoLeaks(boolean)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "int ResourceLeaks.fileOutputStreamTwoLeaks(boolean)"
   },
   {
-    "procedure": "int ResourceLeaks.fileOutputStreamTwoLeaks(boolean)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "int ResourceLeaks.fileOutputStreamTwoLeaks(boolean)"
   },
   {
-    "procedure": "void ReaderLeaks.fileReaderNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ReaderLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ReaderLeaks.fileReaderNotClosedAfterRead()"
   },
   {
-    "procedure": "void WriterLeaks.fileWriterNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/WriterLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void WriterLeaks.fileWriterNotClosedAfterWrite()"
   },
   {
-    "procedure": "void FilterOutputStreamLeaks.filterOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/FilterOutputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterOutputStreamLeaks.filterOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "int CursorLeaks.getBucketCountNotClosed()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/CursorLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "int CursorLeaks.getBucketCountNotClosed()"
   },
   {
-    "procedure": "int CursorLeaks.getImageCountHelperNotClosed(String)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/CursorLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "int CursorLeaks.getImageCountHelperNotClosed(String)"
   },
   {
-    "procedure": "int HashMapExample.getOneIntegerWithoutCheck()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/HashMapExample.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "int HashMapExample.getOneIntegerWithoutCheck()"
   },
   {
-    "procedure": "void HashMapExample.getTwoIntegersWithOneCheck(Integer,Integer)",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/HashMapExample.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void HashMapExample.getTwoIntegersWithOneCheck(Integer,Integer)"
   },
   {
-    "procedure": "void FilterInputStreamLeaks.gzipInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/FilterInputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterInputStreamLeaks.gzipInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void FilterInputStreamLeaks.gzipInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/FilterInputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterInputStreamLeaks.gzipInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void FilterOutputStreamLeaks.gzipOutputStreamNotClosedAfterFlush()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/FilterOutputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterOutputStreamLeaks.gzipOutputStreamNotClosedAfterFlush()"
   },
   {
-    "procedure": "void FilterOutputStreamLeaks.gzipOutputStreamNotClosedAfterFlush()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/FilterOutputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterOutputStreamLeaks.gzipOutputStreamNotClosedAfterFlush()"
   },
   {
-    "procedure": "String NullPointerExceptions.hashmapNPE(HashMap,Object)",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "String NullPointerExceptions.hashmapNPE(HashMap,Object)"
   },
   {
-    "procedure": "void FilterInputStreamLeaks.inflaterInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/FilterInputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterInputStreamLeaks.inflaterInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void ResourceLeaks.inflaterLeak()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.inflaterLeak()"
   },
   {
-    "procedure": "void FilterOutputStreamLeaks.inflaterOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/FilterOutputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterOutputStreamLeaks.inflaterOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "void ReaderLeaks.inputStreamReaderNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ReaderLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ReaderLeaks.inputStreamReaderNotClosedAfterRead()"
   },
   {
-    "procedure": "boolean ResourceLeaks.jarFileNotClosed()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "boolean ResourceLeaks.jarFileNotClosed()"
   },
   {
-    "procedure": "void ResourceLeaks.jarInputStreamLeak()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.jarInputStreamLeak()"
   },
   {
-    "procedure": "void ResourceLeaks.jarOutputStreamLeak()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.jarOutputStreamLeak()"
   },
   {
-    "procedure": "void CursorLeaks.loadPrefsFromContentProviderNotClosed()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/CursorLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void CursorLeaks.loadPrefsFromContentProviderNotClosed()"
   },
   {
-    "procedure": "void ResourceLeaks.nestedBad1()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.nestedBad1()"
   },
   {
-    "procedure": "void ResourceLeaks.nestedBad2()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.nestedBad2()"
   },
   {
-    "procedure": "void ResourceLeaks.nestedBadJarInputStream(File)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.nestedBadJarInputStream(File)"
   },
   {
-    "procedure": "void ResourceLeaks.nestedBadJarOutputStream()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.nestedBadJarOutputStream()"
   },
   {
-    "procedure": "void CloseableAsResourceExample.notClosingCloseable()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/CloseableAsResourceExample.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void CloseableAsResourceExample.notClosingCloseable()"
   },
   {
-    "procedure": "void CloseableAsResourceExample.notClosingWrapper()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/CloseableAsResourceExample.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void CloseableAsResourceExample.notClosingWrapper()"
   },
   {
-    "procedure": "void AutoGenerated.npe()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/AutoGenerated.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void AutoGenerated.npe()"
   },
   {
-    "procedure": "void NullPointerExceptions$$$Class$Name$With$Dollars.npeWithDollars()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions$$$Class$Name$With$Dollars.npeWithDollars()"
   },
   {
-    "procedure": "int NullPointerExceptions.nullListFiles(String)",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "int NullPointerExceptions.nullListFiles(String)"
   },
   {
-    "procedure": "int NullPointerExceptions.nullPointerException()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "int NullPointerExceptions.nullPointerException()"
   },
   {
-    "procedure": "void NullPointerExceptions.nullPointerExceptionArrayLength()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.nullPointerExceptionArrayLength()"
   },
   {
-    "procedure": "void NullPointerExceptions.nullPointerExceptionCallArrayReadMethod()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.nullPointerExceptionCallArrayReadMethod()"
   },
   {
-    "procedure": "void NullPointerExceptions.nullPointerExceptionFromFailingFileOutputStreamConstructor()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.nullPointerExceptionFromFailingFileOutputStreamConstructor()"
   },
   {
-    "procedure": "void NullPointerExceptions.nullPointerExceptionFromFaillingResourceConstructor()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.nullPointerExceptionFromFaillingResourceConstructor()"
   },
   {
-    "procedure": "void NullPointerExceptions.nullPointerExceptionInArrayLengthLoop(java.lang.Object[])",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.nullPointerExceptionInArrayLengthLoop(java.lang.Object[])"
   },
   {
-    "procedure": "int NullPointerExceptions.nullPointerExceptionInterProc()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "int NullPointerExceptions.nullPointerExceptionInterProc()"
   },
   {
-    "procedure": "void NullPointerExceptions.nullPointerExceptionUnlessFrameFails()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.nullPointerExceptionUnlessFrameFails()"
   },
   {
-    "procedure": "int NullPointerExceptions.nullPointerExceptionWithExceptionHandling(boolean)",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "int NullPointerExceptions.nullPointerExceptionWithExceptionHandling(boolean)"
   },
   {
-    "procedure": "void NullPointerExceptions.nullPointerExceptionWithNullArrayParameter()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.nullPointerExceptionWithNullArrayParameter()"
   },
   {
-    "procedure": "void NullPointerExceptions.nullPointerExceptionWithNullObjectParameter()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.nullPointerExceptionWithNullObjectParameter()"
   },
   {
-    "procedure": "String NullPointerExceptions.nullTryLock(FileChannel)",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "String NullPointerExceptions.nullTryLock(FileChannel)"
   },
   {
-    "procedure": "void NullPointerExceptions.nullableFieldNPE()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.nullableFieldNPE()"
   },
   {
-    "procedure": "void NullPointerExceptions.nullableParamNPE(Object)",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.nullableParamNPE(Object)"
   },
   {
-    "procedure": "void ResourceLeaks.objectInputStreamClosedNestedBad()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.objectInputStreamClosedNestedBad()"
   },
   {
-    "procedure": "void ResourceLeaks.objectInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.objectInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void ResourceLeaks.objectInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.objectInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void ResourceLeaks.objectOutputStreamClosedNestedBad()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.objectOutputStreamClosedNestedBad()"
   },
   {
-    "procedure": "void ResourceLeaks.objectOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.objectOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "void ResourceLeaks.objectOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.objectOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "void ResourceLeaks.openHttpURLConnectionNotDisconnected()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.openHttpURLConnectionNotDisconnected()"
   },
   {
-    "procedure": "void ResourceLeaks.openHttpsURLConnectionNotDisconnected()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.openHttpsURLConnectionNotDisconnected()"
   },
   {
-    "procedure": "void NullPointerExceptions.otherSinkWithNeverNullSource()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.otherSinkWithNeverNullSource()"
   },
   {
-    "procedure": "void WriterLeaks.outputStreamWriterNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/WriterLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void WriterLeaks.outputStreamWriterNotClosedAfterWrite()"
   },
   {
-    "procedure": "void ResourceLeaks.parseFromInputStreamAndLeak(JsonFactory)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.parseFromInputStreamAndLeak(JsonFactory)"
   },
   {
-    "procedure": "void ResourceLeaks.pipedInputStreamNotClosedAfterRead(PipedOutputStream)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.pipedInputStreamNotClosedAfterRead(PipedOutputStream)"
   },
   {
-    "procedure": "void ResourceLeaks.pipedOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.pipedOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "void ReaderLeaks.pipedReaderFalsePositive()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ReaderLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ReaderLeaks.pipedReaderFalsePositive()"
   },
   {
-    "procedure": "void ReaderLeaks.pipedReaderNotClosedAfterConnect(PipedWriter)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ReaderLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ReaderLeaks.pipedReaderNotClosedAfterConnect(PipedWriter)"
   },
   {
-    "procedure": "void ReaderLeaks.pipedReaderNotClosedAfterConstructedWithWriter()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ReaderLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ReaderLeaks.pipedReaderNotClosedAfterConstructedWithWriter()"
   },
   {
-    "procedure": "void WriterLeaks.pipedWriterNotClosedAfterConnect(PipedReader)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/WriterLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void WriterLeaks.pipedWriterNotClosedAfterConnect(PipedReader)"
   },
   {
-    "procedure": "void WriterLeaks.pipedWriterNotClosedAfterConstructedWithReader()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/WriterLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void WriterLeaks.pipedWriterNotClosedAfterConstructedWithReader()"
   },
   {
-    "procedure": "void FilterOutputStreamLeaks.printStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/FilterOutputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterOutputStreamLeaks.printStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "void WriterLeaks.printWriterNotClosedAfterAppend()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/WriterLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void WriterLeaks.printWriterNotClosedAfterAppend()"
   },
   {
-    "procedure": "void FilterInputStreamLeaks.pushbackInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/FilterInputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterInputStreamLeaks.pushbackInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void ReaderLeaks.pushbackReaderNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ReaderLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ReaderLeaks.pushbackReaderNotClosedAfterRead()"
   },
   {
-    "procedure": "void CursorLeaks.queryUVMLegacyDbNotClosed()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/CursorLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void CursorLeaks.queryUVMLegacyDbNotClosed()"
   },
   {
-    "procedure": "int ResourceLeaks.readConfigNotCloseStream(String)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "int ResourceLeaks.readConfigNotCloseStream(String)"
   },
   {
-    "procedure": "String ResourceLeaks.readInstallationFileBad(File)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "String ResourceLeaks.readInstallationFileBad(File)"
   },
   {
-    "procedure": "void ReaderLeaks.readerNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ReaderLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ReaderLeaks.readerNotClosedAfterRead()"
   },
   {
-    "procedure": "void ResourceLeaks.scannerNotClosed()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.scannerNotClosed()"
   },
   {
-    "procedure": "void ResourceLeaks.serverSocketNotClosed()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.serverSocketNotClosed()"
   },
   {
-    "procedure": "void NullPointerExceptions.shouldNotReportNPE()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.shouldNotReportNPE()"
   },
   {
-    "procedure": "void NullPointerExceptions.sinkWithNeverNullSource()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.sinkWithNeverNullSource()"
   },
   {
-    "procedure": "void AnalysisStops.skipFunctionInLoopMayCauseFalseNegative()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/AnalysisStops.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void AnalysisStops.skipFunctionInLoopMayCauseFalseNegative()"
   },
   {
-    "procedure": "void ResourceLeaks.socketNotClosed()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.socketNotClosed()"
   },
   {
-    "procedure": "void NullPointerExceptions.someNPEAfterResourceLeak()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.someNPEAfterResourceLeak()"
   },
   {
-    "procedure": "T CloseableAsResourceExample.sourceOfNullWithResourceLeak()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/CloseableAsResourceExample.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "T CloseableAsResourceExample.sourceOfNullWithResourceLeak()"
   },
   {
-    "procedure": "String NullPointerExceptions.testSystemGetPropertyArgument()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "String NullPointerExceptions.testSystemGetPropertyArgument()"
   },
   {
-    "procedure": "void NullPointerExceptions.testSystemGetPropertyReturn()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.testSystemGetPropertyReturn()"
   },
   {
-    "procedure": "void ResourceLeaks.themeObtainTypedArrayAndLeak(Resources$Theme)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.themeObtainTypedArrayAndLeak(Resources$Theme)"
   },
   {
-    "procedure": "String NullPointerExceptions.tryLockThrows(FileChannel)",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "String NullPointerExceptions.tryLockThrows(FileChannel)"
   },
   {
-    "procedure": "void ResourceLeaks.twoResources()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.twoResources()"
   },
   {
-    "procedure": "void ResourceLeaks.twoResourcesRandomAccessFile()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.twoResourcesRandomAccessFile()"
   },
   {
-    "procedure": "void ResourceLeaks.twoResourcesServerSocket()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.twoResourcesServerSocket()"
   },
   {
-    "procedure": "void CloseableAsResourceExample.withException()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/CloseableAsResourceExample.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void CloseableAsResourceExample.withException()"
   },
   {
-    "procedure": "void WriterLeaks.writerNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/WriterLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void WriterLeaks.writerNotClosedAfterWrite()"
   },
   {
-    "procedure": "void ResourceLeaks.zipFileLeakExceptionalBranch()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.zipFileLeakExceptionalBranch()"
   }
-]
\ No newline at end of file
+]
diff --git a/infer/tests/buck_report.json b/infer/tests/buck_report.json
index aa3013f4c..1f63ecf68 100644
--- a/infer/tests/buck_report.json
+++ b/infer/tests/buck_report.json
@@ -1,662 +1,662 @@
 [
   {
-    "procedure": "void ContextLeaks.directLeak()",
+    "bug_type": "CONTEXT_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ContextLeaks.java",
-    "bug_type": "CONTEXT_LEAK"
+    "procedure": "void ContextLeaks.directLeak()"
   },
   {
-    "procedure": "void ContextLeaks.indirectHandlerLeak()",
+    "bug_type": "CONTEXT_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ContextLeaks.java",
-    "bug_type": "CONTEXT_LEAK"
+    "procedure": "void ContextLeaks.indirectHandlerLeak()"
   },
   {
-    "procedure": "void ContextLeaks.indirectLeak()",
+    "bug_type": "CONTEXT_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ContextLeaks.java",
-    "bug_type": "CONTEXT_LEAK"
+    "procedure": "void ContextLeaks.indirectLeak()"
   },
   {
-    "procedure": "void ContextLeaks.leakAfterInstanceFieldWrite()",
+    "bug_type": "CONTEXT_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ContextLeaks.java",
-    "bug_type": "CONTEXT_LEAK"
+    "procedure": "void ContextLeaks.leakAfterInstanceFieldWrite()"
   },
   {
-    "procedure": "void ContextLeaks.nonStaticInnerClassLeak()",
+    "bug_type": "CONTEXT_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ContextLeaks.java",
-    "bug_type": "CONTEXT_LEAK"
+    "procedure": "void ContextLeaks.nonStaticInnerClassLeak()"
   },
   {
-    "procedure": "ContextLeaks$Singleton ContextLeaks.singletonLeak()",
+    "bug_type": "CONTEXT_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ContextLeaks.java",
-    "bug_type": "CONTEXT_LEAK"
+    "procedure": "ContextLeaks$Singleton ContextLeaks.singletonLeak()"
   },
   {
-    "procedure": "InputStream TaintExample.socketIgnoreExceptionNoVerify(SSLSocketFactory)",
+    "bug_type": "TAINTED_VALUE_REACHING_SENSITIVE_FUNCTION",
     "file": "infer/tests/codetoanalyze/java/infer/TaintExample.java",
-    "bug_type": "TAINTED_VALUE_REACHING_SENSITIVE_FUNCTION"
+    "procedure": "InputStream TaintExample.socketIgnoreExceptionNoVerify(SSLSocketFactory)"
   },
   {
-    "procedure": "InputStream TaintExample.socketNotVerifiedSimple(SSLSocketFactory)",
+    "bug_type": "TAINTED_VALUE_REACHING_SENSITIVE_FUNCTION",
     "file": "infer/tests/codetoanalyze/java/infer/TaintExample.java",
-    "bug_type": "TAINTED_VALUE_REACHING_SENSITIVE_FUNCTION"
+    "procedure": "InputStream TaintExample.socketNotVerifiedSimple(SSLSocketFactory)"
   },
   {
-    "procedure": "InputStream TaintExample.socketVerifiedForgotToCheckRetval(SSLSocketFactory,HostnameVerifier,SSLSession)",
+    "bug_type": "TAINTED_VALUE_REACHING_SENSITIVE_FUNCTION",
     "file": "infer/tests/codetoanalyze/java/infer/TaintExample.java",
-    "bug_type": "TAINTED_VALUE_REACHING_SENSITIVE_FUNCTION"
+    "procedure": "InputStream TaintExample.socketVerifiedForgotToCheckRetval(SSLSocketFactory,HostnameVerifier,SSLSession)"
   },
   {
-    "procedure": "InputStream TaintExample.taintingShouldNotPreventInference(SSLSocketFactory)",
+    "bug_type": "TAINTED_VALUE_REACHING_SENSITIVE_FUNCTION",
     "file": "infer/tests/codetoanalyze/java/infer/TaintExample.java",
-    "bug_type": "TAINTED_VALUE_REACHING_SENSITIVE_FUNCTION"
+    "procedure": "InputStream TaintExample.taintingShouldNotPreventInference(SSLSocketFactory)"
   },
   {
-    "procedure": "int NullPointerExceptions.NPEvalueOfFromHashmapBad(HashMap,int)",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "int NullPointerExceptions.NPEvalueOfFromHashmapBad(HashMap,int)"
   },
   {
-    "procedure": "void ResourceLeaks.activityObtainTypedArrayAndLeak(Activity)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.activityObtainTypedArrayAndLeak(Activity)"
   },
   {
-    "procedure": "void NullPointerExceptions.badCheckShouldCauseNPE()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.badCheckShouldCauseNPE()"
   },
   {
-    "procedure": "void FilterInputStreamLeaks.bufferedInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/FilterInputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterInputStreamLeaks.bufferedInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void FilterOutputStreamLeaks.bufferedOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/FilterOutputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterOutputStreamLeaks.bufferedOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "void ReaderLeaks.bufferedReaderNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ReaderLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ReaderLeaks.bufferedReaderNotClosedAfterRead()"
   },
   {
-    "procedure": "void WriterLeaks.bufferedWriterNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/WriterLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void WriterLeaks.bufferedWriterNotClosedAfterWrite()"
   },
   {
-    "procedure": "void FilterInputStreamLeaks.checkedInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/FilterInputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterInputStreamLeaks.checkedInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void FilterOutputStreamLeaks.checkedOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/FilterOutputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterOutputStreamLeaks.checkedOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "void FilterInputStreamLeaks.cipherInputStreamNotClosedAfterSkip()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/FilterInputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterInputStreamLeaks.cipherInputStreamNotClosedAfterSkip()"
   },
   {
-    "procedure": "void FilterOutputStreamLeaks.cipherOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/FilterOutputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterOutputStreamLeaks.cipherOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "int CursorLeaks.completeDownloadNotClosed(DownloadManager)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/CursorLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "int CursorLeaks.completeDownloadNotClosed(DownloadManager)"
   },
   {
-    "procedure": "void ResourceLeaks.contextObtainTypedArrayAndLeak(Context)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.contextObtainTypedArrayAndLeak(Context)"
   },
   {
-    "procedure": "void ResourceLeaks.copyFileLeak(File,File)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.copyFileLeak(File,File)"
   },
   {
-    "procedure": "void ResourceLeaks.copyFileLeak(File,File)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.copyFileLeak(File,File)"
   },
   {
-    "procedure": "void NullPointerExceptions.cursorFromContentResolverNPE(String)",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.cursorFromContentResolverNPE(String)"
   },
   {
-    "procedure": "int CursorLeaks.cursorNotClosed(SQLiteDatabase)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/CursorLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "int CursorLeaks.cursorNotClosed(SQLiteDatabase)"
   },
   {
-    "procedure": "void FilterInputStreamLeaks.dataInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/FilterInputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterInputStreamLeaks.dataInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void FilterOutputStreamLeaks.dataOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/FilterOutputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterOutputStreamLeaks.dataOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "void FilterInputStreamLeaks.deflaterInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/FilterInputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterInputStreamLeaks.deflaterInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void ResourceLeaks.deflaterLeak()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.deflaterLeak()"
   },
   {
-    "procedure": "void FilterOutputStreamLeaks.deflaterOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/FilterOutputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterOutputStreamLeaks.deflaterOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "void NullPointerExceptions.derefNull()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.derefNull()"
   },
   {
-    "procedure": "void NullPointerExceptions.derefNullableGetter()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.derefNullableGetter()"
   },
   {
-    "procedure": "void FilterInputStreamLeaks.digestInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/FilterInputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterInputStreamLeaks.digestInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void FilterOutputStreamLeaks.digestOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/FilterOutputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterOutputStreamLeaks.digestOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "void Builtins.doNotBlockError(Object)",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/Builtins.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void Builtins.doNotBlockError(Object)"
   },
   {
-    "procedure": "void CloseableAsResourceExample.failToCloseWithCloseQuietly()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/CloseableAsResourceExample.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void CloseableAsResourceExample.failToCloseWithCloseQuietly()"
   },
   {
-    "procedure": "void AnalysisStops.fieldReadInCalleeMayCauseFalseNegative()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/AnalysisStops.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void AnalysisStops.fieldReadInCalleeMayCauseFalseNegative()"
   },
   {
-    "procedure": "void AnalysisStops.fieldReadInCalleeWithAngelicObjFieldMayCauseFalseNegative()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/AnalysisStops.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void AnalysisStops.fieldReadInCalleeWithAngelicObjFieldMayCauseFalseNegative()"
   },
   {
-    "procedure": "void ResourceLeaks.fileInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.fileInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void ResourceLeaks.fileOutputStreamNotClosed()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.fileOutputStreamNotClosed()"
   },
   {
-    "procedure": "void ResourceLeaks.fileOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.fileOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "int ResourceLeaks.fileOutputStreamTwoLeaks(boolean)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "int ResourceLeaks.fileOutputStreamTwoLeaks(boolean)"
   },
   {
-    "procedure": "int ResourceLeaks.fileOutputStreamTwoLeaks(boolean)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "int ResourceLeaks.fileOutputStreamTwoLeaks(boolean)"
   },
   {
-    "procedure": "void ReaderLeaks.fileReaderNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ReaderLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ReaderLeaks.fileReaderNotClosedAfterRead()"
   },
   {
-    "procedure": "void WriterLeaks.fileWriterNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/WriterLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void WriterLeaks.fileWriterNotClosedAfterWrite()"
   },
   {
-    "procedure": "void FilterOutputStreamLeaks.filterOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/FilterOutputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterOutputStreamLeaks.filterOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "int CursorLeaks.getBucketCountNotClosed()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/CursorLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "int CursorLeaks.getBucketCountNotClosed()"
   },
   {
-    "procedure": "int CursorLeaks.getImageCountHelperNotClosed(String)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/CursorLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "int CursorLeaks.getImageCountHelperNotClosed(String)"
   },
   {
-    "procedure": "int HashMapExample.getOneIntegerWithoutCheck()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/HashMapExample.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "int HashMapExample.getOneIntegerWithoutCheck()"
   },
   {
-    "procedure": "void HashMapExample.getTwoIntegersWithOneCheck(Integer,Integer)",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/HashMapExample.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void HashMapExample.getTwoIntegersWithOneCheck(Integer,Integer)"
   },
   {
-    "procedure": "void FilterInputStreamLeaks.gzipInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/FilterInputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterInputStreamLeaks.gzipInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void FilterInputStreamLeaks.gzipInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/FilterInputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterInputStreamLeaks.gzipInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void FilterOutputStreamLeaks.gzipOutputStreamNotClosedAfterFlush()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/FilterOutputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterOutputStreamLeaks.gzipOutputStreamNotClosedAfterFlush()"
   },
   {
-    "procedure": "void FilterOutputStreamLeaks.gzipOutputStreamNotClosedAfterFlush()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/FilterOutputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterOutputStreamLeaks.gzipOutputStreamNotClosedAfterFlush()"
   },
   {
-    "procedure": "String NullPointerExceptions.hashmapNPE(HashMap,Object)",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "String NullPointerExceptions.hashmapNPE(HashMap,Object)"
   },
   {
-    "procedure": "void FilterInputStreamLeaks.inflaterInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/FilterInputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterInputStreamLeaks.inflaterInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void ResourceLeaks.inflaterLeak()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.inflaterLeak()"
   },
   {
-    "procedure": "void FilterOutputStreamLeaks.inflaterOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/FilterOutputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterOutputStreamLeaks.inflaterOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "void ReaderLeaks.inputStreamReaderNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ReaderLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ReaderLeaks.inputStreamReaderNotClosedAfterRead()"
   },
   {
-    "procedure": "boolean ResourceLeaks.jarFileNotClosed()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "boolean ResourceLeaks.jarFileNotClosed()"
   },
   {
-    "procedure": "void ResourceLeaks.jarInputStreamLeak()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.jarInputStreamLeak()"
   },
   {
-    "procedure": "void ResourceLeaks.jarOutputStreamLeak()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.jarOutputStreamLeak()"
   },
   {
-    "procedure": "void CursorLeaks.loadPrefsFromContentProviderNotClosed()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/CursorLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void CursorLeaks.loadPrefsFromContentProviderNotClosed()"
   },
   {
-    "procedure": "boolean DotFilesEqual.matches(Object)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/utils/matchers/DotFilesEqual.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "boolean DotFilesEqual.matches(Object)"
   },
   {
-    "procedure": "void ResourceLeaks.nestedBad1()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.nestedBad1()"
   },
   {
-    "procedure": "void ResourceLeaks.nestedBad2()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.nestedBad2()"
   },
   {
-    "procedure": "void ResourceLeaks.nestedBadJarInputStream(File)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.nestedBadJarInputStream(File)"
   },
   {
-    "procedure": "void ResourceLeaks.nestedBadJarOutputStream()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.nestedBadJarOutputStream()"
   },
   {
-    "procedure": "void CloseableAsResourceExample.notClosingCloseable()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/CloseableAsResourceExample.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void CloseableAsResourceExample.notClosingCloseable()"
   },
   {
-    "procedure": "void CloseableAsResourceExample.notClosingWrapper()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/CloseableAsResourceExample.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void CloseableAsResourceExample.notClosingWrapper()"
   },
   {
-    "procedure": "void AutoGenerated.npe()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/AutoGenerated.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void AutoGenerated.npe()"
   },
   {
-    "procedure": "void NullPointerExceptions$$$Class$Name$With$Dollars.npeWithDollars()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions$$$Class$Name$With$Dollars.npeWithDollars()"
   },
   {
-    "procedure": "int NullPointerExceptions.nullListFiles(String)",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "int NullPointerExceptions.nullListFiles(String)"
   },
   {
-    "procedure": "int NullPointerExceptions.nullPointerException()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "int NullPointerExceptions.nullPointerException()"
   },
   {
-    "procedure": "void NullPointerExceptions.nullPointerExceptionArrayLength()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.nullPointerExceptionArrayLength()"
   },
   {
-    "procedure": "void NullPointerExceptions.nullPointerExceptionCallArrayReadMethod()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.nullPointerExceptionCallArrayReadMethod()"
   },
   {
-    "procedure": "void NullPointerExceptions.nullPointerExceptionFromFailingFileOutputStreamConstructor()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.nullPointerExceptionFromFailingFileOutputStreamConstructor()"
   },
   {
-    "procedure": "void NullPointerExceptions.nullPointerExceptionFromFaillingResourceConstructor()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.nullPointerExceptionFromFaillingResourceConstructor()"
   },
   {
-    "procedure": "void NullPointerExceptions.nullPointerExceptionInArrayLengthLoop(java.lang.Object[])",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.nullPointerExceptionInArrayLengthLoop(java.lang.Object[])"
   },
   {
-    "procedure": "int NullPointerExceptions.nullPointerExceptionInterProc()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "int NullPointerExceptions.nullPointerExceptionInterProc()"
   },
   {
-    "procedure": "void NullPointerExceptions.nullPointerExceptionUnlessFrameFails()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.nullPointerExceptionUnlessFrameFails()"
   },
   {
-    "procedure": "int NullPointerExceptions.nullPointerExceptionWithExceptionHandling(boolean)",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "int NullPointerExceptions.nullPointerExceptionWithExceptionHandling(boolean)"
   },
   {
-    "procedure": "void NullPointerExceptions.nullPointerExceptionWithNullArrayParameter()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.nullPointerExceptionWithNullArrayParameter()"
   },
   {
-    "procedure": "void NullPointerExceptions.nullPointerExceptionWithNullObjectParameter()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.nullPointerExceptionWithNullObjectParameter()"
   },
   {
-    "procedure": "String NullPointerExceptions.nullTryLock(FileChannel)",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "String NullPointerExceptions.nullTryLock(FileChannel)"
   },
   {
-    "procedure": "void NullPointerExceptions.nullableFieldNPE()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.nullableFieldNPE()"
   },
   {
-    "procedure": "void NullPointerExceptions.nullableParamNPE(Object)",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.nullableParamNPE(Object)"
   },
   {
-    "procedure": "void ResourceLeaks.objectInputStreamClosedNestedBad()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.objectInputStreamClosedNestedBad()"
   },
   {
-    "procedure": "void ResourceLeaks.objectInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.objectInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void ResourceLeaks.objectInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.objectInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void ResourceLeaks.objectOutputStreamClosedNestedBad()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.objectOutputStreamClosedNestedBad()"
   },
   {
-    "procedure": "void ResourceLeaks.objectOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.objectOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "void ResourceLeaks.objectOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.objectOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "void ResourceLeaks.openHttpURLConnectionNotDisconnected()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.openHttpURLConnectionNotDisconnected()"
   },
   {
-    "procedure": "void ResourceLeaks.openHttpsURLConnectionNotDisconnected()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.openHttpsURLConnectionNotDisconnected()"
   },
   {
-    "procedure": "void NullPointerExceptions.otherSinkWithNeverNullSource()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.otherSinkWithNeverNullSource()"
   },
   {
-    "procedure": "void WriterLeaks.outputStreamWriterNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/WriterLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void WriterLeaks.outputStreamWriterNotClosedAfterWrite()"
   },
   {
-    "procedure": "void ResourceLeaks.parseFromInputStreamAndLeak(JsonFactory)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.parseFromInputStreamAndLeak(JsonFactory)"
   },
   {
-    "procedure": "void ResourceLeaks.pipedInputStreamNotClosedAfterRead(PipedOutputStream)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.pipedInputStreamNotClosedAfterRead(PipedOutputStream)"
   },
   {
-    "procedure": "void ResourceLeaks.pipedOutputStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.pipedOutputStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "void ReaderLeaks.pipedReaderFalsePositive()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ReaderLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ReaderLeaks.pipedReaderFalsePositive()"
   },
   {
-    "procedure": "void ReaderLeaks.pipedReaderNotClosedAfterConnect(PipedWriter)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ReaderLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ReaderLeaks.pipedReaderNotClosedAfterConnect(PipedWriter)"
   },
   {
-    "procedure": "void ReaderLeaks.pipedReaderNotClosedAfterConstructedWithWriter()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ReaderLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ReaderLeaks.pipedReaderNotClosedAfterConstructedWithWriter()"
   },
   {
-    "procedure": "void WriterLeaks.pipedWriterNotClosedAfterConnect(PipedReader)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/WriterLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void WriterLeaks.pipedWriterNotClosedAfterConnect(PipedReader)"
   },
   {
-    "procedure": "void WriterLeaks.pipedWriterNotClosedAfterConstructedWithReader()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/WriterLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void WriterLeaks.pipedWriterNotClosedAfterConstructedWithReader()"
   },
   {
-    "procedure": "void FilterOutputStreamLeaks.printStreamNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/FilterOutputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterOutputStreamLeaks.printStreamNotClosedAfterWrite()"
   },
   {
-    "procedure": "void WriterLeaks.printWriterNotClosedAfterAppend()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/WriterLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void WriterLeaks.printWriterNotClosedAfterAppend()"
   },
   {
-    "procedure": "void FilterInputStreamLeaks.pushbackInputStreamNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/FilterInputStreamLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void FilterInputStreamLeaks.pushbackInputStreamNotClosedAfterRead()"
   },
   {
-    "procedure": "void ReaderLeaks.pushbackReaderNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ReaderLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ReaderLeaks.pushbackReaderNotClosedAfterRead()"
   },
   {
-    "procedure": "void CursorLeaks.queryUVMLegacyDbNotClosed()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/CursorLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void CursorLeaks.queryUVMLegacyDbNotClosed()"
   },
   {
-    "procedure": "int ResourceLeaks.readConfigNotCloseStream(String)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "int ResourceLeaks.readConfigNotCloseStream(String)"
   },
   {
-    "procedure": "String ResourceLeaks.readInstallationFileBad(File)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "String ResourceLeaks.readInstallationFileBad(File)"
   },
   {
-    "procedure": "void ReaderLeaks.readerNotClosedAfterRead()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ReaderLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ReaderLeaks.readerNotClosedAfterRead()"
   },
   {
-    "procedure": "void ResourceLeaks.scannerNotClosed()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.scannerNotClosed()"
   },
   {
-    "procedure": "void ResourceLeaks.serverSocketNotClosed()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.serverSocketNotClosed()"
   },
   {
-    "procedure": "void NullPointerExceptions.sinkWithNeverNullSource()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.sinkWithNeverNullSource()"
   },
   {
-    "procedure": "void AnalysisStops.skipFunctionInLoopMayCauseFalseNegative()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/AnalysisStops.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void AnalysisStops.skipFunctionInLoopMayCauseFalseNegative()"
   },
   {
-    "procedure": "void ResourceLeaks.socketNotClosed()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.socketNotClosed()"
   },
   {
-    "procedure": "void NullPointerExceptions.someNPEAfterResourceLeak()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.someNPEAfterResourceLeak()"
   },
   {
-    "procedure": "T CloseableAsResourceExample.sourceOfNullWithResourceLeak()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/CloseableAsResourceExample.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "T CloseableAsResourceExample.sourceOfNullWithResourceLeak()"
   },
   {
-    "procedure": "String NullPointerExceptions.testSystemGetPropertyArgument()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "String NullPointerExceptions.testSystemGetPropertyArgument()"
   },
   {
-    "procedure": "void NullPointerExceptions.testSystemGetPropertyReturn()",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "void NullPointerExceptions.testSystemGetPropertyReturn()"
   },
   {
-    "procedure": "void ResourceLeaks.themeObtainTypedArrayAndLeak(Resources$Theme)",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.themeObtainTypedArrayAndLeak(Resources$Theme)"
   },
   {
-    "procedure": "String NullPointerExceptions.tryLockThrows(FileChannel)",
+    "bug_type": "NULL_DEREFERENCE",
     "file": "infer/tests/codetoanalyze/java/infer/NullPointerExceptions.java",
-    "bug_type": "NULL_DEREFERENCE"
+    "procedure": "String NullPointerExceptions.tryLockThrows(FileChannel)"
   },
   {
-    "procedure": "void ResourceLeaks.twoResources()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.twoResources()"
   },
   {
-    "procedure": "void ResourceLeaks.twoResourcesRandomAccessFile()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.twoResourcesRandomAccessFile()"
   },
   {
-    "procedure": "void ResourceLeaks.twoResourcesServerSocket()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.twoResourcesServerSocket()"
   },
   {
-    "procedure": "void CloseableAsResourceExample.withException()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/CloseableAsResourceExample.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void CloseableAsResourceExample.withException()"
   },
   {
-    "procedure": "void WriterLeaks.writerNotClosedAfterWrite()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/WriterLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void WriterLeaks.writerNotClosedAfterWrite()"
   },
   {
-    "procedure": "void ResourceLeaks.zipFileLeakExceptionalBranch()",
+    "bug_type": "RESOURCE_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ResourceLeaks.java",
-    "bug_type": "RESOURCE_LEAK"
+    "procedure": "void ResourceLeaks.zipFileLeakExceptionalBranch()"
   }
-]
\ No newline at end of file
+]
diff --git a/scripts/build_integration_tests.py b/scripts/build_integration_tests.py
index 266a1f36e..673cacdfa 100755
--- a/scripts/build_integration_tests.py
+++ b/scripts/build_integration_tests.py
@@ -19,7 +19,7 @@ sys.path.insert(0,
                 os.path.join(SCRIPTS_DIRECTORY,
                              os.pardir, 'infer', 'lib', 'python'))
 
-from inferlib import issues
+from inferlib import issues, utils
 
 
 CURRENT_DIR = os.getcwd()
@@ -56,26 +56,22 @@ def string_of_error(e):
     return msg
 
 
-def load_report(filename):
-    with open(filename, 'r') as file_in:
-        return json.load(file_in)
+def save_report(reports, filename):
+    # sorting to avoid spurious differences between two lists of reports
+    reports.sort()
 
+    def filter_report(report):
+        return dict((k, v) for (k, v) in report.items() if k in REPORT_FIELDS)
 
-def save_report(reports, filename):
-    with open(filename, 'w') as file_out:
-        filtered = []
-        for report in sorted(reports):
-            r = {}
-            for key in REPORT_FIELDS:
-                if key in report:
-                    r[key] = report[key]
-            if len(r) > 0:
-                filtered.append(r)
-        return json.dump(filtered, file_out, indent=2, separators=(',', ': '))
+    def should_report(report):
+        return len(report) > 0
 
+    filtered = filter(should_report, map(filter_report, reports))
+    utils.dump_json_to_path(filtered, filename,
+                            separators=(',', ': '), sort_keys=True)
 
-def run_analysis(root, clean_cmd, build_cmd, analyzer):
 
+def run_analysis(root, clean_cmd, build_cmd, analyzer):
     os.chdir(root)
 
     subprocess.check_call(clean_cmd)
@@ -89,7 +85,8 @@ def run_analysis(root, clean_cmd, build_cmd, analyzer):
             prefix='analysis_') as analysis_output:
         subprocess.check_call(infer_cmd, stdout=analysis_output)
 
-    found_errors = load_report(os.path.join(temp_out_dir, REPORT_JSON))
+    json_path = os.path.join(temp_out_dir, REPORT_JSON)
+    found_errors = utils.load_json_from_path(json_path)
     shutil.rmtree(temp_out_dir)
     os.chdir(CURRENT_DIR)
 
@@ -156,7 +153,7 @@ def do_test(errors, expected_errors_filename):
         save_report(errors, expected_errors_filename)
         return
     else:
-        patterns = load_report(expected_errors_filename)
+        patterns = utils.load_json_from_path(expected_errors_filename)
         check_results(errors, patterns)