Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  FakeGroupAuditService: Make auditEvents final
  ErrorProne: Increase severity of MutableConstantField to ERROR
  ConfigUpdatedEvent: Use immutable type in field declaration
  Add missing slf4j dependencies in BUILD file
  JGitMetricModule: fix WindowCache miss ration which wasn't reported
  Revert "JGitMetricModule: Replace anonymous Supplier instances with method references"
  Suppress generic logging on docker start for ElasticSearch container
  Replace deprecated OptionParser with ArgumentParser

Change-Id: I36a7ce5c043bd43d90fb415fcec67440db2b5c84

tools/js/bower2bazel.py

@@ -22,10 +22,10 @@ python tools/js/bower2bazel.py -w lib/js/bower_archives.bzl \
 
 from __future__ import print_function
 
+import argparse
 import collections
 import json
 import hashlib
-import optparse
 import os
 import subprocess
 import sys
@@ -141,11 +141,11 @@ def bower_command(args):
             os.getcwd() + "/tools/js/run_npm_binary.py", sorted(fs)[0]] + args
 
 
-def main(args):
-    opts = optparse.OptionParser()
-    opts.add_option('-w', help='.bzl output for WORKSPACE')
-    opts.add_option('-b', help='.bzl output for //lib:BUILD')
-    opts, args = opts.parse_args()
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-w', help='.bzl output for WORKSPACE')
+    parser.add_argument('-b', help='.bzl output for //lib:BUILD')
+    args = parser.parse_args()
 
     target_str = subprocess.check_output([
         "bazel", "query", "kind(bower_component_bundle, //polygerrit-ui/...)"])
@@ -166,12 +166,12 @@ def main(args):
     cmd = bower_command(["install"])
 
     build_out = sys.stdout
-    if opts.b:
-        build_out = open(opts.b + ".tmp", 'w')
+    if args.b:
+        build_out = open(args.b + ".tmp", 'w')
 
     ws_out = sys.stdout
-    if opts.b:
-        ws_out = open(opts.w + ".tmp", 'w')
+    if args.b:
+        ws_out = open(args.w + ".tmp", 'w')
 
     header = """# DO NOT EDIT
 # generated with the following command:
@@ -193,8 +193,8 @@ def main(args):
     build_out.close()
 
     os.chdir(oldwd)
-    os.rename(opts.w + ".tmp", opts.w)
-    os.rename(opts.b + ".tmp", opts.b)
+    os.rename(args.w + ".tmp", args.w)
+    os.rename(args.b + ".tmp", args.b)
 
 
 def dump_workspace(data, seeds, out):
@@ -259,4 +259,4 @@ def interpret_bower_json(seeds, ws_out, build_out):
 
 
 if __name__ == '__main__':
-    main(sys.argv[1:])
+    main()

tools/js/download_bower.py

@@ -15,9 +15,9 @@
 
 from __future__ import print_function
 
+import argparse
 import hashlib
 import json
-import optparse
 import os
 import shutil
 import subprocess
@@ -80,44 +80,44 @@ def cache_entry(name, package, version, sha1):
     return os.path.join(CACHE_DIR, '%s-%s.zip-%s' % (name, version, sha1))
 
 
-def main(args):
-    opts = optparse.OptionParser()
-    opts.add_option('-n', help='short name of component')
-    opts.add_option('-b', help='bower command')
-    opts.add_option('-p', help='full package name of component')
-    opts.add_option('-v', help='version number')
-    opts.add_option('-s', help='expected content sha1')
-    opts.add_option('-o', help='output file location')
-    opts, args_ = opts.parse_args(args)
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-n', help='short name of component')
+    parser.add_argument('-b', help='bower command')
+    parser.add_argument('-p', help='full package name of component')
+    parser.add_argument('-v', help='version number')
+    parser.add_argument('-s', help='expected content sha1')
+    parser.add_argument('-o', help='output file location')
+    args = parser.parse_args()
 
-    assert opts.p
-    assert opts.v
-    assert opts.n
+    assert args.p
+    assert args.v
+    assert args.n
 
     cwd = os.getcwd()
-    outzip = os.path.join(cwd, opts.o)
-    cached = cache_entry(opts.n, opts.p, opts.v, opts.s)
+    outzip = os.path.join(cwd, args.o)
+    cached = cache_entry(args.n, args.p, args.v, args.s)
 
     if not os.path.exists(cached):
-        info = bower_info(opts.b, opts.n, opts.p, opts.v)
+        info = bower_info(args.b, args.n, args.p, args.v)
         ignore_deps(info)
         subprocess.check_call(
             bower_cmd(
-                opts.b, '--quiet', 'install', '%s#%s' % (opts.p, opts.v)))
+                args.b, '--quiet', 'install', '%s#%s' % (args.p, args.v)))
         bc = os.path.join(cwd, 'bower_components')
         subprocess.check_call(
-            ['zip', '-q', '--exclude', '.bower.json', '-r', cached, opts.n],
+            ['zip', '-q', '--exclude', '.bower.json', '-r', cached, args.n],
             cwd=bc)
 
-        if opts.s:
-            path = os.path.join(bc, opts.n)
+        if args.s:
+            path = os.path.join(bc, args.n)
             sha1 = bowerutil.hash_bower_component(
                 hashlib.sha1(), path).hexdigest()
-            if opts.s != sha1:
+            if args.s != sha1:
                 print((
                     '%s#%s:\n'
                     'expected %s\n'
-                    'received %s\n') % (opts.p, opts.v, opts.s, sha1),
+                    'received %s\n') % (args.p, args.v, args.s, sha1),
                     file=sys.stderr)
                 try:
                     os.remove(cached)
@@ -132,4 +132,4 @@ def main(args):
 
 
 if __name__ == '__main__':
-    sys.exit(main(sys.argv[1:]))
+    sys.exit(main())