getRevisionLocation() can be simplified without null handling

Author: idodeclare

opengrok-indexer/src/main/java/org/opengrok/indexer/web/PageConfig.java

@@ -1334,16 +1334,12 @@ public boolean isLatestRevision(String rev) {
 
     /**
      * Get the location of cross reference for given file containing the given revision.
-     * @param revStr revision string
-     * @return location to redirect to or null if revision string is empty
+     * @param revStr defined revision string
+     * @return location to redirect to
      */
     public String getRevisionLocation(String revStr) {
         StringBuilder sb = new StringBuilder();
 
-        if (revStr == null) {
-            return null;
-        }
-
         sb.append(req.getContextPath());
         sb.append(Prefix.XREF_P);
         sb.append(Util.URIEncodePath(path));

opengrok-indexer/src/test/java/org/opengrok/indexer/web/PageConfigTest.java

@@ -19,6 +19,7 @@
 
 /*
  * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Portions Copyright (c) 2020, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.web;
 
@@ -332,9 +333,6 @@ public String getPathInfo() {
         PageConfig cfg = PageConfig.get(req2);
         String rev = cfg.getLatestRevision();
         assertNull(rev);
-
-        String location = cfg.getRevisionLocation(cfg.getLatestRevision());
-        assertNull(location);
     }
 
     @Test

opengrok-web/src/main/webapp/list.jsp

@@ -76,8 +76,9 @@ final String DUMMY_REVISION = "unknown";
          * Get the latest revision and redirect so that the revision number
          * appears in the URL.
          */
-        String location = cfg.getRevisionLocation(cfg.getLatestRevision());
-        if (location != null) {
+        String latestRevision = cfg.getLatestRevision();
+        if (latestRevision != null) {
+            String location = cfg.getRevisionLocation(latestRevision);
             response.sendRedirect(location);
             return;
         }
@@ -88,7 +89,7 @@ final String DUMMY_REVISION = "unknown";
              * revision string so that xref can be generated from the resource
              * file directly.
              */
-            location = cfg.getRevisionLocation(DUMMY_REVISION);
+            String location = cfg.getRevisionLocation(DUMMY_REVISION);
             response.sendRedirect(location);
             return;
         }