Merge into master from pull request #2616:

findbugs stuff (https://github.com/bigswitch/bigswitchcontroller/pull/2616)

build.xml

@@ -283,10 +283,12 @@
     <target name="findbugs-xml" depends="init,compile">
         <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${findbugs.home}/lib/findbugs-ant.jar"/>
         <mkdir dir="${findbugs.results}"/>
-        <findbugs home="${findbugs.home}"
+        <findbugs
+            home="${findbugs.home}"
             output="xml"
             excludeFilter="${basedir}/findbugs-exclude.xml"
-            outputFile="${findbugs.results}/results.xml" reportLevel='high'>
+            jvmargs="-Xmx1024m"
+            outputFile="${findbugs.results}/results.xml">
            <sourcePath path="${source}" />
            <sourcePath path="${thrift.out.dir}" />
            <class location="${build}" />
@@ -299,9 +301,11 @@
     <target name="findbugs" depends="init,compile">
         <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${findbugs.home}/lib/findbugs-ant.jar"/>
         <mkdir dir="${findbugs.results}"/>
-        <findbugs home="${findbugs.home}"
+        <findbugs
+            home="${findbugs.home}"
             output="html"
             excludeFilter="${basedir}/findbugs-exclude.xml"
+            jvmargs="-Xmx1024m"
             outputFile="${findbugs.results}/results.html" >
            <sourcePath path="${source}" />
            <sourcePath path="${thrift.out.dir}" />

findbugs-exclude.xml

 <FindBugsFilter>
     <!--- Checks disabled on generated code -->
+
     <Match>
         <!-- don't complain about switch statements / external representation exposed
              by generated parser files -->
         <Class name="~net\.bigdb\.(query|yang)\.parser\..*(Lexer|Parser)" />
-        <Bug pattern="SF_SWITCH_NO_DEFAULT,EI_EXPOSE_REP" />
+        <Or>
+            <Bug pattern="SF_SWITCH_NO_DEFAULT,EI_EXPOSE_REP,SBSC_USE_STRINGBUFFER_CONCATENATION" />
+            <Bug category="PERFORMANCE,MALICIOUS_CODE" />
+        </Or>
+    </Match>
+
+    <Match>
+        <!-- Exclude warnings in generated thrift class files -->
+        <Class name="~net\.floodlightcontroller\.packetstreamer\.thrift\..*" />
+        <Bug pattern="CN_IDIOM,DLS_DEAD_LOCAL_STORE" />
     </Match>
 
     <!-- checks disabled because of too many false positives -->