From 850c7a5bcc59cf5fb8a1e024c6a09d826ac905ed Mon Sep 17 00:00:00 2001 From: DittoTool <90056662+DittoTool@users.noreply.github.com> Date: Tue, 14 Sep 2021 19:57:11 +0800 Subject: [PATCH 1/3] Transform TreeMap to HashMap --- .../roller/weblogger/business/jpa/JPAWeblogManagerImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java index 8fa1df699..83d5e8485 100644 --- a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java +++ b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java @@ -37,7 +37,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.TreeMap; import org.apache.roller.weblogger.business.MediaFileManager; import org.apache.roller.weblogger.business.UserManager; @@ -614,7 +613,7 @@ public List getTemplates(Weblog weblog) throws WebloggerExceptio @Override public Map getWeblogHandleLetterMap() throws WebloggerException { String lc = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - Map results = new TreeMap<>(); + Map results = new HashMap<>(); TypedQuery query = strategy.getNamedQuery( "Weblog.getCountByHandleLike", Long.class); for (int i=0; i<26; i++) { From 7e46a117e13d319300c14dfb273f7dc30303694a Mon Sep 17 00:00:00 2001 From: DittoTool <90056662+DittoTool@users.noreply.github.com> Date: Tue, 14 Sep 2021 20:11:23 +0800 Subject: [PATCH 2/3] Transform four Arraylist to HashSet --- .../weblogger/pojos/RollerPermission.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/apache/roller/weblogger/pojos/RollerPermission.java b/app/src/main/java/org/apache/roller/weblogger/pojos/RollerPermission.java index eb2f38370..bd5b0372b 100644 --- a/app/src/main/java/org/apache/roller/weblogger/pojos/RollerPermission.java +++ b/app/src/main/java/org/apache/roller/weblogger/pojos/RollerPermission.java @@ -19,6 +19,8 @@ package org.apache.roller.weblogger.pojos; import java.util.List; +import java.util.Set; +import java.util.HashSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.roller.weblogger.util.Utilities; @@ -49,14 +51,14 @@ public void setActionsAsList(List actionsList) { } public boolean hasAction(String action) { - List actionList = getActionsAsList(); - return actionList.contains(action); + Set actionSet = new HashSet<>(getActionsAsList()); + return actionSet.contains(action); } public boolean hasActions(List actionsToCheck) { - List actionList = getActionsAsList(); + Set actionSet = new HashSet<>(getActionsAsList()); for (String actionToCheck : actionsToCheck) { - if (!actionList.contains(actionToCheck)) { + if (!actionSet.contains(actionToCheck)) { return false; } } @@ -68,9 +70,9 @@ public boolean hasActions(List actionsToCheck) { */ public void addActions(ObjectPermission perm) { List newActions = perm.getActionsAsList(); - List updatedActions = getActionsAsList(); + Set updatedActionSet = new HashSet<>(updatedActions); for (String newAction : newActions) { - if (!updatedActions.contains(newAction)) { + if (!updatedActionSet.contains(newAction)) { updatedActions.add(newAction); } } @@ -81,9 +83,9 @@ public void addActions(ObjectPermission perm) { * Merge actions into this permission. */ public void addActions(List newActions) { - List updatedActions = getActionsAsList(); + Set updatedActionSet = new HashSet<>(updatedActions); for (String newAction : newActions) { - if (!updatedActions.contains(newAction)) { + if (!updatedActionSet.contains(newAction)) { updatedActions.add(newAction); } } From b24e89c61951a97157d8872851869bccb9debbb9 Mon Sep 17 00:00:00 2001 From: DittoTool <90056662+DittoTool@users.noreply.github.com> Date: Tue, 14 Sep 2021 20:16:04 +0800 Subject: [PATCH 3/3] Transform ArrayList to HashSet --- .../src/org/apache/roller/scripting/BSFRendererFactory.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/examples/scripting/bsf/src/org/apache/roller/scripting/BSFRendererFactory.java b/docs/examples/scripting/bsf/src/org/apache/roller/scripting/BSFRendererFactory.java index 15f123be3..8ce75d5b6 100644 --- a/docs/examples/scripting/bsf/src/org/apache/roller/scripting/BSFRendererFactory.java +++ b/docs/examples/scripting/bsf/src/org/apache/roller/scripting/BSFRendererFactory.java @@ -20,6 +20,8 @@ import java.util.Arrays; import java.util.List; +import java.util.Set; +import java.util.HashSet; import org.apache.roller.config.RollerConfig; import org.apache.roller.pojos.Template; import org.apache.roller.ui.rendering.Renderer; @@ -31,13 +33,13 @@ */ public class BSFRendererFactory implements RendererFactory { private static String[] names = {"groovy", "jruby", "javascript"}; - private static final List bsfLanguages; + private static final Set bsfLanguages; static { String value = RollerConfig.getProperty("bsfrenderer.languageNames"); if (value != null) { names = Utilities.stringToStringArray(value,","); } - bsfLanguages = Arrays.asList(names); + bsfLanguages = new HashSet<>(Arrays.asList(names)); } public Renderer getRenderer(Template template) { Renderer renderer = null;