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 1bc342caa5a849fcab58565b4c3913a35adb99e0 Author: Michael Bien <[email protected]> AuthorDate: Sat Jul 10 13:54:33 2021 +0200 final set of rawtype warning fixes. --- .../planet/business/fetcher/RomeFeedFetcher.java | 2 +- .../planet/business/jpa/JPAPlanetManagerImpl.java | 2 +- .../roller/planet/pojos/SubscriptionEntry.java | 8 ++--- .../roller/planet/tasks/StaticPlanetModel.java | 3 +- .../weblogger/business/PropertiesManager.java | 2 +- .../weblogger/business/WeblogEntryManager.java | 3 +- .../business/jpa/JPAMediaFileManagerImpl.java | 4 +-- .../business/jpa/JPAPropertiesManagerImpl.java | 4 +-- .../weblogger/business/jpa/JPAUserManagerImpl.java | 6 ++-- .../business/jpa/JPAWeblogEntryManagerImpl.java | 30 +++++++++--------- .../business/jpa/JPAWeblogManagerImpl.java | 8 ++--- .../business/runnable/ContinuousWorkerThread.java | 2 +- .../weblogger/business/runnable/RollerTask.java | 4 +-- .../business/themes/ThemeManagerImpl.java | 15 +++------ .../ui/core/security/CustomUserRegistry.java | 2 +- .../core/tags/calendar/BigWeblogCalendarModel.java | 8 ++--- .../ui/core/tags/calendar/WeblogCalendarModel.java | 14 ++++----- .../weblogger/ui/rendering/model/SiteModel.java | 2 +- .../weblogger/ui/struts2/admin/CacheInfo.java | 9 +++--- .../ui/struts2/admin/GlobalCommentManagement.java | 4 +-- .../ui/struts2/ajax/ThemeDataServlet.java | 4 +-- .../weblogger/ui/struts2/core/CreateWeblog.java | 5 +-- .../weblogger/ui/struts2/editor/EntryEdit.java | 8 ++--- .../roller/weblogger/ui/struts2/editor/Pings.java | 8 ++--- .../roller/weblogger/ui/struts2/util/UIAction.java | 4 +-- .../apache/roller/weblogger/util/LRUCache2.java | 2 +- .../roller/weblogger/util/LinkbackExtractor.java | 2 +- .../org/apache/roller/weblogger/util/MailUtil.java | 10 +++--- .../roller/weblogger/util/PasswordUtility.java | 4 +-- .../webservices/atomprotocol/EntryCollection.java | 2 +- .../webservices/atomprotocol/MediaCollection.java | 4 +-- .../atomprotocol/RollerAtomService.java | 4 +-- .../webservices/tagdata/TagDataServlet.java | 4 +-- .../webservices/xmlrpc/MetaWeblogAPIHandler.java | 14 ++++----- .../roller/planet/business/PropertiesTest.java | 10 +++--- .../weblogger/business/FileContentManagerTest.java | 36 +++++++++++----------- .../roller/weblogger/business/PropertiesTest.java | 10 +++--- 37 files changed, 128 insertions(+), 135 deletions(-) diff --git a/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java b/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java index 83777c1..1f38660 100644 --- a/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java +++ b/app/src/main/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java @@ -200,7 +200,7 @@ public class RomeFeedFetcher implements FeedFetcher { // get content and unescape if it is 'text/plain' if (!romeEntry.getContents().isEmpty()) { - SyndContent content= (SyndContent)romeEntry.getContents().get(0); + SyndContent content= romeEntry.getContents().get(0); if (content != null && content.getType().equals("text/plain")) { newEntry.setText(StringEscapeUtils.unescapeHtml4(content.getValue())); } else if (content != null) { diff --git a/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java b/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java index 212dfa5..0e170b6 100644 --- a/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java +++ b/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java @@ -122,7 +122,7 @@ public class JPAPlanetManagerImpl extends AbstractManagerImpl implements PlanetM Subscription.class, id); } - public Iterator getAllSubscriptions() { + public Iterator<Subscription> getAllSubscriptions() { try { return (strategy.getNamedQuery( "Subscription.getAll", Subscription.class).getResultList()).iterator(); diff --git a/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java b/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java index 51ab6aa..afaf385 100644 --- a/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java +++ b/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java @@ -226,18 +226,18 @@ public class SubscriptionEntry implements Serializable, Comparable<SubscriptionE */ public Category getCategory() { Category cat = null; - List cats = getCategories(); + List<Category> cats = getCategories(); if (!cats.isEmpty()) { - cat = (Category)cats.get(0); + cat = cats.get(0); } return cat; } public void setCategoriesString(List<String> categoryNames) { StringBuilder sb = new StringBuilder(); - Iterator cats = categoryNames.iterator(); + Iterator<String> cats = categoryNames.iterator(); while (cats.hasNext()) { - String catName = (String) cats.next(); + String catName = cats.next(); sb.append(catName); if (cats.hasNext()) { sb.append(","); diff --git a/app/src/main/java/org/apache/roller/planet/tasks/StaticPlanetModel.java b/app/src/main/java/org/apache/roller/planet/tasks/StaticPlanetModel.java index 9df09c0..257d6c8 100644 --- a/app/src/main/java/org/apache/roller/planet/tasks/StaticPlanetModel.java +++ b/app/src/main/java/org/apache/roller/planet/tasks/StaticPlanetModel.java @@ -65,8 +65,7 @@ public class StaticPlanetModel { } } - public List getAggregation( - PlanetGroup group, int maxEntries) throws RollerException { + public List<SubscriptionEntry> getAggregation(PlanetGroup group, int maxEntries) throws RollerException { return planetManager.getEntries(group, 0, maxEntries); } diff --git a/app/src/main/java/org/apache/roller/weblogger/business/PropertiesManager.java b/app/src/main/java/org/apache/roller/weblogger/business/PropertiesManager.java index 311783d..5b0fef7 100644 --- a/app/src/main/java/org/apache/roller/weblogger/business/PropertiesManager.java +++ b/app/src/main/java/org/apache/roller/weblogger/business/PropertiesManager.java @@ -51,7 +51,7 @@ public interface PropertiesManager { /** * Save a list of properties */ - void saveProperties(Map properties) throws WebloggerException; + void saveProperties(Map<String, RuntimeConfigProperty> properties) throws WebloggerException; /** diff --git a/app/src/main/java/org/apache/roller/weblogger/business/WeblogEntryManager.java b/app/src/main/java/org/apache/roller/weblogger/business/WeblogEntryManager.java index 6f87756..ca95a0d 100644 --- a/app/src/main/java/org/apache/roller/weblogger/business/WeblogEntryManager.java +++ b/app/src/main/java/org/apache/roller/weblogger/business/WeblogEntryManager.java @@ -283,8 +283,7 @@ public interface WeblogEntryManager { * @return True if tags exist, false otherwise. * @throws WebloggerException If there is any problem doing the operation. */ - boolean getTagComboExists(List tags, Weblog weblog) - throws WebloggerException; + boolean getTagComboExists(List<String> tags, Weblog weblog) throws WebloggerException; /** * Get a HitCountData by id. diff --git a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java index 116e19a..1aa83a2 100644 --- a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java +++ b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java @@ -892,8 +892,8 @@ public class JPAMediaFileManagerImpl implements MediaFileManager { public void removeMediaFileTag(String name, MediaFile entry) throws WebloggerException { - for (Iterator it = entry.getTags().iterator(); it.hasNext();) { - MediaFileTag tag = (MediaFileTag) it.next(); + for (Iterator<MediaFileTag> it = entry.getTags().iterator(); it.hasNext();) { + MediaFileTag tag = it.next(); if (tag.getName().equals(name)) { // Call back the entity to adjust its internal state diff --git a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPropertiesManagerImpl.java b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPropertiesManagerImpl.java index 0efd193..255ee04 100644 --- a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPropertiesManagerImpl.java +++ b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPropertiesManagerImpl.java @@ -137,7 +137,7 @@ public class JPAPropertiesManagerImpl implements PropertiesManager { * Save all properties. */ @Override - public void saveProperties(Map properties) throws WebloggerException { + public void saveProperties(Map<String, RuntimeConfigProperty> properties) throws WebloggerException { // just go through the list and saveProperties each property for (Object prop : properties.values()) { @@ -153,7 +153,7 @@ public class JPAPropertiesManagerImpl implements PropertiesManager { * * If the Map of props is empty/null then we will initialize all properties. **/ - private Map initializeMissingProps(Map<String, RuntimeConfigProperty> props) { + private Map<String, RuntimeConfigProperty> initializeMissingProps(Map<String, RuntimeConfigProperty> props) { if(props == null) { props = new HashMap<>(); diff --git a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java index 654307b..1e42cf7 100644 --- a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java +++ b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java @@ -96,7 +96,7 @@ public class JPAUserManagerImpl implements UserManager { } boolean adminUser = false; - List existingUsers = this.getUsers(Boolean.TRUE, null, null, 0, 1); + List<User> existingUsers = this.getUsers(Boolean.TRUE, null, null, 0, 1); boolean firstUserAdmin = WebloggerConfig.getBooleanProperty("users.firstUserAdmin"); if (existingUsers.isEmpty() && firstUserAdmin) { // Make first user an admin @@ -299,8 +299,8 @@ public class JPAUserManagerImpl implements UserManager { for (int i=0; i<26; i++) { char currentChar = lc.charAt(i); query.setParameter(1, currentChar + "%"); - List row = query.getResultList(); - Long count = (Long) row.get(0); + List<Long> row = query.getResultList(); + Long count = row.get(0); results.put(String.valueOf(currentChar), count); } return results; diff --git a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java index 7739adb..638cb42 100644 --- a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java +++ b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java @@ -68,7 +68,7 @@ public class JPAWeblogEntryManagerImpl implements WeblogEntryManager { private final JPAPersistenceStrategy strategy; // cached mapping of entryAnchors -> entryIds - private Map<String, String> entryAnchorToIdMap = Collections.synchronizedMap(new HashMap<String, String>()); + private final Map<String, String> entryAnchorToIdMap = Collections.synchronizedMap(new HashMap<String, String>()); private static final Comparator<TagStat> TAG_STAT_NAME_COMPARATOR = new TagStatComparator(); @@ -276,8 +276,8 @@ public class JPAWeblogEntryManagerImpl implements WeblogEntryManager { // remove attributes if (entry.getEntryAttributes() != null) { - for (Iterator it = entry.getEntryAttributes().iterator(); it.hasNext(); ) { - WeblogEntryAttribute att = (WeblogEntryAttribute) it.next(); + for (Iterator<WeblogEntryAttribute> it = entry.getEntryAttributes().iterator(); it.hasNext(); ) { + WeblogEntryAttribute att = it.next(); it.remove(); this.strategy.remove(att); } @@ -295,7 +295,7 @@ public class JPAWeblogEntryManagerImpl implements WeblogEntryManager { this.entryAnchorToIdMap.remove(entry.getWebsite().getHandle()+":"+entry.getAnchor()); } - private List getNextPrevEntries(WeblogEntry current, String catName, + private List<WeblogEntry> getNextPrevEntries(WeblogEntry current, String catName, String locale, int maxEntries, boolean next) throws WebloggerException { @@ -496,8 +496,8 @@ public class JPAWeblogEntryManagerImpl implements WeblogEntryManager { // seems silly, why is this not done in WeblogEntry? - for (Iterator it = entry.getEntryAttributes().iterator(); it.hasNext();) { - WeblogEntryAttribute entryAttribute = (WeblogEntryAttribute) it.next(); + for (Iterator<WeblogEntryAttribute> it = entry.getEntryAttributes().iterator(); it.hasNext();) { + WeblogEntryAttribute entryAttribute = it.next(); if (entryAttribute.getName().equals(name)) { //Remove it from database @@ -587,7 +587,7 @@ public class JPAWeblogEntryManagerImpl implements WeblogEntryManager { "WeblogEntry.getByWebsite&Anchor", WeblogEntry.class); q.setParameter(1, entry.getWebsite()); q.setParameter(2, name); - List results = q.getResultList(); + List<WeblogEntry> results = q.getResultList(); if (results.isEmpty()) { break; @@ -819,7 +819,7 @@ public class JPAWeblogEntryManagerImpl implements WeblogEntryManager { Date startDate, Date endDate, int offset, int length) throws WebloggerException { TypedQuery<WeblogEntryComment> query; - List queryResults; + List<WeblogEntryComment> queryResults; Timestamp end = new Timestamp(endDate != null? endDate.getTime() : new Date().getTime()); @@ -881,9 +881,9 @@ public class JPAWeblogEntryManagerImpl implements WeblogEntryManager { public WeblogEntry getNextEntry(WeblogEntry current, String catName, String locale) throws WebloggerException { WeblogEntry entry = null; - List entryList = getNextPrevEntries(current, catName, locale, 1, true); + List<WeblogEntry> entryList = getNextPrevEntries(current, catName, locale, 1, true); if (entryList != null && !entryList.isEmpty()) { - entry = (WeblogEntry)entryList.get(0); + entry = entryList.get(0); } return entry; } @@ -895,9 +895,9 @@ public class JPAWeblogEntryManagerImpl implements WeblogEntryManager { public WeblogEntry getPreviousEntry(WeblogEntry current, String catName, String locale) throws WebloggerException { WeblogEntry entry = null; - List entryList = getNextPrevEntries(current, catName, locale, 1, false); + List<WeblogEntry> entryList = getNextPrevEntries(current, catName, locale, 1, false); if (entryList != null && !entryList.isEmpty()) { - entry = (WeblogEntry)entryList.get(0); + entry = entryList.get(0); } return entry; } @@ -934,7 +934,7 @@ public class JPAWeblogEntryManagerImpl implements WeblogEntryManager { public List<TagStat> getPopularTags(Weblog website, Date startDate, int offset, int limit) throws WebloggerException { TypedQuery<TagStat> query; - List queryResults; + List<TagStat> queryResults; if (website != null) { if (startDate != null) { @@ -1002,7 +1002,7 @@ public class JPAWeblogEntryManagerImpl implements WeblogEntryManager { public List<TagStat> getTags(Weblog website, String sortBy, String startsWith, int offset, int limit) throws WebloggerException { Query query; - List queryResults; + List<?> queryResults; boolean sortByName = sortBy == null || !sortBy.equals("count"); List<Object> params = new ArrayList<>(); @@ -1062,7 +1062,7 @@ public class JPAWeblogEntryManagerImpl implements WeblogEntryManager { * @inheritDoc */ @Override - public boolean getTagComboExists(List tags, Weblog weblog) throws WebloggerException{ + public boolean getTagComboExists(List<String> tags, Weblog weblog) throws WebloggerException{ if (tags == null || tags.isEmpty()) { return false; 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 14530f5..8fa1df6 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 @@ -158,7 +158,7 @@ public class JPAWeblogManagerImpl implements WeblogManager { // Remove the weblog's ping queue entries TypedQuery<PingQueueEntry> q = strategy.getNamedQuery("PingQueueEntry.getByWebsite", PingQueueEntry.class); q.setParameter(1, weblog); - List queueEntries = q.getResultList(); + List<PingQueueEntry> queueEntries = q.getResultList(); for (Object obj : queueEntries) { this.strategy.remove(obj); } @@ -620,8 +620,8 @@ public class JPAWeblogManagerImpl implements WeblogManager { for (int i=0; i<26; i++) { char currentChar = lc.charAt(i); query.setParameter(1, currentChar + "%"); - List row = query.getResultList(); - Long count = (Long) row.get(0); + List<Long> row = query.getResultList(); + Long count = row.get(0); results.put(String.valueOf(currentChar), count); } return results; @@ -672,7 +672,7 @@ public class JPAWeblogManagerImpl implements WeblogManager { if (length != -1) { query.setMaxResults(length); } - List queryResults = query.getResultList(); + List<?> queryResults = query.getResultList(); List<StatCount> results = new ArrayList<>(); if (queryResults != null) { for (Object obj : queryResults) { diff --git a/app/src/main/java/org/apache/roller/weblogger/business/runnable/ContinuousWorkerThread.java b/app/src/main/java/org/apache/roller/weblogger/business/runnable/ContinuousWorkerThread.java index b99683f..86e623b 100644 --- a/app/src/main/java/org/apache/roller/weblogger/business/runnable/ContinuousWorkerThread.java +++ b/app/src/main/java/org/apache/roller/weblogger/business/runnable/ContinuousWorkerThread.java @@ -70,7 +70,7 @@ public class ContinuousWorkerThread extends WorkerThread { // job is done, lets sleep it off for a bit try { mLogger.debug(this.id + " SLEEPING for " + this.sleepTime + " milliseconds ..."); - this.sleep(this.sleepTime); + Thread.sleep(this.sleepTime); } catch (InterruptedException e) { mLogger.info(this.id + " INTERRUPT: " + e.getMessage()); break; diff --git a/app/src/main/java/org/apache/roller/weblogger/business/runnable/RollerTask.java b/app/src/main/java/org/apache/roller/weblogger/business/runnable/RollerTask.java index d46da72..6384567 100644 --- a/app/src/main/java/org/apache/roller/weblogger/business/runnable/RollerTask.java +++ b/app/src/main/java/org/apache/roller/weblogger/business/runnable/RollerTask.java @@ -123,8 +123,8 @@ public abstract class RollerTask implements Runnable { Properties taskProps = new Properties(); - String key = null; - Enumeration keys = WebloggerConfig.keys(); + String key; + Enumeration<Object> keys = WebloggerConfig.keys(); while(keys.hasMoreElements()) { key = (String) keys.nextElement(); diff --git a/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java b/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java index 0147523..8603263 100644 --- a/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java +++ b/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java @@ -160,7 +160,7 @@ public class ThemeManagerImpl implements ThemeManager { // otherwise we are returning a WeblogSharedTheme } else { - SharedTheme staticTheme = (SharedTheme) this.themes.get(weblog.getEditorTheme()); + SharedTheme staticTheme = this.themes.get(weblog.getEditorTheme()); if (staticTheme != null) { weblogTheme = new WeblogSharedTheme(weblog, staticTheme); } else { @@ -377,15 +377,10 @@ public class ThemeManagerImpl implements ThemeManager { // first, get a list of the themes available File themesdir = new File(this.themeDir); - FilenameFilter filter = new FilenameFilter() { - - @Override - public boolean accept(File dir, String name) { - File file = new File(dir.getAbsolutePath() + File.separator - + name); - return file.isDirectory() && !file.getName().startsWith("."); - } - }; + FilenameFilter filter = (File dir, String name) -> { + File file = new File(dir.getAbsolutePath() + File.separator + name); + return file.isDirectory() && !file.getName().startsWith("."); + }; String[] themenames = themesdir.list(filter); if (themenames == null) { diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java index e36a97f..14d184f 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java @@ -203,7 +203,7 @@ public class CustomUserRegistry { if (attrObj instanceof String) { attr = (String)attrObj; } else if (attrObj instanceof Set) { - Set attrSet = (Set)attrObj; + Set<?> attrSet = (Set)attrObj; if (!attrSet.isEmpty()) { attr = (String)attrSet.iterator().next(); } diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java index 543a20f..5b9db4d 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java @@ -40,7 +40,7 @@ import org.apache.roller.util.DateUtil; */ public class BigWeblogCalendarModel extends WeblogCalendarModel { - private static Log mLogger = LogFactory.getLog(BigWeblogCalendarModel.class); + private static final Log mLogger = LogFactory.getLog(BigWeblogCalendarModel.class); protected final SimpleDateFormat starDateFormat = DateUtil.get8charDateFormat(); @@ -71,7 +71,7 @@ public class BigWeblogCalendarModel extends WeblogCalendarModel { monthMap = mgr.getWeblogEntryObjectMap(wesc); } catch (WebloggerException e) { mLogger.error(e); - monthMap = new HashMap(); + monthMap = new HashMap<>(); } } @@ -85,7 +85,7 @@ public class BigWeblogCalendarModel extends WeblogCalendarModel { // get the 8 char YYYYMMDD datestring for day, returns null // if no weblog entry on that day String dateString; - List entries = (List)monthMap.get(day); + List<?> entries = (List<?>)monthMap.get(day); if ( entries != null ) { dateString = starDateFormat.format( ((WeblogEntry)entries.get(0)).getPubTime()); @@ -144,7 +144,7 @@ public class BigWeblogCalendarModel extends WeblogCalendarModel { // get the 8 char YYYYMMDD datestring for day, returns null // if no weblog entry on that day String dateString = null; - List entries = (List)monthMap.get( day ); + List<?> entries = (List<?>)monthMap.get( day ); if ( entries != null && day != null ) { WeblogEntry entry = (WeblogEntry)entries.get(0); dateString = starDateFormat.format(entry.getPubTime()); diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java b/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java index 1ff954d..a2b6317 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java @@ -47,9 +47,9 @@ import org.apache.roller.util.DateUtil; */ public class WeblogCalendarModel implements CalendarModel { - private static Log log = LogFactory.getLog(WeblogCalendarModel.class); + private static final Log log = LogFactory.getLog(WeblogCalendarModel.class); - protected Map monthMap; + protected Map<Date, ?> monthMap; protected Date day; protected String cat = null; protected String pageLink = null; @@ -115,10 +115,10 @@ public class WeblogCalendarModel implements CalendarModel { wesc.setSortOrder(WeblogEntrySearchCriteria.SortOrder.DESCENDING); wesc.setLocale(locale); wesc.setMaxResults(1); - List prevEntries = mgr.getWeblogEntries(wesc); + List<WeblogEntry> prevEntries = mgr.getWeblogEntries(wesc); if (!prevEntries.isEmpty()) { - WeblogEntry prevEntry = (WeblogEntry)prevEntries.get(0); + WeblogEntry prevEntry = prevEntries.get(0); prevMonth = DateUtil.getStartOfMonth(new Date(prevEntry.getPubTime().getTime()),getCalendar()); } } catch (WebloggerException e) { @@ -139,9 +139,9 @@ public class WeblogCalendarModel implements CalendarModel { wesc.setSortOrder(WeblogEntrySearchCriteria.SortOrder.ASCENDING); wesc.setLocale(locale); wesc.setMaxResults(1); - List nextEntries = mgr.getWeblogEntries(wesc); + List<WeblogEntry> nextEntries = mgr.getWeblogEntries(wesc); if (!nextEntries.isEmpty()) { - WeblogEntry nextEntry = (WeblogEntry)nextEntries.get(0); + WeblogEntry nextEntry = nextEntries.get(0); nextMonth = DateUtil.getStartOfMonth(new Date(nextEntry.getPubTime().getTime()),getCalendar()); } } catch (WebloggerException e) { @@ -171,7 +171,7 @@ public class WeblogCalendarModel implements CalendarModel { monthMap = mgr.getWeblogEntryStringMap(wesc); } catch (WebloggerException e) { log.error(e); - monthMap = new HashMap<Date, String>(); + monthMap = new HashMap<>(); } } 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 c978b0e..a0c7acf 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 @@ -482,7 +482,7 @@ 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<StatCount> getMostCommentedWeblogEntries(List cats, int sinceDays, int length) { + public List<StatCount> getMostCommentedWeblogEntries(List<String> cats, int sinceDays, int length) { Date startDate = JPAWeblogEntryManagerImpl.getStartDateNow(sinceDays); try { Weblogger roller = WebloggerFactory.getWeblogger(); diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CacheInfo.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CacheInfo.java index 920ab6c..7f199ba 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CacheInfo.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CacheInfo.java @@ -34,7 +34,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; public class CacheInfo extends UIAction { // map of stats to display - private Map stats = Collections.EMPTY_MAP; + private Map<String, Map<String, Object>> stats = Collections.emptyMap(); // cache which we would clear when clear() is called private String cache = null; @@ -60,8 +60,7 @@ public class CacheInfo extends UIAction { @Override public void myPrepare() { - Map cacheStats = CacheManager.getStats(); - setStats(cacheStats); + setStats(CacheManager.getStats()); } @@ -94,11 +93,11 @@ public class CacheInfo extends UIAction { } - public Map getStats() { + public Map<String, Map<String, Object>> getStats() { return stats; } - public void setStats(Map stats) { + public void setStats(Map<String, Map<String, Object>> stats) { this.stats = stats; } diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java index a9ca1f9..ef1774f 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java @@ -195,7 +195,7 @@ public class GlobalCommentManagement extends UIAction implements ServletRequestA csc.setStatus(getBean().getStatus()); csc.setReverseChrono(true); - List allMatchingComments = wmgr.getComments(csc); + List<WeblogEntryComment> allMatchingComments = wmgr.getComments(csc); if(allMatchingComments.size() > COUNT) { setBulkDeleteCount(allMatchingComments.size()); @@ -268,7 +268,7 @@ public class GlobalCommentManagement extends UIAction implements ServletRequestA } // loop through IDs of all comments displayed on page - List spamIds = Arrays.asList(getBean().getSpamComments()); + List<String> spamIds = Arrays.asList(getBean().getSpamComments()); log.debug(spamIds.size()+" comments marked as spam"); String[] ids = Utilities.stringToStringArray(getBean().getIds(),","); diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDataServlet.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDataServlet.java index 2e2110e..694c736 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDataServlet.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDataServlet.java @@ -78,8 +78,8 @@ public class ThemeDataServlet extends HttpServlet { if (themeId == null) { pw.println("[" ); } - for (Iterator it = themes.iterator(); it.hasNext();) { - SharedTheme theme = (SharedTheme) it.next(); + for (Iterator<SharedTheme> it = themes.iterator(); it.hasNext();) { + SharedTheme theme = it.next(); pw.print(" { \"id\" : \""); pw.print(theme.getId()); pw.print("\", "); diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java index 35baaff..b19ca50 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java @@ -37,6 +37,7 @@ import org.apache.struts2.convention.annotation.AllowedMethods; import org.apache.struts2.interceptor.validation.SkipValidation; import java.util.List; +import org.apache.roller.weblogger.business.themes.SharedTheme; /** @@ -45,7 +46,7 @@ import java.util.List; // TODO: make this work @AllowedMethods({"execute","save"}) public class CreateWeblog extends UIAction { - private static Log log = LogFactory.getLog(CreateWeblog.class); + private static final Log log = LogFactory.getLog(CreateWeblog.class); private static final String DISABLED_RETURN_CODE = "disabled"; private CreateWeblogBean bean = new CreateWeblogBean(); @@ -192,7 +193,7 @@ public class CreateWeblog extends UIAction { } - public List getThemes() { + public List<SharedTheme> getThemes() { ThemeManager themeMgr = WebloggerFactory.getWeblogger().getThemeManager(); return themeMgr.getEnabledThemesList(); } diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java index 72108c1..a12dc18 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java @@ -396,8 +396,8 @@ public final class EntryEdit extends UIAction { } if (results != null) { - for (Iterator mit = results.getMessages(); mit.hasNext();) { - RollerMessage msg = (RollerMessage) mit.next(); + for (Iterator<RollerMessage> mit = results.getMessages(); mit.hasNext();) { + RollerMessage msg = mit.next(); if (msg.getArgs() == null) { addMessage(msg.getKey()); } else { @@ -405,8 +405,8 @@ public final class EntryEdit extends UIAction { } } - for (Iterator eit = results.getErrors(); eit.hasNext();) { - RollerMessage err = (RollerMessage) eit.next(); + for (Iterator<RollerMessage> eit = results.getErrors(); eit.hasNext();) { + RollerMessage err = eit.next(); if (err.getArgs() == null) { addError(err.getKey()); } else { diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java index 1be3dad..3a90368 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java @@ -47,7 +47,7 @@ import org.apache.roller.weblogger.ui.struts2.util.UIAction; // TODO: make this work @AllowedMethods({"execute","enable","disable","pingNow"}) public class Pings extends UIAction { - private static Log log = LogFactory.getLog(Pings.class); + private static final Log log = LogFactory.getLog(Pings.class); // ping target id to work on private String pingTargetId = null; @@ -59,7 +59,7 @@ public class Pings extends UIAction { private List<PingTarget> commonPingTargets = Collections.emptyList(); // track the enabled/disabled status for pings - private Map pingStatus = Collections.EMPTY_MAP; + private Map<String, Boolean> pingStatus = Collections.emptyMap(); public Pings() { @@ -262,11 +262,11 @@ public class Pings extends UIAction { this.commonPingTargets = commonPingTargets; } - public Map getPingStatus() { + public Map<String, Boolean> getPingStatus() { return pingStatus; } - public void setPingStatus(Map pingStatus) { + public void setPingStatus(Map<String, Boolean> pingStatus) { this.pingStatus = pingStatus; } } diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java index d025e70..b5be30d 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java @@ -241,7 +241,7 @@ public abstract class UIAction extends ActionSupport addActionError(getText(errorKey, errorKey, param)); } - public void addError(String errorKey, List args) { + public void addError(String errorKey, List<?> args) { addActionError(getText(errorKey, args)); } @@ -263,7 +263,7 @@ public abstract class UIAction extends ActionSupport addActionMessage(getText(msgKey, msgKey, param)); } - public void addMessage(String msgKey, List args) { + public void addMessage(String msgKey, List<?> args) { addActionMessage(getText(msgKey, args)); } diff --git a/app/src/main/java/org/apache/roller/weblogger/util/LRUCache2.java b/app/src/main/java/org/apache/roller/weblogger/util/LRUCache2.java index 3134bc6..aadc490 100644 --- a/app/src/main/java/org/apache/roller/weblogger/util/LRUCache2.java +++ b/app/src/main/java/org/apache/roller/weblogger/util/LRUCache2.java @@ -162,7 +162,7 @@ public class LRUCache2 } @Override - protected boolean removeEldestEntry(Map.Entry eldest) + protected boolean removeEldestEntry(Map.Entry<Object, CacheEntry> eldest) { return this.size() > this.maxsize; } diff --git a/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java b/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java index 516dc01..d43378e 100644 --- a/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java +++ b/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java @@ -241,7 +241,7 @@ public class LinkbackExtractor Tag.H2, Tag.H3, Tag.H4, Tag.H5, Tag.H6 }; - private List mList = Arrays.asList(mDivTags); + private List<Tag> mList = Arrays.asList(mDivTags); private Tag mCurrentTag = null; diff --git a/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java b/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java index 4c52e70..50475ca 100644 --- a/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java +++ b/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java @@ -107,7 +107,7 @@ public class MailUtil { } } - to = (String[])reviewers.toArray(new String[reviewers.size()]); + to = reviewers.toArray(new String[reviewers.size()]); // Figure URL to entry edit page String editURL = WebloggerFactory.getWeblogger().getUrlStrategy().getEntryEditURL(entry.getWebsite().getHandle(), entry.getId(), true); @@ -359,8 +359,8 @@ public class MailUtil { ownermsg.append((isPlainText) ? "\n\n" : "</p>"); ownermsg.append((isPlainText) ? "" : "<ul>"); } - for (Iterator it = messages.getMessages(); it.hasNext();) { - RollerMessage rollerMessage = (RollerMessage)it.next(); + for (Iterator<RollerMessage> it = messages.getMessages(); it.hasNext();) { + RollerMessage rollerMessage = it.next(); ownermsg.append((isPlainText) ? "" : "<li>"); ownermsg.append(MessageFormat.format(resources.getString( rollerMessage.getKey()), (Object[])rollerMessage.getArgs()) ); @@ -377,8 +377,8 @@ public class MailUtil { ownermsg.append((isPlainText) ? "\n\n" : "</p>"); ownermsg.append((isPlainText) ? "" : "<ul>"); } - for (Iterator it = messages.getErrors(); it.hasNext();) { - RollerMessage rollerMessage = (RollerMessage)it.next(); + for (Iterator<RollerMessage> it = messages.getErrors(); it.hasNext();) { + RollerMessage rollerMessage = it.next(); ownermsg.append((isPlainText) ? "" : "<li>"); ownermsg.append(MessageFormat.format(resources.getString( rollerMessage.getKey()), (Object[])rollerMessage.getArgs()) ); diff --git a/app/src/main/java/org/apache/roller/weblogger/util/PasswordUtility.java b/app/src/main/java/org/apache/roller/weblogger/util/PasswordUtility.java index 4d567ca..0f17798 100644 --- a/app/src/main/java/org/apache/roller/weblogger/util/PasswordUtility.java +++ b/app/src/main/java/org/apache/roller/weblogger/util/PasswordUtility.java @@ -177,7 +177,7 @@ public class PasswordUtility String passphrase = users.getString(2); props.put(username, passphrase); } - Enumeration usernames = props.keys(); + Enumeration<Object> usernames = props.keys(); while (usernames.hasMoreElements()) { String username = (String)usernames.nextElement(); @@ -201,7 +201,7 @@ public class PasswordUtility Properties props = new Properties(); props.load(new FileInputStream(fileName)); - Enumeration usernames = props.keys(); + Enumeration<Object> usernames = props.keys(); while (usernames.hasMoreElements()) { String username = (String)usernames.nextElement(); diff --git a/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java b/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java index 3da086c..e637ffc 100644 --- a/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java +++ b/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java @@ -339,7 +339,7 @@ public class EntryCollection { SyndPerson author = new Person(); author.setName( creator.getUserName()); author.setEmail( creator.getEmailAddress()); - atomEntry.setAuthors( (List<SyndPerson>)Collections.singletonList(author)); + atomEntry.setAuthors(Collections.singletonList(author)); // Add Atom category for Weblogger category, using category scheme List<Category> categories = new ArrayList<>(); diff --git a/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java b/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java index 9603d77..0cd1994 100644 --- a/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java +++ b/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java @@ -91,7 +91,7 @@ public class MediaCollection { // get incoming slug from HTTP header String slug = areq.getHeader("Slug"); - Content content = (Content)entry.getContents().get(0); + Content content = entry.getContents().get(0); String contentType = content.getType(); InputStream is = areq.getInputStream(); String title = entry.getTitle() != null ? entry.getTitle() : slug; @@ -312,7 +312,7 @@ public class MediaCollection { } int count = 0; MediaFile[] sortedResources = - (MediaFile[])sortedSet.toArray(new MediaFile[sortedSet.size()]); + sortedSet.toArray(new MediaFile[sortedSet.size()]); List<Entry> atomEntries = new ArrayList<>(); for (int i=start; i<(start + max) && i<(sortedResources.length); i++) { Entry entry = createAtomResourceEntry(website, sortedResources[i]); diff --git a/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java b/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java index 92e9b11..60342c6 100644 --- a/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java +++ b/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java @@ -136,8 +136,8 @@ public class RollerAtomService extends AtomService { private List<String> getAcceptedContentTypeRange() throws WebloggerException { List<String> accepts = new ArrayList<>(); Weblogger roller = WebloggerFactory.getWeblogger(); - Map config = roller.getPropertiesManager().getProperties(); - String allows = ((RuntimeConfigProperty)config.get("uploads.types.allowed")).getValue(); + Map<String, RuntimeConfigProperty> config = roller.getPropertiesManager().getProperties(); + String allows = config.get("uploads.types.allowed").getValue(); String[] rules = StringUtils.split(StringUtils.deleteWhitespace(allows), ","); if (rules != null) { for (String rule : rules) { diff --git a/app/src/main/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java b/app/src/main/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java index a281bcd..6ddb591 100644 --- a/app/src/main/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java +++ b/app/src/main/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java @@ -149,8 +149,8 @@ public class TagDataServlet extends HttpServlet { pw.println(" \"weblog\": \"" + (!siteWide ? weblog.getHandle() : "") + "\","); pw.println(" \"tagcounts\": [" ); int count = 0; - for (Iterator it = tags.iterator(); it.hasNext();) { - TagStat stat = (TagStat) it.next(); + for (Iterator<TagStat> it = tags.iterator(); it.hasNext();) { + TagStat stat = it.next(); pw.print(" { \"tag\" : \""); pw.print(stat.getName()); pw.print("\", "); diff --git a/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java b/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java index 7b5d234..dc8ce3f 100644 --- a/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java +++ b/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java @@ -113,14 +113,14 @@ public class MetaWeblogAPIHandler extends BloggerAPIHandler { * @return */ public boolean editPost(String postid, String userid, String password, - Hashtable struct, int publish) throws Exception { + Hashtable<String, ?> struct, int publish) throws Exception { return editPost(postid, userid, password, struct, publish > 0); } public boolean editPost(String postid, String userid, String password, - Hashtable struct, boolean publish) throws Exception { + Hashtable<String, ?> struct, boolean publish) throws Exception { mLogger.debug("editPost() Called ========[ SUPPORTED ]====="); mLogger.debug(" PostId: " + postid); @@ -133,7 +133,7 @@ public class MetaWeblogAPIHandler extends BloggerAPIHandler { validate(entry.getWebsite().getHandle(), userid,password); - Hashtable postcontent = struct; + Hashtable<String, ?> postcontent = struct; String description = (String)postcontent.get("description"); String title = (String)postcontent.get("title"); if (title == null) { @@ -213,14 +213,14 @@ public class MetaWeblogAPIHandler extends BloggerAPIHandler { * @return */ public String newPost(String blogid, String userid, String password, - Hashtable struct, int publish) throws Exception { + Hashtable<String, ?> struct, int publish) throws Exception { return newPost(blogid, userid, password, struct, publish > 0); } public String newPost(String blogid, String userid, String password, - Hashtable struct, boolean publish) throws Exception { + Hashtable<String, ?> struct, boolean publish) throws Exception { mLogger.debug("newPost() Called ===========[ SUPPORTED ]====="); mLogger.debug(" BlogId: " + blogid); @@ -229,7 +229,7 @@ public class MetaWeblogAPIHandler extends BloggerAPIHandler { Weblog website = validate(blogid, userid, password); - Hashtable postcontent = struct; + Hashtable<String, ?> postcontent = struct; String description = (String)postcontent.get("description"); String title = (String)postcontent.get("title"); if (StringUtils.isEmpty(title) && StringUtils.isEmpty(description)) { @@ -355,7 +355,7 @@ public class MetaWeblogAPIHandler extends BloggerAPIHandler { * placed in the user's upload diretory. */ public Object newMediaObject(String blogid, String userid, String password, - Hashtable struct) throws Exception { + Hashtable<String, ?> struct) throws Exception { mLogger.debug("newMediaObject() Called =[ SUPPORTED ]====="); mLogger.debug(" BlogId: " + blogid); diff --git a/app/src/test/java/org/apache/roller/planet/business/PropertiesTest.java b/app/src/test/java/org/apache/roller/planet/business/PropertiesTest.java index 2a4217a..7e31305 100644 --- a/app/src/test/java/org/apache/roller/planet/business/PropertiesTest.java +++ b/app/src/test/java/org/apache/roller/planet/business/PropertiesTest.java @@ -75,14 +75,14 @@ public class PropertiesTest { assertEquals("testtest", prop.getValue()); // get all properties - Map props = mgr.getProperties(); + Map<String, RuntimeConfigProperty> props = mgr.getProperties(); assertNotNull(props); assertTrue(props.containsKey("site.name")); // update multiple properties - prop = (RuntimeConfigProperty) props.get("site.name"); + prop = props.get("site.name"); prop.setValue("foofoo"); - prop = (RuntimeConfigProperty) props.get("site.description"); + prop = props.get("site.description"); prop.setValue("blahblah"); mgr.saveProperties(props); TestUtils.endSession(true); @@ -90,8 +90,8 @@ public class PropertiesTest { // make sure all properties were updated props = mgr.getProperties(); assertNotNull(props); - assertEquals("foofoo", ((RuntimeConfigProperty)props.get("site.name")).getValue()); - assertEquals("blahblah", ((RuntimeConfigProperty)props.get("site.description")).getValue()); + assertEquals("foofoo", props.get("site.name").getValue()); + assertEquals("blahblah", props.get("site.description").getValue()); } } diff --git a/app/src/test/java/org/apache/roller/weblogger/business/FileContentManagerTest.java b/app/src/test/java/org/apache/roller/weblogger/business/FileContentManagerTest.java index 2cfa44d..1406f01 100644 --- a/app/src/test/java/org/apache/roller/weblogger/business/FileContentManagerTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/business/FileContentManagerTest.java @@ -39,7 +39,7 @@ import static org.junit.jupiter.api.Assertions.*; */ public class FileContentManagerTest { - private static Log log = LogFactory.getLog(FileContentManagerTest.class); + private static final Log log = LogFactory.getLog(FileContentManagerTest.class); User testUser = null; Weblog testWeblog = null; @@ -54,11 +54,11 @@ public class FileContentManagerTest { @AfterEach public void tearDown() throws Exception { PropertiesManager pmgr = WebloggerFactory.getWeblogger().getPropertiesManager(); - Map config = pmgr.getProperties(); - ((RuntimeConfigProperty) config.get("uploads.dir.maxsize")).setValue("30000"); - ((RuntimeConfigProperty) config.get("uploads.types.forbid")).setValue(""); - ((RuntimeConfigProperty) config.get("uploads.types.allowed")).setValue(""); - ((RuntimeConfigProperty) config.get("uploads.enabled")).setValue("true"); + Map<String, RuntimeConfigProperty> config = pmgr.getProperties(); + config.get("uploads.dir.maxsize").setValue("30000"); + config.get("uploads.types.forbid").setValue(""); + config.get("uploads.types.allowed").setValue(""); + config.get("uploads.enabled").setValue("true"); pmgr.saveProperties(config); TestUtils.endSession(true); } @@ -79,10 +79,10 @@ public class FileContentManagerTest { // update roller properties to prepare for test PropertiesManager pmgr = WebloggerFactory.getWeblogger().getPropertiesManager(); - Map config = pmgr.getProperties(); - ((RuntimeConfigProperty) config.get("uploads.enabled")).setValue("true"); - ((RuntimeConfigProperty) config.get("uploads.types.allowed")).setValue("opml"); - ((RuntimeConfigProperty) config.get("uploads.dir.maxsize")).setValue("1.00"); + Map<String, RuntimeConfigProperty> config = pmgr.getProperties(); + config.get("uploads.enabled").setValue("true"); + config.get("uploads.types.allowed").setValue("opml"); + config.get("uploads.dir.maxsize").setValue("1.00"); pmgr.saveProperties(config); TestUtils.endSession(true); @@ -141,16 +141,16 @@ public class FileContentManagerTest { FileContentManager fmgr = WebloggerFactory.getWeblogger().getFileContentManager(); PropertiesManager pmgr = WebloggerFactory.getWeblogger().getPropertiesManager(); - Map config = pmgr.getProperties(); - ((RuntimeConfigProperty) config.get("uploads.dir.maxsize")).setValue("1.00"); - ((RuntimeConfigProperty) config.get("uploads.types.forbid")).setValue(""); - ((RuntimeConfigProperty) config.get("uploads.types.allowed")).setValue(""); - ((RuntimeConfigProperty) config.get("uploads.enabled")).setValue("true"); + Map<String, RuntimeConfigProperty> config = pmgr.getProperties(); + config.get("uploads.dir.maxsize").setValue("1.00"); + config.get("uploads.types.forbid").setValue(""); + config.get("uploads.types.allowed").setValue(""); + config.get("uploads.enabled").setValue("true"); pmgr.saveProperties(config); TestUtils.endSession(true); config = pmgr.getProperties(); - ((RuntimeConfigProperty) config.get("uploads.dir.maxsize")).setValue("1.00"); + config.get("uploads.dir.maxsize").setValue("1.00"); pmgr.saveProperties(config); TestUtils.endSession(true); @@ -159,7 +159,7 @@ public class FileContentManagerTest { assertFalse(canSave); config = pmgr.getProperties(); - ((RuntimeConfigProperty) config.get("uploads.types.forbid")).setValue("gif"); + config.get("uploads.types.forbid").setValue("gif"); pmgr.saveProperties(config); TestUtils.endSession(true); @@ -170,7 +170,7 @@ public class FileContentManagerTest { config = pmgr.getProperties(); - ((RuntimeConfigProperty) config.get("uploads.enabled")).setValue("false"); + config.get("uploads.enabled").setValue("false"); pmgr.saveProperties(config); TestUtils.endSession(true); diff --git a/app/src/test/java/org/apache/roller/weblogger/business/PropertiesTest.java b/app/src/test/java/org/apache/roller/weblogger/business/PropertiesTest.java index 0ed3b8c..d35a9fc 100644 --- a/app/src/test/java/org/apache/roller/weblogger/business/PropertiesTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/business/PropertiesTest.java @@ -73,14 +73,14 @@ public class PropertiesTest { assertEquals("testtest", prop.getValue()); // get all properties - Map props = mgr.getProperties(); + Map<String, RuntimeConfigProperty> props = mgr.getProperties(); assertNotNull(props); assertTrue(props.containsKey("site.name")); // update multiple properties - prop = (RuntimeConfigProperty) props.get("site.name"); + prop = props.get("site.name"); prop.setValue("foofoo"); - prop = (RuntimeConfigProperty) props.get("site.description"); + prop = props.get("site.description"); prop.setValue("blahblah"); mgr.saveProperties(props); TestUtils.endSession(true); @@ -88,8 +88,8 @@ public class PropertiesTest { // make sure all properties were updated props = mgr.getProperties(); assertNotNull(props); - assertEquals("foofoo", ((RuntimeConfigProperty)props.get("site.name")).getValue()); - assertEquals("blahblah", ((RuntimeConfigProperty)props.get("site.description")).getValue()); + assertEquals("foofoo", props.get("site.name").getValue()); + assertEquals("blahblah", props.get("site.description").getValue()); } }
