📄 Update year in file headers

[Sone.git] / src / main / java / net / pterodactylus / sone / template / RequestChangeFilter.java

diff --git a/src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java b/src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java
index bd35fa4..16cb062 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java
@@ -1,5 +1,5 @@
 /*
- * Sone - RequestChangeFilter.java - Copyright © 2010 David Roden
+ * Sone - RequestChangeFilter.java - Copyright © 2010–2020 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,17 +26,14 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import net.pterodactylus.sone.web.page.Page.Request;
-import net.pterodactylus.util.template.DataProvider;
+import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.template.Filter;
+import net.pterodactylus.util.template.TemplateContext;
 
 /**
- * This filter expects a {@link Request} as input and outputs a {@link URI} that
- * is modified by the parameters. The name of the parameter is handed in as
- * “name”, the value may either be stored in “value”, or in a template variable
- * whose key is stored in “key”.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+ * This filter expects a {@link FreenetRequest} as input and outputs a
+ * {@link URI} that is modified by the parameters. The name of the parameter is
+ * handed in as “name”, the new value is stored in “value”.
  */
 public class RequestChangeFilter implements Filter {
 
@@ -44,26 +41,12 @@ public class RequestChangeFilter implements Filter {
         * {@inheritDoc}
         */
        @Override
-       public Object format(DataProvider dataProvider, Object data, Map<String, String> parameters) {
-               Request request = (Request) data;
-               String name = parameters.get("name");
-               String nameKey = parameters.get("nameKey");
-               if (nameKey != null) {
-                       name = String.valueOf(dataProvider.getData(nameKey));
-               }
-               String key = parameters.get("key");
-               String value = null;
-               if (key != null) {
-                       value = String.valueOf(dataProvider.getData(key));
-               }
-               if (value == null) {
-                       value = parameters.get("value");
-               }
-               if (value == null) {
-                       return request.getUri();
-               }
+       public Object format(TemplateContext templateContext, Object data, Map<String, Object> parameters) {
+               FreenetRequest request = (FreenetRequest) data;
+               String name = String.valueOf(parameters.get("name"));
+               String value = String.valueOf(parameters.get("value"));
 
-               Map<String, String> values = new HashMap<String, String>();
+               Map<String, String> values = new HashMap<>();
                Collection<String> parameterNames = request.getHttpRequest().getParameterNames();
                for (String parameterName : parameterNames) {
                        values.put(parameterName, request.getHttpRequest().getParam(parameterName));
@@ -83,9 +66,7 @@ public class RequestChangeFilter implements Filter {
                        if (questionMark == -1) {
                                questionMark = oldUri.length();
                        }
-                       URI u = new URI(oldUri.substring(0, questionMark) + query.toString());
-                       System.out.println("u: " + u);
-                       return u;
+                       return new URI(oldUri.substring(0, questionMark) + query.toString());
                } catch (UnsupportedEncodingException uee1) {
                        /* UTF-8 not supported? I don’t think so. */
                } catch (URISyntaxException use1) {