فهرست منبع

additional spotbugs fixes

Jason Rivard 7 سال پیش
والد
کامیت
e644893134
2فایلهای تغییر یافته به همراه10 افزوده شده و 7 حذف شده
  1. 10 1
      server/src/build/spotbugs-exclude.xml
  2. 0 6
      server/src/main/webapp/public/reference/license.jsp

+ 10 - 1
server/src/build/spotbugs-exclude.xml

@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <FindBugsFilter>
 <FindBugsFilter>
     <Match>
     <Match>
-        <Bug pattern="SE_NO_SERIALVERSIONID,IC_INIT_CIRCULARITY,RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE,DP_CREATE_CLASSLOADER_INSIDE_DO_PRIVILEGED,SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING"/>
+        <Bug pattern="SE_NO_SERIALVERSIONID"/>
+    </Match>
+    <Match>
+        <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
+    </Match>
+    <Match>
+        <Bug pattern="DP_CREATE_CLASSLOADER_INSIDE_DO_PRIVILEGED,"/>
+    </Match>
+    <Match>
+        <Bug pattern="SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING"/>
     </Match>
     </Match>
 </FindBugsFilter>
 </FindBugsFilter>

+ 0 - 6
server/src/main/webapp/public/reference/license.jsp

@@ -60,7 +60,6 @@
             </p>
             </p>
         </pwm:if>
         </pwm:if>
 
 
-        <% if (dependencyInfos != null) { %>
         <% for (final XmlUtil.DependencyInfo dependencyInfo : dependencyInfos) { %>
         <% for (final XmlUtil.DependencyInfo dependencyInfo : dependencyInfos) { %>
         <div class="licenseBlock">
         <div class="licenseBlock">
             <div class="dependency-name"><%=StringUtil.escapeHtml(dependencyInfo.getName())%></div>
             <div class="dependency-name"><%=StringUtil.escapeHtml(dependencyInfo.getName())%></div>
@@ -90,11 +89,6 @@
             <% } %>
             <% } %>
         </div>
         </div>
         <% } %>
         <% } %>
-        <% } else { %>
-        <div class="licenseBlock">
-            Error: attribution file not found: attribution.xml
-        </div>
-        <% } %>
         <pwm:if test="<%=PwmIfTest.permission%>" permission="<%=Permission.PWMADMIN%>">
         <pwm:if test="<%=PwmIfTest.permission%>" permission="<%=Permission.PWMADMIN%>">
             <p>
             <p>
             <form action="source.zip" method="get">
             <form action="source.zip" method="get">