Fix warnings

opendap/dtswar/src/main/java/opendap/dts/DTSServlet.java

@@ -1448,7 +1448,7 @@ protected void printStatus(PrintWriter os) {
       int pending = 0;
       StringBuilder preqs = new StringBuilder();
       for (int i = 0; i < n; i++) {
-        ReqState rs = (ReqState) prArr.get(i);
+        ReqState rs = prArr.get(i);
         RequestDebug reqD = (RequestDebug) rs.getUserObject();
         if (!reqD.done) {
           preqs.append("<pre>-----------------------\n");
@@ -1657,7 +1657,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) {
             reqD = new RequestDebug(reqno, Thread.currentThread().toString());
             rs.setUserObject(reqD);
             if (prArr == null)
-              prArr = new ArrayList(10000);
+              prArr = new ArrayList<>(10000);
             prArr.add((int) reqno, rs);
           }
 
@@ -1824,7 +1824,7 @@ private void printBadURLPage(PrintWriter pw) {
   //////////////////////////////////////////////////
   // debug
 
-  private ArrayList prArr = null;
+  private ArrayList<ReqState> prArr = null;
 
   static private class RequestDebug {
     long reqno;

opendap/server/src/main/java/opendap/servers/CEEvaluator.java

@@ -102,7 +102,7 @@ public class CEEvaluator {
   /**
    * The Clause objects which hold the parsed selection information.
    */
-  private Vector _cv;
+  private Vector<Clause> _cv;
 
   /**
    * The factory which will be used by the parser to construct the clause
@@ -120,7 +120,7 @@ public class CEEvaluator {
    */
   public CEEvaluator(ServerDDS dds) {
     _dds = dds;
-    _cv = new Vector();
+    _cv = new Vector<>();
     _Debug = Debug.isSet("CE");
     if (_Debug)
       System.out.println("CE debugging enabled.");
@@ -140,7 +140,7 @@ public CEEvaluator(ServerDDS dds) {
    */
   public CEEvaluator(ServerDDS dds, ClauseFactory clauseFactory) {
     _dds = dds;
-    _cv = new Vector();
+    _cv = new Vector<>();
     _Debug = Debug.isSet("CE");
     if (_Debug)
       System.out.println("CE debugging enabled.");

opendap/server/src/main/java/opendap/servers/SDSequence.java

@@ -104,7 +104,7 @@ public Vector getRowVector() throws NoSuchVariableException {
       if (_Debug)
         System.out.println("This sequence has " + getRowCount() + " rows.");
 
-      Vector rv = new Vector();
+      Vector<BaseType> rv = new Vector<>();
 
       for (int i = 0; i < elementCount(false); i++) {
         if (_Debug)

opendap/server/src/main/java/opendap/servlet/AbstractServlet.java

@@ -1391,7 +1391,7 @@ protected void printStatus(PrintWriter os) throws IOException {
       int pending = 0;
       StringBuilder preqs = new StringBuilder();
       for (int i = 0; i < n; i++) {
-        ReqState rs = (ReqState) prArr.get(i);
+        ReqState rs = prArr.get(i);
         RequestDebug reqD = (RequestDebug) rs.getUserObject();
         if (!reqD.done) {
           preqs.append("<pre>-----------------------\n");
@@ -1615,7 +1615,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) {
             reqD = new RequestDebug(reqno, Thread.currentThread().toString());
             rs.setUserObject(reqD);
             if (prArr == null)
-              prArr = new ArrayList(10000);
+              prArr = new ArrayList<>(10000);
             prArr.add((int) reqno, rs);
           }
 
@@ -1782,7 +1782,7 @@ private void printBadURLPage(PrintWriter pw) {
   // **************************************************************************
 
   // debug
-  private ArrayList prArr = null;
+  private ArrayList<ReqState> prArr = null;
 
   private static class RequestDebug {
     long reqno;

tds/src/main/java/thredds/server/admin/AdminLogController.java

@@ -58,17 +58,15 @@ protected ModelAndView handleRequestInternal(HttpServletRequest req, HttpServlet
     if (path.equals("access/current")) {
 
       File dir = tdsContext.getTomcatLogDirectory();
-      File[] files = dir.listFiles((dir1, name) -> {
-        return name.startsWith("access");
-      });
+      File[] files = dir.listFiles((dir1, name) -> name.startsWith("access"));
       if ((files == null) || (files.length == 0)) {
         res.sendError(HttpServletResponse.SC_NOT_FOUND);
         return null;
       }
 
-      List fileList = Arrays.asList(files);
+      List<File> fileList = Arrays.asList(files);
       Collections.sort(fileList);
-      file = (File) fileList.get(fileList.size() - 1); // last one
+      file = fileList.get(fileList.size() - 1);
 
     } else if (path.equals("access/")) {
       showFiles(tdsContext.getTomcatLogDirectory(), "access", res);
@@ -105,9 +103,7 @@ protected ModelAndView handleRequestInternal(HttpServletRequest req, HttpServlet
   }
 
   private void showFiles(File dir, final String filter, HttpServletResponse res) throws IOException {
-    File[] files = dir.listFiles((dir1, name) -> {
-      return name.contains(filter);
-    });
+    File[] files = dir.listFiles((dir1, name) -> name.contains(filter));
 
     if ((files == null) || (files.length == 0)) {
       res.sendError(HttpServletResponse.SC_NOT_FOUND);

tds/src/main/java/thredds/servlet/ServletUtil.java

@@ -394,8 +394,8 @@ public static void forwardToCatalogServices(HttpServletRequest req, HttpServletR
   static public void showSystemProperties(PrintStream out) {
 
     Properties sysp = System.getProperties();
-    Enumeration e = sysp.propertyNames();
-    List<String> list = Collections.list(e);
+    Set<String> propertyNames = sysp.stringPropertyNames();
+    List<String> list = new ArrayList<>(propertyNames);
     Collections.sort(list);
 
     out.println("System Properties:");