This is an automated email from the ASF dual-hosted git repository. mbien pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/roller.git
commit 625a309d5a7e8fa1ab755ee5ec7e5f613427450e Author: Michael Bien <[email protected]> AuthorDate: Fri Jul 9 05:09:50 2021 +0200 pojos: compiler warning fixes combined with collection improvements. --- .../apache/roller/weblogger/pojos/MediaFile.java | 14 +++------ .../org/apache/roller/weblogger/pojos/Weblog.java | 34 ++++++++++------------ .../apache/roller/weblogger/pojos/WeblogEntry.java | 32 +++++++++----------- .../roller/weblogger/pojos/WeblogPermission.java | 9 +----- .../roller/weblogger/pojos/WeblogTemplate.java | 9 +----- 5 files changed, 34 insertions(+), 64 deletions(-) diff --git a/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java b/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java index e753c08..b94749b 100644 --- a/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java +++ b/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java @@ -43,8 +43,7 @@ public class MediaFile implements Serializable { private static final long serialVersionUID = -6704258422169734004L; - private static Log log = LogFactory.getFactory().getInstance( - MediaFile.class); + private static final Log log = LogFactory.getFactory().getInstance(MediaFile.class); private String id = UUIDGenerator.generateUUID(); @@ -226,12 +225,7 @@ public class MediaFile implements Serializable { } } - MediaFileTag tag = new MediaFileTag(); - tag.setName(name); - tag.setMediaFile(this); - - tagSet.add(tag); - + tagSet.add(new MediaFileTag(name, this)); addedTags.add(name); } @@ -239,11 +233,11 @@ public class MediaFile implements Serializable { removedTags.add(name); } - public Set getAddedTags() { + public Set<String> getAddedTags() { return addedTags; } - public Set getRemovedTags() { + public Set<String> getRemovedTags() { return removedTags; } diff --git a/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java b/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java index dd02445..a6c7393 100644 --- a/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java +++ b/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java @@ -644,9 +644,8 @@ public class Weblog implements Serializable { if (length > MAX_ENTRIES) { length = MAX_ENTRIES; } - List<WeblogEntry> recentEntries = new ArrayList<>(); if (length < 1) { - return recentEntries; + return Collections.emptyList(); } try { WeblogEntryManager wmgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); @@ -655,11 +654,11 @@ public class Weblog implements Serializable { wesc.setCatName(cat); wesc.setStatus(PubStatus.PUBLISHED); wesc.setMaxResults(length); - recentEntries = wmgr.getWeblogEntries(wesc); + return wmgr.getWeblogEntries(wesc); } catch (WebloggerException e) { log.error("ERROR: getting recent entries", e); } - return recentEntries; + return Collections.emptyList(); } /** @@ -675,13 +674,12 @@ public class Weblog implements Serializable { if (length > MAX_ENTRIES) { length = MAX_ENTRIES; } - List<WeblogEntry> recentEntries = new ArrayList<>(); - List<String> tags = new ArrayList<>(); - if (tag != null) { - tags.add(tag); - } if (length < 1) { - return recentEntries; + return Collections.emptyList(); + } + List<String> tags = Collections.emptyList(); + if (tag != null) { + tags = List.of(tag); } try { WeblogEntryManager wmgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); @@ -690,11 +688,11 @@ public class Weblog implements Serializable { wesc.setTags(tags); wesc.setStatus(PubStatus.PUBLISHED); wesc.setMaxResults(length); - recentEntries = wmgr.getWeblogEntries(wesc); + return wmgr.getWeblogEntries(wesc); } catch (WebloggerException e) { log.error("ERROR: getting recent entries", e); } - return recentEntries; + return Collections.emptyList(); } /** @@ -706,9 +704,8 @@ public class Weblog implements Serializable { if (length > MAX_ENTRIES) { length = MAX_ENTRIES; } - List<WeblogEntryComment> recentComments = new ArrayList<>(); if (length < 1) { - return recentComments; + return Collections.emptyList(); } try { WeblogEntryManager wmgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); @@ -717,11 +714,11 @@ public class Weblog implements Serializable { csc.setStatus(WeblogEntryComment.ApprovalStatus.APPROVED); csc.setReverseChrono(true); csc.setMaxResults(length); - recentComments = wmgr.getComments(csc); + return wmgr.getComments(csc); } catch (WebloggerException e) { log.error("ERROR: getting recent comments", e); } - return recentComments; + return Collections.emptyList(); } @@ -771,7 +768,6 @@ public class Weblog implements Serializable { * @return Collection of WeblogEntryTag objects */ public List<TagStat> getPopularTags(int sinceDays, int length) { - List<TagStat> results = new ArrayList<>(); Date startDate = null; if(sinceDays > 0) { Calendar cal = Calendar.getInstance(); @@ -782,11 +778,11 @@ public class Weblog implements Serializable { try { Weblogger roller = WebloggerFactory.getWeblogger(); WeblogEntryManager wmgr = roller.getWeblogEntryManager(); - results = wmgr.getPopularTags(this, startDate, 0, length); + return wmgr.getPopularTags(this, startDate, 0, length); } catch (Exception e) { log.error("ERROR: fetching popular tags for weblog " + this.getName(), e); } - return results; + return Collections.emptyList(); } public long getCommentCount() { diff --git a/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java b/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java index 448e0df..18fe3a8 100644 --- a/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java +++ b/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java @@ -23,7 +23,6 @@ import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.sql.Timestamp; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; import java.util.Collections; @@ -61,8 +60,7 @@ import org.apache.roller.weblogger.util.Utilities; * Represents a Weblog Entry. */ public class WeblogEntry implements Serializable { - private static Log mLogger = - LogFactory.getFactory().getInstance(WeblogEntry.class); + private static final Log mLogger = LogFactory.getFactory().getInstance(WeblogEntry.class); public static final long serialVersionUID = 2341505386843044125L; @@ -234,9 +232,7 @@ public class WeblogEntry implements Serializable { * Added for symmetry with PlanetEntryData object. */ public List<WeblogCategory> getCategories() { - List<WeblogCategory> cats = new ArrayList<>(); - cats.add(getCategory()); - return cats; + return List.of(getCategory()); } public Weblog getWebsite() { @@ -356,7 +352,7 @@ public class WeblogEntry implements Serializable { return attSet; } - public void setEntryAttributes(Set atts) { + public void setEntryAttributes(Set<WeblogEntryAttribute> atts) { this.attSet = atts; } @@ -609,8 +605,8 @@ public class WeblogEntry implements Serializable { } // remove old ones no longer passed. - for (Iterator it = tagSet.iterator(); it.hasNext();) { - WeblogEntryTag tag = (WeblogEntryTag) it.next(); + for (Iterator<WeblogEntryTag> it = tagSet.iterator(); it.hasNext();) { + WeblogEntryTag tag = it.next(); if (!newTags.contains(tag.getName())) { // tag no longer listed in UI, needs removal from DB removedTags.add(tag); @@ -724,7 +720,6 @@ public class WeblogEntry implements Serializable { * TODO: why is this method exposed to users with ability to get spam/non-approved comments? */ public List<WeblogEntryComment> getComments(boolean ignoreSpam, boolean approvedOnly) { - List<WeblogEntryComment> list = new ArrayList<>(); try { WeblogEntryManager wmgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); @@ -734,12 +729,12 @@ public class WeblogEntry implements Serializable { csc.setStatus(approvedOnly ? WeblogEntryComment.ApprovalStatus.APPROVED : null); return wmgr.getComments(csc); } catch (WebloggerException alreadyLogged) {} - return list; + + return Collections.emptyList(); } public int getCommentCount() { - List comments = getComments(true, true); - return comments.size(); + return getComments(true, true).size(); } //------------------------------------------------------------------------ @@ -882,7 +877,7 @@ public class WeblogEntry implements Serializable { if (getPlugins() != null) { return Arrays.asList( StringUtils.split(getPlugins(), ",") ); } - return new ArrayList<>(); + return Collections.emptyList(); } /** Convenience method for checking status */ @@ -928,7 +923,7 @@ public class WeblogEntry implements Serializable { return true; } - WeblogPermission perm = null; + WeblogPermission perm; try { // if user is an author then post status defaults to PUBLISHED, otherwise PENDING UserManager umgr = WebloggerFactory.getWeblogger().getUserManager(); @@ -954,7 +949,7 @@ public class WeblogEntry implements Serializable { mLogger.debug("Applying page plugins to string"); Map<String, WeblogEntryPlugin> inPlugins = getWebsite().getInitializedPlugins(); if (str != null && inPlugins != null) { - List entryPlugins = getPluginsList(); + List<String> entryPlugins = getPluginsList(); // if no Entry plugins, don't bother looping. if (entryPlugins != null && !entryPlugins.isEmpty()) { @@ -988,7 +983,7 @@ public class WeblogEntry implements Serializable { */ public String displayContent(String readMoreLink) { - String displayContent = null; + String displayContent; if(readMoreLink == null || readMoreLink.isBlank() || "nil".equals(readMoreLink)) { @@ -1005,8 +1000,7 @@ public class WeblogEntry implements Serializable { displayContent = this.getTransformedSummary(); if(StringUtils.isNotEmpty(this.getText())) { // add read more - List<String> args = new ArrayList<>(); - args.add(readMoreLink); + List<String> args = List.of(readMoreLink); // TODO: we need a more appropriate way to get the view locale here String readMore = I18nMessages.getMessages(getWebsite().getLocaleInstance()).getString("macro.weblog.readMoreLink", args); diff --git a/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java b/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java index a220c95..803d0ff 100644 --- a/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java +++ b/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java @@ -20,7 +20,6 @@ package org.apache.roller.weblogger.pojos; import java.io.Serializable; import java.security.Permission; -import java.util.ArrayList; import java.util.List; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; @@ -36,13 +35,7 @@ public class WeblogPermission extends ObjectPermission implements Serializable { public static final String EDIT_DRAFT = "edit_draft"; public static final String POST = "post"; public static final String ADMIN = "admin"; - public static final List<String> ALL_ACTIONS = new ArrayList<>(); - - static { - ALL_ACTIONS.add(EDIT_DRAFT); - ALL_ACTIONS.add(POST); - ALL_ACTIONS.add(ADMIN); - } + public static final List<String> ALL_ACTIONS = List.of(EDIT_DRAFT, POST, ADMIN); public WeblogPermission() { // required by JPA diff --git a/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java b/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java index b35a704..7cde4a1 100644 --- a/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java +++ b/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java @@ -26,7 +26,6 @@ import org.apache.roller.weblogger.WebloggerException; import java.io.Serializable; import java.util.ArrayList; import java.util.Date; -import java.util.HashSet; import java.util.List; import java.util.Set; @@ -41,7 +40,7 @@ public class WeblogTemplate implements ThemeTemplate, Serializable { public static final long serialVersionUID = -613737191638263428L; public static final String DEFAULT_PAGE = "Weblog"; - private static Set<String> requiredTemplates = null; + private static final Set<String> requiredTemplates = Set.of("Weblog", "_day"); // attributes private String id = UUIDGenerator.generateUUID(); @@ -57,12 +56,6 @@ public class WeblogTemplate implements ThemeTemplate, Serializable { // associations private Weblog weblog = null; - static { - requiredTemplates = new HashSet<>(); - requiredTemplates.add("Weblog"); - requiredTemplates.add("_day"); - } - public WeblogTemplate() {} @Override
