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 5d0279b5bb63955923953cb9a70dda81f9f3a3ae
Author: Michael Bien <mbie...@gmail.com>
AuthorDate: Thu Jul 8 03:52:32 2021 +0200
Models: refactoring and compiler warning fixes.
---
.../ui/rendering/model/CalendarModel.java | 4 +-
.../weblogger/ui/rendering/model/ConfigModel.java | 2 +-
.../weblogger/ui/rendering/model/FeedModel.java | 39 ++++++-----
.../weblogger/ui/rendering/model/MenuModel.java | 4 +-
.../weblogger/ui/rendering/model/MessageModel.java | 4 +-
.../roller/weblogger/ui/rendering/model/Model.java | 2 +-
.../weblogger/ui/rendering/model/ModelLoader.java | 2 +-
.../weblogger/ui/rendering/model/PageModel.java | 17 ++---
.../weblogger/ui/rendering/model/PlanetModel.java | 13 ++--
.../ui/rendering/model/PreviewPageModel.java | 2 +-
.../ui/rendering/model/PreviewURLModel.java | 2 +-
.../ui/rendering/model/SearchResultsFeedModel.java | 15 +++--
.../ui/rendering/model/SearchResultsModel.java | 15 ++---
.../weblogger/ui/rendering/model/SiteModel.java | 77 ++++++++++------------
.../weblogger/ui/rendering/model/URLModel.java | 12 ++--
.../ui/rendering/model/UtilitiesModel.java | 4 +-
.../apache/roller/weblogger/util/I18nMessages.java | 14 ++--
17 files changed, 113 insertions(+), 115 deletions(-)
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java
index 67746cb..dfb778e 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java
@@ -38,7 +38,7 @@ import
org.apache.roller.weblogger.ui.rendering.util.WeblogRequest;
*/
public class CalendarModel implements Model {
- private static Log log = LogFactory.getLog(CalendarModel.class);
+ private static final Log log = LogFactory.getLog(CalendarModel.class);
private PageContext pageContext = null;
private WeblogPageRequest pageRequest = null;
@@ -53,7 +53,7 @@ public class CalendarModel implements Model {
/** Init page model based on request */
@Override
- public void init(Map initData) throws WebloggerException {
+ public void init(Map<String, Object> initData) throws WebloggerException {
// extract page context
this.pageContext = (PageContext) initData.get("pageContext");
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/ConfigModel.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/ConfigModel.java
index 0c1e946..fb86421 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/ConfigModel.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/ConfigModel.java
@@ -38,7 +38,7 @@ public class ConfigModel implements Model {
/** Init model */
@Override
- public void init(Map map) throws WebloggerException {
+ public void init(Map<String, Object> map) throws WebloggerException {
// no-op
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java
index ec9abda..aa179fc 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java
@@ -25,7 +25,10 @@ import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.URLStrategy;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
+import org.apache.roller.weblogger.pojos.MediaFile;
import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryCommentWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
import org.apache.roller.weblogger.pojos.wrapper.WeblogWrapper;
import org.apache.roller.weblogger.ui.rendering.pagers.CommentsPager;
import org.apache.roller.weblogger.ui.rendering.pagers.MediaFilesPager;
@@ -41,7 +44,7 @@ import org.apache.roller.weblogger.util.URLUtilities;
*/
public class FeedModel implements Model {
- private static int DEFAULT_ENTRIES =
WebloggerRuntimeConfig.getIntProperty("site.newsfeeds.defaultEntries");
+ private static final int DEFAULT_ENTRIES =
WebloggerRuntimeConfig.getIntProperty("site.newsfeeds.defaultEntries");
private WeblogFeedRequest feedRequest = null;
private URLStrategy urlStrategy = null;
@@ -49,7 +52,7 @@ public class FeedModel implements Model {
@Override
- public void init(Map initData) throws WebloggerException {
+ public void init(Map<String, Object> initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
WeblogRequest weblogRequest = (WeblogRequest)
initData.get("parsedRequest");
@@ -119,7 +122,7 @@ public class FeedModel implements Model {
* Gets most recent entries limited by: weblog and category specified in
* request plus the weblog.entryDisplayCount.
*/
- public Pager getWeblogEntriesPager() {
+ public Pager<WeblogEntryWrapper> getWeblogEntriesPager() {
return new FeedEntriesPager(feedRequest);
}
@@ -128,7 +131,7 @@ public class FeedModel implements Model {
* Gets most recent comments limited by: weblog specified in request and
* the weblog.entryDisplayCount.
*/
- public Pager getCommentsPager() {
+ public Pager<WeblogEntryCommentWrapper> getCommentsPager() {
return new FeedCommentsPager(feedRequest);
}
@@ -136,7 +139,7 @@ public class FeedModel implements Model {
* Gets most recently uploaded media files limited by: weblog specified
* in request and the weblog.entryDisplayCount.
*/
- public Pager getMediaFilesPager() {
+ public Pager<MediaFile> getMediaFilesPager() {
return new FeedFilesPager(feedRequest);
}
@@ -144,13 +147,13 @@ public class FeedModel implements Model {
* Returns the list of tags specified in the request /?tags=foo+bar
* @return
*/
- public List getTags() {
+ public List<String> getTags() {
return feedRequest.getTags();
}
public class FeedEntriesPager extends WeblogEntriesListPager {
- private WeblogFeedRequest feedRequest;
+ private final WeblogFeedRequest feedRequest;
public FeedEntriesPager(WeblogFeedRequest feedRequest) {
super(urlStrategy,
urlStrategy.getWeblogFeedURL(feedRequest.getWeblog(),
@@ -162,8 +165,8 @@ public class FeedModel implements Model {
}
@Override
- protected String createURL(String url, Map params) {
- List tags = feedRequest.getTags();
+ protected String createURL(String url, Map<String, String> params) {
+ List<String> tags = feedRequest.getTags();
if(tags != null && !tags.isEmpty()) {
params.put("tags", URLUtilities.getEncodedTagsString(tags));
}
@@ -179,13 +182,13 @@ public class FeedModel implements Model {
@Override
public String getUrl() {
- return createURL(super.getUrl(), new HashMap());
+ return createURL(super.getUrl(), new HashMap<>());
}
}
public class FeedCommentsPager extends CommentsPager {
- private WeblogFeedRequest feedRequest;
+ private final WeblogFeedRequest feedRequest;
public FeedCommentsPager(WeblogFeedRequest feedRequest) {
super(urlStrategy,
urlStrategy.getWeblogFeedURL(feedRequest.getWeblog(),
@@ -196,8 +199,8 @@ public class FeedModel implements Model {
}
@Override
- protected String createURL(String url, Map params) {
- List tags = feedRequest.getTags();
+ protected String createURL(String url, Map<String, String> params) {
+ List<String> tags = feedRequest.getTags();
if(tags != null && !tags.isEmpty()) {
params.put("tags", URLUtilities.getEncodedTagsString(tags));
}
@@ -213,13 +216,13 @@ public class FeedModel implements Model {
@Override
public String getUrl() {
- return createURL(super.getUrl(), new HashMap());
+ return createURL(super.getUrl(), new HashMap<>());
}
}
public class FeedFilesPager extends MediaFilesPager {
- private WeblogFeedRequest feedRequest;
+ private final WeblogFeedRequest feedRequest;
public FeedFilesPager(WeblogFeedRequest feedRequest) {
super(urlStrategy,
urlStrategy.getWeblogFeedURL(feedRequest.getWeblog(),
@@ -230,8 +233,8 @@ public class FeedModel implements Model {
}
@Override
- protected String createURL(String url, Map params) {
- List tags = feedRequest.getTags();
+ protected String createURL(String url, Map<String, String> params) {
+ List<String> tags = feedRequest.getTags();
if(tags != null && !tags.isEmpty()) {
params.put("tags", URLUtilities.getEncodedTagsString(tags));
}
@@ -247,7 +250,7 @@ public class FeedModel implements Model {
@Override
public String getUrl() {
- return createURL(super.getUrl(), new HashMap());
+ return createURL(super.getUrl(), new HashMap<>());
}
}
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/MenuModel.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/MenuModel.java
index 81b383f..4867135 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/MenuModel.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/MenuModel.java
@@ -38,7 +38,7 @@ import
org.apache.roller.weblogger.ui.rendering.util.WeblogRequest;
*/
public class MenuModel implements Model {
- private static Log logger = LogFactory.getLog(MenuModel.class);
+ private static final Log logger = LogFactory.getLog(MenuModel.class);
private WeblogPageRequest pageRequest = null;
@@ -52,7 +52,7 @@ public class MenuModel implements Model {
/** Init page model based on request */
@Override
- public void init(Map initData) throws WebloggerException {
+ public void init(Map<String, Object> initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
WeblogRequest weblogRequest = (WeblogRequest)
initData.get("parsedRequest");
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/MessageModel.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/MessageModel.java
index 2899c32..5936301 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/MessageModel.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/MessageModel.java
@@ -43,7 +43,7 @@ public class MessageModel implements Model {
/** Init page model based on request */
@Override
- public void init(Map initData) throws WebloggerException {
+ public void init(Map<String, Object> initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
WeblogRequest weblogRequest = (WeblogRequest)
initData.get("parsedRequest");
@@ -63,7 +63,7 @@ public class MessageModel implements Model {
/** Return parameterized message string */
- public String get(String key, List args) {
+ public String get(String key, List<Object> args) {
return messages.getString(key, args);
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/Model.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/Model.java
index 01d8d60..dc90c96 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/Model.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/Model.java
@@ -36,6 +36,6 @@ public interface Model {
/**
* Initialize.
*/
- void init(Map params) throws WebloggerException;
+ void init(Map<String, Object> params) throws WebloggerException;
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.java
index 330d133..1a2e9cf 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.java
@@ -39,7 +39,7 @@ public class ModelLoader {
* the Model instances.
*/
public static void loadModels(String modelsString, Map<String, Object>
modelMap,
- Map initData, boolean fail) throws WebloggerException {
+ Map<String, Object> initData, boolean fail) throws
WebloggerException {
String[] models = Utilities.stringToStringArray(modelsString, ",");
if (models != null) {
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java
index 5df4c71..77100e1 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java
@@ -48,12 +48,12 @@ import
org.apache.roller.weblogger.ui.rendering.util.WeblogRequest;
*/
public class PageModel implements Model {
- private static Log log = LogFactory.getLog(PageModel.class);
+ private static final Log log = LogFactory.getLog(PageModel.class);
private WeblogPageRequest pageRequest = null;
private URLStrategy urlStrategy = null;
private WeblogEntryCommentForm commentForm = null;
- private Map requestParameters = null;
+ private Map<String, String[]> requestParameters = null;
private Weblog weblog = null;
private DeviceType deviceType = null;
@@ -79,7 +79,8 @@ public class PageModel implements Model {
* Init page model based on request.
*/
@Override
- public void init(Map initData) throws WebloggerException {
+ @SuppressWarnings("unchecked")
+ public void init(Map<String, Object> initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
WeblogRequest weblogRequest = (WeblogRequest)
initData.get("parsedRequest");
@@ -100,7 +101,7 @@ public class PageModel implements Model {
this.commentForm = (WeblogEntryCommentForm)
initData.get("commentForm");
// custom request parameters
- this.requestParameters = (Map)initData.get("requestParameters");
+ this.requestParameters = (Map<String, String[]>)
initData.get("requestParameters");
// look for url strategy
urlStrategy = (URLStrategy) initData.get("urlStrategy");
@@ -191,7 +192,7 @@ public class PageModel implements Model {
/**
* Returns the list of tags specified in the request /tags/foo+bar
*/
- public List getTags() {
+ public List<String> getTags() {
return pageRequest.getTags();
}
@@ -245,9 +246,9 @@ public class PageModel implements Model {
cat = catArgument;
}
- List tags = pageRequest.getTags();
+ List<String> tags = pageRequest.getTags();
if (tagArgument != null && !StringUtils.isEmpty(tagArgument) &&
!"nil".equals(tagArgument)) {
- tags = new ArrayList();
+ tags = new ArrayList<>();
tags.add(tagArgument);
}
@@ -321,7 +322,7 @@ public class PageModel implements Model {
*/
public String getRequestParameter(String paramName) {
if (requestParameters != null) {
- String[] values = (String[])requestParameters.get(paramName);
+ String[] values = requestParameters.get(paramName);
if (values != null && values.length > 0) {
return values[0];
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java
index bd97ae1..cd3740c 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java
@@ -34,7 +34,6 @@ import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.ThemeTemplate;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.ui.rendering.pagers.Pager;
import org.apache.roller.weblogger.ui.rendering.pagers.PlanetEntriesPager;
import org.apache.roller.weblogger.ui.rendering.util.WeblogPageRequest;
import org.apache.roller.weblogger.ui.rendering.util.WeblogRequest;
@@ -46,7 +45,7 @@ public class PlanetModel implements Model {
public static final String DEFAULT_PLANET_HANDLE = "default";
- private static Log log = LogFactory.getLog(PlanetModel.class);
+ private static final Log log = LogFactory.getLog(PlanetModel.class);
private WeblogRequest weblogRequest = null;
private String pageLink = null;
@@ -63,7 +62,7 @@ public class PlanetModel implements Model {
}
@Override
- public void init(Map initData) throws WebloggerException {
+ public void init(Map<String, Object> initData) throws WebloggerException {
if (!WebloggerConfig.getBooleanProperty("planet.aggregator.enabled")) {
return;
@@ -99,7 +98,7 @@ public class PlanetModel implements Model {
* 'exernal' Planet groups. in reverse chrono order.
* @param length Max number of results to return
*/
- public Pager getAggregationPager(int sinceDays, int length) {
+ public PlanetEntriesPager getAggregationPager(int sinceDays, int length) {
String pagerUrl = urlStrategy.getWeblogPageURL(weblog,
weblogRequest.getLocale(), pageLink,
@@ -121,7 +120,7 @@ public class PlanetModel implements Model {
* Planet groups in reverse chrono order.
* @param length Max number of results to return
*/
- public Pager getAggregationPager(String groupHandle, int sinceDays, int
length) {
+ public PlanetEntriesPager getAggregationPager(String groupHandle, int
sinceDays, int length) {
String pagerUrl = urlStrategy.getWeblogPageURL(weblog,
weblogRequest.getLocale(), pageLink,
@@ -143,7 +142,7 @@ public class PlanetModel implements Model {
* Planet feed in reverse chrono order.
* @param length Max number of results to return
*/
- public Pager getFeedPager(String feedURL, int length) {
+ public PlanetEntriesPager getFeedPager(String feedURL, int length) {
String pagerUrl = urlStrategy.getWeblogPageURL(weblog,
weblogRequest.getLocale(), pageLink,
@@ -199,7 +198,7 @@ public class PlanetModel implements Model {
* @return List of Planet groups defined.
*/
public List<PlanetGroup> getGroups() {
- List list = new ArrayList<PlanetGroup>();
+ List<PlanetGroup> list = new ArrayList<>();
try {
PlanetManager planetManager =
WebloggerFactory.getWeblogger().getPlanetManager();
Planet defaultPlanet =
planetManager.getWeblogger(DEFAULT_PLANET_HANDLE);
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java
index f9873db..8c39b9c 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java
@@ -43,7 +43,7 @@ public class PreviewPageModel extends PageModel {
* Init model.
*/
@Override
- public void init(Map initData) throws WebloggerException {
+ public void init(Map<String, Object> initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
WeblogRequest weblogRequest = (WeblogRequest)
initData.get("parsedRequest");
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PreviewURLModel.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PreviewURLModel.java
index f2392b6..0130ddc 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PreviewURLModel.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PreviewURLModel.java
@@ -38,7 +38,7 @@ public class PreviewURLModel extends URLModel {
@Override
- public void init(Map initData) throws WebloggerException {
+ public void init(Map<String, Object> initData) throws WebloggerException {
// need a weblog request so that we can know the weblog and locale
WeblogRequest weblogRequest = (WeblogRequest)
initData.get("parsedRequest");
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java
index d37147e..ce6f9be 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java
@@ -20,8 +20,9 @@ package org.apache.roller.weblogger.ui.rendering.model;
import java.io.IOException;
import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.Date;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -67,9 +68,9 @@ public class SearchResultsFeedModel implements Model {
// the pager used by the 3.0+ rendering system
private SearchResultsFeedPager pager = null;
- private List<WeblogEntryWrapper> results = new LinkedList<>();
+ private final List<WeblogEntryWrapper> results = new ArrayList<>();
- private Set categories = new TreeSet();
+ private Set<String> categories = Collections.emptySet();
private boolean websiteSpecificSearch = true;
@@ -85,7 +86,7 @@ public class SearchResultsFeedModel implements Model {
}
@Override
- public void init(Map initData) throws WebloggerException {
+ public void init(Map<String, Object> initData) throws
WebloggerException {
// we expect the init data to contain a weblogRequest object
WeblogRequest weblogRequest = (WeblogRequest) initData
@@ -165,7 +166,7 @@ public class SearchResultsFeedModel implements Model {
(hits > (offset + limit)));
}
- public Pager getSearchResultsPager() {
+ public Pager<WeblogEntryWrapper> getSearchResultsPager() {
return pager;
}
@@ -261,11 +262,11 @@ public class SearchResultsFeedModel implements Model {
return limit;
}
- public List getResults() {
+ public List<WeblogEntryWrapper> getResults() {
return results;
}
- public Set getCategories() {
+ public Set<String> getCategories() {
return categories;
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java
index e897ecf..9f7ebb2 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java
@@ -65,8 +65,7 @@ public class SearchResultsModel extends PageModel {
private URLStrategy urlStrategy = null;
// the actual search results mapped by Day -> Set of entries
- private Map<Date, TreeSet<WeblogEntryWrapper>> results
- = new TreeMap<>(Collections.reverseOrder());
+ private final Map<Date, Set<WeblogEntryWrapper>> results = new
TreeMap<>(Collections.reverseOrder());
// the pager used by the 3.0+ rendering system
private SearchResultsPager pager = null;
@@ -74,12 +73,12 @@ public class SearchResultsModel extends PageModel {
private int hits = 0;
private int offset = 0;
private int limit = 0;
- private Set categories = new TreeSet();
+ private Set<String> categories = new TreeSet<String>();
private boolean websiteSpecificSearch = true;
private String errorMessage = null;
@Override
- public void init(Map initData) throws WebloggerException {
+ public void init(Map<String, Object> initData) throws
WebloggerException {
// we expect the init data to contain a searchRequest object
searchRequest = (WeblogSearchRequest)
initData.get("searchRequest");
@@ -196,7 +195,7 @@ public class SearchResultsModel extends PageModel {
}
try {
- TreeSet<String> categorySet = new TreeSet<>();
+ Set<String> categorySet = new TreeSet<>();
Weblogger roller = WebloggerFactory.getWeblogger();
WeblogEntryManager weblogMgr =
roller.getWeblogEntryManager();
@@ -241,7 +240,7 @@ public class SearchResultsModel extends PageModel {
// ensure we do not get duplicates from Lucene by
// using a Set Collection. Entries sorted by pubTime.
- TreeSet<WeblogEntryWrapper> set = this.results.get(midnight);
+ Set<WeblogEntryWrapper> set = this.results.get(midnight);
if (set == null) {
// date is not mapped yet, so we need a new Set
set = new TreeSet<>(new WeblogEntryWrapperComparator());
@@ -273,11 +272,11 @@ public class SearchResultsModel extends PageModel {
return limit;
}
- public Map getResults() {
+ public Map<Date, Set<WeblogEntryWrapper>> getResults() {
return results;
}
- public Set getCategories() {
+ public Set<String> getCategories() {
return categories;
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
index 96b0862..c978b0e 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
@@ -20,8 +20,8 @@ package org.apache.roller.weblogger.ui.rendering.model;
import java.util.ArrayList;
import java.util.Calendar;
+import java.util.Collections;
import java.util.Date;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
@@ -43,6 +43,7 @@ import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.wrapper.UserWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryCommentWrapper;
import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
import org.apache.roller.weblogger.pojos.wrapper.WeblogWrapper;
import org.apache.roller.weblogger.ui.rendering.pagers.CommentsPager;
@@ -60,12 +61,12 @@ import
org.apache.roller.weblogger.ui.rendering.util.WeblogRequest;
*/
public class SiteModel implements Model {
- private static Log log = LogFactory.getLog(SiteModel.class);
+ private static final Log log = LogFactory.getLog(SiteModel.class);
private Weblog weblog = null;
private WeblogRequest weblogRequest = null;
private WeblogFeedRequest feedRequest = null;
- private List tags = new ArrayList();
+ private List<String> tags = Collections.emptyList();
private String pageLink = null;
private int pageNum = 0;
@@ -78,7 +79,7 @@ public class SiteModel implements Model {
}
@Override
- public void init(Map initData) throws WebloggerException {
+ public void init(Map<String, Object> initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
this.weblogRequest = (WeblogRequest) initData.get("parsedRequest");
@@ -114,7 +115,7 @@ public class SiteModel implements Model {
* @param sinceDays Limit to past X days in past (or -1 for no limit)
* @param length Max number of results to return
*/
- public Pager getWeblogEntriesPager(int sinceDays, int length) {
+ public Pager<WeblogEntryWrapper> getWeblogEntriesPager(int sinceDays, int
length) {
String pagerUrl;
@@ -147,7 +148,7 @@ public class SiteModel implements Model {
* @param sinceDays Limit to past X days in past (or -1 for no limit)
* @param length Max number of results to return
*/
- public Pager getWeblogEntriesPager(WeblogWrapper queryWeblog, int
sinceDays, int length) {
+ public Pager<WeblogEntryWrapper> getWeblogEntriesPager(WeblogWrapper
queryWeblog, int sinceDays, int length) {
return getWeblogEntriesPager(queryWeblog, null, null, sinceDays,
length);
}
@@ -159,7 +160,7 @@ public class SiteModel implements Model {
* @param sinceDays Limit to past X days in past (or -1 for no limit)
* @param length Max number of results to return
*/
- public Pager getWeblogEntriesPager(WeblogWrapper queryWeblog, User user,
int sinceDays, int length) {
+ public Pager<WeblogEntryWrapper> getWeblogEntriesPager(WeblogWrapper
queryWeblog, User user, int sinceDays, int length) {
return getWeblogEntriesPager(queryWeblog, user, null, sinceDays,
length);
}
@@ -172,7 +173,7 @@ public class SiteModel implements Model {
* @param sinceDays Limit to past X days in past (or -1 for no limit)
* @param length Max number of results to return
*/
- public Pager getWeblogEntriesPager(WeblogWrapper queryWeblog, User user,
String cat, int sinceDays, int length) {
+ public Pager<WeblogEntryWrapper> getWeblogEntriesPager(WeblogWrapper
queryWeblog, User user, String cat, int sinceDays, int length) {
String pagerUrl;
if (feedRequest != null) {
@@ -203,7 +204,7 @@ public class SiteModel implements Model {
* @param offset Offset into results (for paging)
* @param len Max number of results to return
*/
- public Pager getCommentsPager(int sinceDays, int length) {
+ public Pager<WeblogEntryCommentWrapper> getCommentsPager(int sinceDays,
int length) {
String pagerUrl;
if (feedRequest != null) {
@@ -228,7 +229,7 @@ public class SiteModel implements Model {
/* Get pager of users whose names begin with specified letter */
- public Pager getUsersByLetterPager(String letter, int sinceDays, int
length) {
+ public Pager<UserWrapper> getUsersByLetterPager(String letter, int
sinceDays, int length) {
String pagerUrl;
if (feedRequest != null) {
@@ -257,7 +258,7 @@ public class SiteModel implements Model {
/** Get pager of weblogs whose handles begin with specified letter */
- public Pager getWeblogsByLetterPager(String letter, int sinceDays, int
length) {
+ public Pager<WeblogWrapper> getWeblogsByLetterPager(String letter, int
sinceDays, int length) {
String pagerUrl = urlStrategy.getWeblogPageURL(weblog,
weblogRequest.getLocale(), pageLink,
@@ -284,16 +285,15 @@ public class SiteModel implements Model {
* containing integers reflecting the number of users whose
* names start with each letter.
*/
- public Map getUserNameLetterMap() {
- Map results = new HashMap();
- try {
+ public Map<String, Long> getUserNameLetterMap() {
+ try {
Weblogger roller = WebloggerFactory.getWeblogger();
UserManager umgr = roller.getUserManager();
- results = umgr.getUserNameLetterMap();
+ return umgr.getUserNameLetterMap();
} catch (Exception e) {
log.error("ERROR: fetching username letter map", e);
}
- return results;
+ return Collections.emptyMap();
}
@@ -302,23 +302,22 @@ public class SiteModel implements Model {
* containing integers reflecting the number of weblogs whose
* names start with each letter.
*/
- public Map getWeblogHandleLetterMap() {
- Map results = new HashMap();
- try {
- results =
WebloggerFactory.getWeblogger().getWeblogManager().getWeblogHandleLetterMap();
+ public Map<String, Long> getWeblogHandleLetterMap() {
+ try {
+ return
WebloggerFactory.getWeblogger().getWeblogManager().getWeblogHandleLetterMap();
} catch (Exception e) {
log.error("ERROR: fetching weblog handle letter map", e);
}
- return results;
+ return Collections.emptyMap();
}
/**
* Return list of weblogs that user belongs to.
*/
- public List getUsersWeblogs(String userName) {
- List results = new ArrayList();
- try {
+ public List<WeblogWrapper> getUsersWeblogs(String userName) {
+ List<WeblogWrapper> results = new ArrayList<>();
+ try {
Weblogger roller = WebloggerFactory.getWeblogger();
UserManager umgr = roller.getUserManager();
User user = umgr.getUserByUserName(userName);
@@ -336,9 +335,9 @@ public class SiteModel implements Model {
/**
* Return list of users that belong to website.
*/
- public List getWeblogsUsers(String handle) {
- List results = new ArrayList();
- try {
+ public List<UserWrapper> getWeblogsUsers(String handle) {
+ List<UserWrapper> results = new ArrayList<>();
+ try {
Weblogger roller = WebloggerFactory.getWeblogger();
UserManager umgr = roller.getUserManager();
Weblog website =
WebloggerFactory.getWeblogger().getWeblogManager().getWeblogByHandle(handle);
@@ -464,16 +463,15 @@ public class SiteModel implements Model {
* @param sinceDays Only consider weblogs updated in the last sinceDays
* @param length Max number of results to return
*/
- public List getMostCommentedWeblogs(int sinceDays , int length) {
- List results = new ArrayList();
+ public List<StatCount> getMostCommentedWeblogs(int sinceDays , int length)
{
Date startDate = JPAWeblogEntryManagerImpl.getStartDateNow(sinceDays);
- try {
- results =
WebloggerFactory.getWeblogger().getWeblogManager().getMostCommentedWeblogs(
+ try {
+ return
WebloggerFactory.getWeblogger().getWeblogManager().getMostCommentedWeblogs(
startDate, new Date(), 0, length);
} catch (Exception e) {
log.error("ERROR: fetching commented weblog list", e);
}
- return results;
+ return Collections.emptyList();
}
@@ -484,19 +482,17 @@ public class SiteModel implements Model {
* @param cats To limit results to list of category names
* @param length Max number of results to return
*/
- public List getMostCommentedWeblogEntries(
- List cats, int sinceDays, int length) {
- List results = new ArrayList();
+ public List<StatCount> getMostCommentedWeblogEntries(List cats, int
sinceDays, int length) {
Date startDate = JPAWeblogEntryManagerImpl.getStartDateNow(sinceDays);
- try {
+ try {
Weblogger roller = WebloggerFactory.getWeblogger();
WeblogEntryManager wmgr = roller.getWeblogEntryManager();
- results = wmgr.getMostCommentedWeblogEntries(
+ return wmgr.getMostCommentedWeblogEntries(
null, startDate, new Date(), 0, length);
} catch (Exception e) {
log.error("ERROR: fetching commented weblog entries list", e);
}
- return results;
+ return Collections.emptyList();
}
/**
@@ -525,7 +521,6 @@ public class SiteModel implements Model {
* @return
*/
public List<TagStat> getPopularTags(int sinceDays, int length) {
- List results = new ArrayList();
Date startDate = null;
if(sinceDays > 0) {
Calendar cal = Calendar.getInstance();
@@ -537,11 +532,11 @@ public class SiteModel implements Model {
try {
Weblogger roller = WebloggerFactory.getWeblogger();
WeblogEntryManager wmgr = roller.getWeblogEntryManager();
- results = wmgr.getPopularTags(null, startDate, 0, length);
+ return wmgr.getPopularTags(null, startDate, 0, length);
} catch (Exception e) {
log.error("ERROR: fetching site tags list", e);
}
- return results;
+ return Collections.emptyList();
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java
index fb925d9..7ca561a 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java
@@ -49,7 +49,7 @@ import
org.apache.roller.weblogger.ui.rendering.util.WeblogRequest;
*/
public class URLModel implements Model {
- private static Log log = LogFactory.getLog(URLModel.class);
+ private static final Log log = LogFactory.getLog(URLModel.class);
protected Weblog weblog = null;
protected String locale = null;
@@ -65,7 +65,7 @@ public class URLModel implements Model {
}
@Override
- public void init(Map initData) throws WebloggerException {
+ public void init(Map<String, Object> initData) throws WebloggerException {
// need a weblog request so that we can know the weblog and locale
WeblogRequest weblogRequest = (WeblogRequest)
initData.get("parsedRequest");
@@ -219,12 +219,12 @@ public class URLModel implements Model {
}
- public String tags(List tags) {
+ public String tags(List<String> tags) {
return urlStrategy.getWeblogCollectionURL(weblog, locale, null, null,
tags , -1, true);
}
- public String tags(List tags, int pageNum) {
+ public String tags(List<String> tags, int pageNum) {
return urlStrategy.getWeblogCollectionURL(weblog, locale, null, null,
tags, -1, true);
}
@@ -344,7 +344,7 @@ public class URLModel implements Model {
return urlStrategy.getWeblogFeedURL(weblog, locale, "entries",
"rss", catName, null, null, excerpts, true);
}
- public String rssByTags(List tags, boolean excerpts) {
+ public String rssByTags(List<String> tags, boolean excerpts) {
return urlStrategy.getWeblogFeedURL(weblog, locale, "entries",
"rss", null, null, tags, excerpts, true);
}
@@ -360,7 +360,7 @@ public class URLModel implements Model {
return urlStrategy.getWeblogFeedURL(weblog, locale, "entries",
"atom", catName, term, null, false, true);
}
- public String atomByTags(List tags, boolean excerpts) {
+ public String atomByTags(List<String> tags, boolean excerpts) {
return urlStrategy.getWeblogFeedURL(weblog, locale, "entries",
"atom", null, null, tags, excerpts, true);
}
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
index 8aaf129..3c3af9a 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
@@ -45,7 +45,7 @@ import org.apache.roller.weblogger.util.Utilities;
*/
public class UtilitiesModel implements Model {
- private static Log log = LogFactory.getLog(UtilitiesModel.class);
+ private static final Log log = LogFactory.getLog(UtilitiesModel.class);
private static Pattern mLinkPattern =
Pattern.compile("<a href=.*?>", Pattern.CASE_INSENSITIVE);
@@ -103,7 +103,7 @@ public class UtilitiesModel implements Model {
/** Init page model based on request */
@Override
- public void init(Map initData) throws WebloggerException {
+ public void init(Map<String, Object> initData) throws WebloggerException {
// we expect the init data to contain a parsedRequest object
parsedRequest = (ParsedRequest) initData.get("parsedRequest");
diff --git
a/app/src/main/java/org/apache/roller/weblogger/util/I18nMessages.java
b/app/src/main/java/org/apache/roller/weblogger/util/I18nMessages.java
index 074a722..c6de4c3 100644
--- a/app/src/main/java/org/apache/roller/weblogger/util/I18nMessages.java
+++ b/app/src/main/java/org/apache/roller/weblogger/util/I18nMessages.java
@@ -45,7 +45,7 @@ public final class I18nMessages {
// a map of cached messages instances, keyed by locale
private static Map<Locale, I18nMessages> messagesMap =
- Collections.synchronizedMap(new HashMap());
+ Collections.synchronizedMap(new HashMap<>());
private I18nMessages(String locale) {
@@ -131,7 +131,7 @@ public final class I18nMessages {
* Get a message from the bundle and substitute the given args into
* the message contents.
*/
- public String getString(String key, List args) {
+ public String getString(String key, List<?> args) {
try {
String msg = bundle.getString(key);
@@ -170,12 +170,12 @@ public final class I18nMessages {
try {
- Class type = ResourceBundle.class;
+ Class<?> type = ResourceBundle.class;
Field cacheList = type.getDeclaredField("cacheList");
synchronized (cacheList) {
cacheList.setAccessible(true);
- ((Map)
cacheList.get(ResourceBundle.class)).clear();
+ ((Map<?, ?>)
cacheList.get(ResourceBundle.class)).clear();
}
clearTomcatCache();
@@ -198,7 +198,7 @@ public final class I18nMessages {
ClassLoader loader =
Thread.currentThread().getContextClassLoader();
// no need for compilation here.
- Class cl = loader.getClass();
+ Class<?> cl = loader.getClass();
try {
if
("org.apache.catalina.loader.WebappClassLoader".equals(cl
@@ -215,7 +215,7 @@ public final class I18nMessages {
}
}
- private static void clearMap(Class cl, Object obj, String name)
+ private static void clearMap(Class<?> cl, Object obj, String name)
throws NoSuchFieldException, IllegalAccessException,
NoSuchMethodException, InvocationTargetException {
Field field = cl.getDeclaredField(name);
@@ -224,7 +224,7 @@ public final class I18nMessages {
Object cache = field.get(obj);
synchronized (cache) {
- Class ccl = cache.getClass();
+ Class<?> ccl = cache.getClass();
Method clearMethod = ccl.getMethod("clear");
clearMethod.invoke(cache);
}
