Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-04-07 20:55:49 +02:00
Code Issues Projects Releases Wiki Activity

Fixed some code smells

Browse Source
This commit is contained in:
Rsl1122 2019-05-09 14:53:04 +03:00
parent 3e5a1ce793
commit 15535e2469
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Plan/common/src/main/java/com/djrapitops/plan/system/webserver/RequestTarget.java
View File

@ -35,17 +35,15 @@ public class RequestTarget {
resourceString = targetURI.getPath(); resourceString = targetURI.getPath();
resource = Arrays.stream(resourceString.split("/")).filter(part -> !part.isEmpty()).collect(Collectors.toList()); resource = Arrays.stream(resourceString.split("/")).filter(part -> !part.isEmpty()).collect(Collectors.toList());
String parameterString = targetURI.getQuery(); parameters = new TreeMap<>();
parameters = parseParameters(parameterString); parseParameters(targetURI.getQuery());
} }
private Map<String, String> parseParameters(String parameterString) { private void parseParameters(String parameterString) {
if (parameterString == null || parameterString.isEmpty()) { if (parameterString == null || parameterString.isEmpty()) {
return Collections.emptyMap(); return;
} }
TreeMap<String, String> parameters = new TreeMap<>();
String[] keysAndValues = parameterString.split("&"); String[] keysAndValues = parameterString.split("&");
for (String kv : keysAndValues) { for (String kv : keysAndValues) {
if (kv.isEmpty()) { if (kv.isEmpty()) {
@ -56,8 +54,6 @@ public class RequestTarget {
parameters.put(keyAndValue[0], keyAndValue[1]); parameters.put(keyAndValue[0], keyAndValue[1]);
} }
} }
return parameters;
} }
public boolean isEmpty() { public boolean isEmpty() {

4
Plan/common/src/main/java/com/djrapitops/plan/system/webserver/ResponseHandler.java
View File

@ -139,15 +139,13 @@ public class ResponseHandler extends TreePageHandler {
} }
boolean isNotInfoRequest = target.isEmpty() || !target.get(0).equals("info"); boolean isNotInfoRequest = target.isEmpty() || !target.get(0).equals("info");
boolean isAuthRequired = webServer.get().isAuthRequired() && isNotInfoRequest; boolean isAuthRequired = webServer.get().isAuthRequired() && isNotInfoRequest;
if (isAuthRequired) { if (isAuthRequired && !authentication.isPresent()) {
if (!authentication.isPresent()) {
if (webServer.get().isUsingHTTPS()) { if (webServer.get().isUsingHTTPS()) {
return responseFactory.basicAuth(); return responseFactory.basicAuth();
} else { } else {
return responseFactory.forbidden403(); return responseFactory.forbidden403();
} }
} }
}
PageHandler pageHandler = getPageHandler(target); PageHandler pageHandler = getPageHandler(target);
if (pageHandler == null) { if (pageHandler == null) {
return responseFactory.pageNotFound404(); return responseFactory.pageNotFound404();