Fix clicking on revision in annotation mode returns 400

fixes #3689

Author: ahornace

opengrok-indexer/src/main/java/org/opengrok/indexer/history/GitRepository.java

@@ -28,6 +28,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Date;
 import java.util.HashSet;
@@ -324,14 +325,15 @@ public Annotation annotate(File file, String revision) throws IOException {
         if (revision == null) {
             revision = getFirstRevision(filePath);
         }
-        Annotation annotation = getAnnotation(revision, filePath);
+        String fileName = Path.of(filePath).getFileName().toString();
+        Annotation annotation = getAnnotation(revision, filePath, fileName);
 
         if (annotation.getRevisions().isEmpty() && isHandleRenamedFiles()) {
             // The file might have changed its location if it was renamed.
             // Try to lookup its original name and get the annotation again.
             String origName = findOriginalName(file.getCanonicalPath(), revision);
             if (origName != null) {
-                annotation = getAnnotation(revision, origName);
+                annotation = getAnnotation(revision, origName, fileName);
             }
         }
 
@@ -361,8 +363,8 @@ private String getFirstRevision(String filePath) {
     }
 
     @NotNull
-    private Annotation getAnnotation(String revision, String filePath) throws IOException {
-        Annotation annotation = new Annotation(filePath);
+    private Annotation getAnnotation(String revision, String filePath, String fileName) throws IOException {
+        Annotation annotation = new Annotation(fileName);
 
         try (org.eclipse.jgit.lib.Repository repository = getJGitRepository(getDirectoryName())) {
             BlameCommand blameCommand = new Git(repository).blame().setFilePath(getGitFilePath(filePath));

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

@@ -34,7 +34,6 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.io.UnsupportedEncodingException;
 import java.io.Writer;
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -913,15 +912,7 @@ public static void writeHAD(Writer out, String ctxE, String entry,
      * @see URLEncoder#encode(String, String)
      */
     public static String URIEncode(String q) {
-        try {
-            return q == null ? "" : URLEncoder.encode(q,
-                StandardCharsets.UTF_8.name());
-        } catch (UnsupportedEncodingException e) {
-            // Should not happen. UTF-8 must be supported by JVMs.
-            LOGGER.log(
-                    Level.WARNING, "Failed to URL-encode UTF-8: ", e);
-        }
-        return null;
+        return q == null ? "" : URLEncoder.encode(q, StandardCharsets.UTF_8);
     }
 
     /**
@@ -1680,15 +1671,8 @@ public static Map<String, List<String>> getQueryParams(final URL url) {
                 continue;
             }
 
-            String key = pair.substring(0, idx);
-            String value = pair.substring(idx + 1);
-
-            try {
-                key = URLDecoder.decode(key, StandardCharsets.UTF_8.toString());
-                value = URLDecoder.decode(value, StandardCharsets.UTF_8.toString());
-            } catch (UnsupportedEncodingException e) {
-                throw new IllegalStateException("Could not find UTF-8 encoding", e);
-            }
+            String key = URLDecoder.decode(pair.substring(0, idx), StandardCharsets.UTF_8);
+            String value = URLDecoder.decode(pair.substring(idx + 1), StandardCharsets.UTF_8);
 
             List<String> paramValues = returnValue.computeIfAbsent(key, k -> new LinkedList<>());
             paramValues.add(value);