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
The following commit(s) were added to refs/heads/master by this push:
new 044ef2f Removed: the type specification from right side when using
generics (#79)
044ef2f is described below
commit 044ef2f9e6a7fb35366740642b593fb47ef7857a
Author: Yash Maheshwari <[email protected]>
AuthorDate: Mon Apr 19 03:51:11 2021 +0530
Removed: the type specification from right side when using generics (#79)
* Removed: the type specification from right side when using generics
* Removed: the types specification from the pagers package
* Removed: the type specification from the fetcher package
* Removed: type specification from the util package
* Removed: type specification from the business/jpa package
* Removed: type specification from the business/plugins package
* Removed: type specification from the business/runnable package
* Removed: type specification from the business/startup package
* Removed: type specification from the business/themes package
* Removed: type specification from the business package
* Removed: type specification from the config package
* Removed: type specification from the planet/tasks package
* Removed: type specification from the planet/ui package
* Removed: type specification from the pojos/wrapper package
* Removed: type specification from the pojos package
* Removed: type specification from the ui/core package
* Removed: type specification from the ui/rendering package
* Removed: type specification from the ui/struts2 package
* Removed: type specification from the ui/util package
* Removed: type specification from the weblogger/webservices package
* Removed: type specification from the constructors
---
.../planet/business/fetcher/RomeFeedFetcher.java | 2 +-
.../org/apache/roller/planet/pojos/Planet.java | 2 +-
.../apache/roller/planet/pojos/PlanetGroup.java | 2 +-
.../apache/roller/planet/pojos/Subscription.java | 4 ++--
.../roller/planet/pojos/SubscriptionEntry.java | 2 +-
.../java/org/apache/roller/util/RegexUtil.java | 2 +-
.../org/apache/roller/weblogger/TestUtils.java | 2 +-
.../weblogger/business/AbstractURLStrategy.java | 2 +-
.../weblogger/business/DatabaseProvider.java | 2 +-
.../roller/weblogger/business/HitCountQueue.java | 2 +-
.../business/jpa/JPAMediaFileManagerImpl.java | 6 +++---
.../business/jpa/JPAPersistenceStrategy.java | 2 +-
.../business/jpa/JPAPropertiesManagerImpl.java | 4 ++--
.../weblogger/business/jpa/JPAUserManagerImpl.java | 4 ++--
.../business/jpa/JPAWeblogEntryManagerImpl.java | 18 ++++++++--------
.../business/jpa/JPAWeblogManagerImpl.java | 12 +++++------
.../business/plugins/PluginManagerImpl.java | 6 +++---
.../business/runnable/HitCountProcessingJob.java | 2 +-
.../business/runnable/ThreadManagerImpl.java | 2 +-
.../business/startup/DatabaseInstaller.java | 2 +-
.../business/startup/SQLScriptRunner.java | 4 ++--
.../business/themes/SharedThemeFromDir.java | 14 ++++++-------
.../business/themes/SharedThemeTemplate.java | 2 +-
.../business/themes/ThemeManagerImpl.java | 4 ++--
.../weblogger/business/themes/ThemeMetadata.java | 4 ++--
.../business/themes/ThemeMetadataTemplate.java | 2 +-
.../business/themes/WeblogSharedTheme.java | 4 ++--
.../apache/roller/weblogger/config/PingConfig.java | 4 ++--
.../roller/weblogger/config/runtime/ConfigDef.java | 2 +-
.../weblogger/config/runtime/DisplayGroup.java | 2 +-
.../config/runtime/RuntimeConfigDefs.java | 2 +-
.../weblogger/planet/tasks/SyncWebsitesTask.java | 4 ++--
.../roller/weblogger/planet/ui/PlanetGroups.java | 2 +-
.../roller/weblogger/pojos/GlobalPermission.java | 2 +-
.../apache/roller/weblogger/pojos/MediaFile.java | 14 ++++++-------
.../roller/weblogger/pojos/MediaFileDirectory.java | 2 +-
.../org/apache/roller/weblogger/pojos/Weblog.java | 16 +++++++--------
.../weblogger/pojos/WeblogBookmarkFolder.java | 2 +-
.../apache/roller/weblogger/pojos/WeblogEntry.java | 24 +++++++++++-----------
.../roller/weblogger/pojos/WeblogPermission.java | 2 +-
.../roller/weblogger/pojos/WeblogTemplate.java | 4 ++--
.../pojos/wrapper/WeblogBookmarkFolderWrapper.java | 2 +-
.../pojos/wrapper/WeblogEntryWrapper.java | 2 +-
.../weblogger/pojos/wrapper/WeblogWrapper.java | 10 ++++-----
.../ui/core/security/AuthoritiesPopulator.java | 4 ++--
.../ui/core/security/RollerUserDetailsService.java | 4 ++--
.../weblogger/ui/core/util/menu/MenuHelper.java | 10 ++++-----
.../weblogger/ui/core/util/menu/MenuTab.java | 2 +-
.../weblogger/ui/core/util/menu/ParsedMenu.java | 2 +-
.../weblogger/ui/core/util/menu/ParsedTab.java | 2 +-
.../weblogger/ui/rendering/RendererManager.java | 2 +-
.../ui/rendering/WeblogRequestMapper.java | 2 +-
.../ui/rendering/filters/RequestMappingFilter.java | 2 +-
.../weblogger/ui/rendering/model/PlanetModel.java | 2 +-
.../ui/rendering/model/SearchResultsFeedModel.java | 4 ++--
.../ui/rendering/model/SearchResultsModel.java | 6 +++---
.../weblogger/ui/rendering/model/SiteModel.java | 8 ++++----
.../ui/rendering/pagers/CommentsPager.java | 2 +-
.../ui/rendering/pagers/MediaFilesPager.java | 2 +-
.../ui/rendering/pagers/PlanetEntriesPager.java | 2 +-
.../weblogger/ui/rendering/pagers/UsersPager.java | 2 +-
.../ui/rendering/pagers/WeblogEntriesDayPager.java | 4 ++--
.../rendering/pagers/WeblogEntriesLatestPager.java | 4 ++--
.../rendering/pagers/WeblogEntriesListPager.java | 2 +-
.../rendering/pagers/WeblogEntriesMonthPager.java | 4 ++--
.../ui/rendering/pagers/WeblogsPager.java | 6 +++---
.../plugins/comments/CommentValidationManager.java | 2 +-
.../plugins/comments/LdapCommentAuthenticator.java | 2 +-
.../ui/rendering/servlets/FeedServlet.java | 4 ++--
.../ui/rendering/servlets/PageServlet.java | 4 ++--
.../ui/rendering/servlets/PlanetFeedServlet.java | 2 +-
.../ui/rendering/servlets/RSDServlet.java | 2 +-
.../ui/rendering/util/cache/PlanetCache.java | 2 +-
.../ui/rendering/util/cache/SiteWideCache.java | 2 +-
.../rendering/util/cache/WeblogCacheWarmupJob.java | 4 ++--
.../rendering/util/mobile/LiteDeviceResolver.java | 8 ++++----
.../rendering/velocity/WebappResourceLoader.java | 2 +-
.../ui/struts2/admin/GlobalCommentManagement.java | 8 ++++----
.../struts2/admin/GlobalCommentManagementBean.java | 4 ++--
.../weblogger/ui/struts2/admin/UserEdit.java | 2 +-
.../ui/struts2/ajax/ThemeDataServlet.java | 2 +-
.../weblogger/ui/struts2/editor/Bookmarks.java | 2 +-
.../ui/struts2/editor/CategoryRemove.java | 2 +-
.../weblogger/ui/struts2/editor/Comments.java | 14 ++++++-------
.../weblogger/ui/struts2/editor/CommentsBean.java | 6 +++---
.../weblogger/ui/struts2/editor/Entries.java | 10 ++++-----
.../weblogger/ui/struts2/editor/EntryEdit.java | 2 +-
.../weblogger/ui/struts2/editor/MediaFileAdd.java | 4 ++--
.../ui/struts2/editor/MediaFileImageChooser.java | 2 +-
.../weblogger/ui/struts2/editor/MediaFileView.java | 4 ++--
.../weblogger/ui/struts2/editor/Members.java | 4 ++--
.../roller/weblogger/ui/struts2/editor/Pings.java | 2 +-
.../weblogger/ui/struts2/editor/TemplateEdit.java | 2 +-
.../weblogger/ui/struts2/editor/Templates.java | 4 ++--
.../weblogger/ui/struts2/editor/WeblogConfig.java | 2 +-
.../weblogger/ui/struts2/pagers/CommentsPager.java | 4 ++--
.../weblogger/ui/struts2/pagers/EntriesPager.java | 4 ++--
.../roller/weblogger/ui/struts2/util/UIAction.java | 4 ++--
.../roller/weblogger/util/Bannedwordslist.java | 8 ++++----
.../weblogger/util/BannedwordslistChecker.java | 8 ++++----
.../roller/weblogger/util/GenericThrottle.java | 2 +-
.../roller/weblogger/util/HTMLSanitizer.java | 4 ++--
.../apache/roller/weblogger/util/LRUCache2.java | 2 +-
.../org/apache/roller/weblogger/util/MailUtil.java | 6 +++---
.../roller/weblogger/util/RollerMessages.java | 4 ++--
.../apache/roller/weblogger/util/Utilities.java | 2 +-
.../roller/weblogger/util/cache/CacheManager.java | 6 +++---
.../roller/weblogger/util/cache/LRUCacheImpl.java | 2 +-
.../webservices/atomprotocol/EntryCollection.java | 16 +++++++--------
.../atomprotocol/RollerAtomService.java | 2 +-
110 files changed, 236 insertions(+), 236 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 c9df4d1..e0e8328 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
@@ -229,7 +229,7 @@ public class RomeFeedFetcher implements
org.apache.roller.planet.business.fetche
// copy categories
if (!romeEntry.getCategories().isEmpty()) {
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
for (Object cat : romeEntry.getCategories()) {
list.add(((SyndCategory) cat).getName());
}
diff --git a/app/src/main/java/org/apache/roller/planet/pojos/Planet.java
b/app/src/main/java/org/apache/roller/planet/pojos/Planet.java
index c3b0bdd..70a1be2 100644
--- a/app/src/main/java/org/apache/roller/planet/pojos/Planet.java
+++ b/app/src/main/java/org/apache/roller/planet/pojos/Planet.java
@@ -31,7 +31,7 @@ public class Planet implements Comparable<Planet> {
private String handle = null;
private String title = null;
private String description = null;
- private Set<PlanetGroup> groups = new TreeSet<PlanetGroup>();
+ private Set<PlanetGroup> groups = new TreeSet<>();
public Planet() {
diff --git a/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
b/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
index 1427047..8f07e06 100644
--- a/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
+++ b/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
@@ -47,7 +47,7 @@ public class PlanetGroup implements Serializable,
Comparable<PlanetGroup> {
// associations
private Planet planet = null;
- private Set<Subscription> subscriptions = new TreeSet<Subscription>();
+ private Set<Subscription> subscriptions = new TreeSet<>();
public PlanetGroup() {}
diff --git a/app/src/main/java/org/apache/roller/planet/pojos/Subscription.java
b/app/src/main/java/org/apache/roller/planet/pojos/Subscription.java
index 3ecd0d7..552565f 100644
--- a/app/src/main/java/org/apache/roller/planet/pojos/Subscription.java
+++ b/app/src/main/java/org/apache/roller/planet/pojos/Subscription.java
@@ -40,8 +40,8 @@ public class Subscription implements Serializable,
Comparable<Subscription> {
private int inboundblogs = 0;
// associations
- private Set<PlanetGroup> groups = new HashSet<PlanetGroup>();
- private Set<SubscriptionEntry> entries = new HashSet<SubscriptionEntry>();
+ private Set<PlanetGroup> groups = new HashSet<>();
+ private Set<SubscriptionEntry> entries = new HashSet<>();
public Subscription() {}
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 cbcba0a..51ab6aa 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
@@ -209,7 +209,7 @@ public class SubscriptionEntry implements Serializable,
Comparable<SubscriptionE
* Returns categories as list of WeblogCategoryData objects.
*/
public List<Category> getCategories() {
- List<Category> list = new ArrayList<Category>();
+ List<Category> list = new ArrayList<>();
if (getCategoriesString() != null) {
String[] catArray =
Utilities.stringToStringArray(getCategoriesString(),",");
for (String catName : catArray) {
diff --git a/app/src/main/java/org/apache/roller/util/RegexUtil.java
b/app/src/main/java/org/apache/roller/util/RegexUtil.java
index 2bc2b26..8ea434b 100644
--- a/app/src/main/java/org/apache/roller/util/RegexUtil.java
+++ b/app/src/main/java/org/apache/roller/util/RegexUtil.java
@@ -84,7 +84,7 @@ public final class RegexUtil {
* @return List of matched groups from the pattern.
*/
public static List<String> getMatches(Pattern pattern, String match, int
group) {
- List<String> matches = new ArrayList<String>();
+ List<String> matches = new ArrayList<>();
Matcher matcher = pattern.matcher(match);
while (matcher.find()) {
matches.add( matcher.group(group) );
diff --git a/app/src/main/java/org/apache/roller/weblogger/TestUtils.java
b/app/src/main/java/org/apache/roller/weblogger/TestUtils.java
index 94b7735..9cf94e1 100644
--- a/app/src/main/java/org/apache/roller/weblogger/TestUtils.java
+++ b/app/src/main/java/org/apache/roller/weblogger/TestUtils.java
@@ -158,7 +158,7 @@ public final class TestUtils {
+ scriptProvider.getScriptURL(scriptFile));
// Loop script and remove invalid lines
- List<String> updatedCommands = new ArrayList<String>();
+ List<String> updatedCommands = new ArrayList<>();
List<String> commands = runner.getCommands();
for (String command : commands) {
if (!command.startsWith("--")) {
diff --git
a/app/src/main/java/org/apache/roller/weblogger/business/AbstractURLStrategy.java
b/app/src/main/java/org/apache/roller/weblogger/business/AbstractURLStrategy.java
index c36392d..1567eaf 100644
---
a/app/src/main/java/org/apache/roller/weblogger/business/AbstractURLStrategy.java
+++
b/app/src/main/java/org/apache/roller/weblogger/business/AbstractURLStrategy.java
@@ -115,7 +115,7 @@ public abstract class AbstractURLStrategy implements
URLStrategy {
url.append("/").append(action).append(".rol");
// put weblog handle parameter, if necessary
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
if(weblogHandle != null) {
params.put("weblog", weblogHandle);
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/business/DatabaseProvider.java
b/app/src/main/java/org/apache/roller/weblogger/business/DatabaseProvider.java
index 8e9c6bc..543eb59 100644
---
a/app/src/main/java/org/apache/roller/weblogger/business/DatabaseProvider.java
+++
b/app/src/main/java/org/apache/roller/weblogger/business/DatabaseProvider.java
@@ -64,7 +64,7 @@ public class DatabaseProvider {
public enum ConfigurationType {JNDI_NAME, JDBC_PROPERTIES}
private ConfigurationType type = ConfigurationType.JNDI_NAME;
- private List<String> startupLog = new ArrayList<String>();
+ private List<String> startupLog = new ArrayList<>();
private DataSource dataSource = null;
private String jndiName = null;
diff --git
a/app/src/main/java/org/apache/roller/weblogger/business/HitCountQueue.java
b/app/src/main/java/org/apache/roller/weblogger/business/HitCountQueue.java
index 999914b..5e27ca0 100644
--- a/app/src/main/java/org/apache/roller/weblogger/business/HitCountQueue.java
+++ b/app/src/main/java/org/apache/roller/weblogger/business/HitCountQueue.java
@@ -94,7 +94,7 @@ public final class HitCountQueue {
public List<String> getHits() {
- return new ArrayList<String>(this.queue);
+ return new ArrayList<>(this.queue);
}
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 223810e..116e19a 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
@@ -108,7 +108,7 @@ public class JPAMediaFileManagerImpl implements
MediaFileManager {
public void moveMediaFiles(Collection<MediaFile> mediaFiles,
MediaFileDirectory targetDirectory) throws WebloggerException {
- List<MediaFile> moved = new ArrayList<MediaFile>();
+ List<MediaFile> moved = new ArrayList<>();
moved.addAll(mediaFiles);
for (MediaFile mediaFile : moved) {
@@ -536,7 +536,7 @@ public class JPAMediaFileManagerImpl implements
MediaFileManager {
public List<MediaFile> searchMediaFiles(Weblog weblog,
MediaFileFilter filter) throws WebloggerException {
- List<Object> params = new ArrayList<Object>();
+ List<Object> params = new ArrayList<>();
int size = 0;
String queryString = "SELECT m FROM MediaFile m WHERE ";
StringBuilder whereClause = new StringBuilder();
@@ -673,7 +673,7 @@ public class JPAMediaFileManagerImpl implements
MediaFileManager {
* creates migration status file only when work is complete.
*/
public List<String> upgradeFileStorage() {
- List<String> msgs = new ArrayList<String>();
+ List<String> msgs = new ArrayList<>();
String oldDirName = WebloggerConfig.getProperty("uploads.dir");
String FS = File.separator;
diff --git
a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java
b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java
index c81afdc..3e0bca7 100644
---
a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java
+++
b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java
@@ -50,7 +50,7 @@ public class JPAPersistenceStrategy {
/**
* The thread local EntityManager.
*/
- private final ThreadLocal<EntityManager> threadLocalEntityManager = new
ThreadLocal<EntityManager>();
+ private final ThreadLocal<EntityManager> threadLocalEntityManager = new
ThreadLocal<>();
/**
* The EntityManagerFactory for this Roller instance.
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 f58742f..0efd193 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
@@ -107,7 +107,7 @@ public class JPAPropertiesManagerImpl implements
PropertiesManager {
@Override
public Map<String, RuntimeConfigProperty> getProperties() throws
WebloggerException {
- HashMap<String, RuntimeConfigProperty> props = new HashMap<String,
RuntimeConfigProperty>();
+ HashMap<String, RuntimeConfigProperty> props = new HashMap<>();
List<RuntimeConfigProperty> list =
strategy.getNamedQuery("RuntimeConfigProperty.getAll",
RuntimeConfigProperty.class).getResultList();
/*
@@ -156,7 +156,7 @@ public class JPAPropertiesManagerImpl implements
PropertiesManager {
private Map initializeMissingProps(Map<String, RuntimeConfigProperty>
props) {
if(props == null) {
- props = new HashMap<String, RuntimeConfigProperty>();
+ props = new HashMap<>();
}
// start by getting our runtimeConfigDefs
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 c789862..654307b 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
@@ -293,7 +293,7 @@ public class JPAUserManagerImpl implements UserManager {
@Override
public Map<String, Long> getUserNameLetterMap() throws WebloggerException {
String lc = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
- Map<String, Long> results = new TreeMap<String, Long>();
+ Map<String, Long> results = new TreeMap<>();
TypedQuery<Long> query = strategy.getNamedQuery(
"User.getCountByUserNameLike", Long.class);
for (int i=0; i<26; i++) {
@@ -593,7 +593,7 @@ public class JPAUserManagerImpl implements UserManager {
TypedQuery<UserRole> q =
strategy.getNamedQuery("UserRole.getByUserName", UserRole.class);
q.setParameter(1, user.getUserName());
List<UserRole> roles = q.getResultList();
- List<String> roleNames = new ArrayList<String>();
+ List<String> roleNames = new ArrayList<>();
if (roles != null) {
for (UserRole userRole : roles) {
roleNames.add(userRole.getRole());
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 66336fb..7739adb 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
@@ -307,7 +307,7 @@ public class JPAWeblogEntryManagerImpl implements
WeblogEntryManager {
TypedQuery<WeblogEntry> query;
WeblogCategory category;
- List<Object> params = new ArrayList<Object>();
+ List<Object> params = new ArrayList<>();
int size = 0;
String queryString = "SELECT e FROM WeblogEntry e WHERE ";
StringBuilder whereClause = new StringBuilder();
@@ -385,7 +385,7 @@ public class JPAWeblogEntryManagerImpl implements
WeblogEntryManager {
cat = getWeblogCategoryByName(wesc.getWeblog(), wesc.getCatName());
}
- List<Object> params = new ArrayList<Object>();
+ List<Object> params = new ArrayList<>();
int size = 0;
StringBuilder queryString = new StringBuilder();
@@ -629,7 +629,7 @@ public class JPAWeblogEntryManagerImpl implements
WeblogEntryManager {
@Override
public List<WeblogEntryComment> getComments(CommentSearchCriteria csc)
throws WebloggerException {
- List<Object> params = new ArrayList<Object>();
+ List<Object> params = new ArrayList<>();
int size = 0;
StringBuilder queryString = new StringBuilder();
queryString.append("SELECT c FROM WeblogEntryComment c ");
@@ -790,7 +790,7 @@ public class JPAWeblogEntryManagerImpl implements
WeblogEntryManager {
*/
@Override
public Map<Date, String> getWeblogEntryStringMap(WeblogEntrySearchCriteria
wesc) throws WebloggerException {
- TreeMap<Date, String> map = new TreeMap<Date,
String>(Collections.reverseOrder());
+ TreeMap<Date, String> map = new TreeMap<>(Collections.reverseOrder());
List<WeblogEntry> entries = getWeblogEntries(wesc);
@@ -853,7 +853,7 @@ public class JPAWeblogEntryManagerImpl implements
WeblogEntryManager {
}
setFirstMax( query, offset, length);
queryResults = query.getResultList();
- List<StatCount> results = new ArrayList<StatCount>();
+ List<StatCount> results = new ArrayList<>();
if (queryResults != null) {
for (Object obj : queryResults) {
Object[] row = (Object[]) obj;
@@ -965,7 +965,7 @@ public class JPAWeblogEntryManagerImpl implements
WeblogEntryManager {
double min = Integer.MAX_VALUE;
double max = Integer.MIN_VALUE;
- List<TagStat> results = new ArrayList<TagStat>(limit >= 0 ? limit :
25);
+ List<TagStat> results = new ArrayList<>(limit >= 0 ? limit : 25);
if (queryResults != null) {
for (Object obj : queryResults) {
@@ -1005,7 +1005,7 @@ public class JPAWeblogEntryManagerImpl implements
WeblogEntryManager {
List queryResults;
boolean sortByName = sortBy == null || !sortBy.equals("count");
- List<Object> params = new ArrayList<Object>();
+ List<Object> params = new ArrayList<>();
int size = 0;
StringBuilder queryString = new StringBuilder();
queryString.append("SELECT w.name, SUM(w.total) FROM
WeblogEntryTagAggregate w WHERE ");
@@ -1036,7 +1036,7 @@ public class JPAWeblogEntryManagerImpl implements
WeblogEntryManager {
setFirstMax( query, offset, limit);
queryResults = query.getResultList();
- List<TagStat> results = new ArrayList<TagStat>();
+ List<TagStat> results = new ArrayList<>();
if (queryResults != null) {
for (Object obj : queryResults) {
Object[] row = (Object[]) obj;
@@ -1073,7 +1073,7 @@ public class JPAWeblogEntryManagerImpl implements
WeblogEntryManager {
queryString.append("FROM WeblogEntryTagAggregate w WHERE w.name IN (");
// Append tags as parameter markers to avoid potential escaping issues
// The IN clause would be of form (?1, ?2, ?3, ..)
- List<Object> params = new ArrayList<Object>(tags.size() + 1);
+ List<Object> params = new ArrayList<>(tags.size() + 1);
final String paramSeparator = ", ";
int i;
for (i=0; i < tags.size(); i++) {
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 2c9dae1..deaeabd 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
@@ -274,7 +274,7 @@ public class JPAWeblogManagerImpl implements WeblogManager {
throws WebloggerException {
// grant weblog creator ADMIN permission
- List<String> actions = new ArrayList<String>();
+ List<String> actions = new ArrayList<>();
actions.add(WeblogPermission.ADMIN);
roller.getUserManager().grantWeblogPermission(
newWeblog, newWeblog.getCreator(), actions);
@@ -419,7 +419,7 @@ public class JPAWeblogManagerImpl implements WeblogManager {
//if (endDate == null) endDate = new Date();
- List<Object> params = new ArrayList<Object>();
+ List<Object> params = new ArrayList<>();
int size = 0;
String queryString;
StringBuilder whereClause = new StringBuilder();
@@ -475,7 +475,7 @@ public class JPAWeblogManagerImpl implements WeblogManager {
@Override
public List<Weblog> getUserWeblogs(User user, boolean enabledOnly) throws
WebloggerException {
- List<Weblog> weblogs = new ArrayList<Weblog>();
+ List<Weblog> weblogs = new ArrayList<>();
if (user == null) {
return weblogs;
}
@@ -491,7 +491,7 @@ public class JPAWeblogManagerImpl implements WeblogManager {
@Override
public List<User> getWeblogUsers(Weblog weblog, boolean enabledOnly)
throws WebloggerException {
- List<User> users = new ArrayList<User>();
+ List<User> users = new ArrayList<>();
List<WeblogPermission> perms =
roller.getUserManager().getWeblogPermissions(weblog);
for (WeblogPermission perm : perms) {
User user = perm.getUser();
@@ -612,7 +612,7 @@ public class JPAWeblogManagerImpl implements WeblogManager {
@Override
public Map<String, Long> getWeblogHandleLetterMap() throws
WebloggerException {
String lc = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
- Map<String, Long> results = new TreeMap<String, Long>();
+ Map<String, Long> results = new TreeMap<>();
TypedQuery<Long> query = strategy.getNamedQuery(
"Weblog.getCountByHandleLike", Long.class);
for (int i=0; i<26; i++) {
@@ -671,7 +671,7 @@ public class JPAWeblogManagerImpl implements WeblogManager {
query.setMaxResults(length);
}
List queryResults = query.getResultList();
- List<StatCount> results = new ArrayList<StatCount>();
+ List<StatCount> results = new ArrayList<>();
if (queryResults != null) {
for (Object obj : queryResults) {
Object[] row = (Object[]) obj;
diff --git
a/app/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java
b/app/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java
index b747b0f..37ac7db 100644
---
a/app/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java
+++
b/app/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java
@@ -42,10 +42,10 @@ public class PluginManagerImpl implements PluginManager {
private static Log log = LogFactory.getLog(PluginManagerImpl.class);
// Plugin classes keyed by plugin name
- static Map<String, Class> mPagePlugins = new LinkedHashMap<String,
Class>();
+ static Map<String, Class> mPagePlugins = new LinkedHashMap<>();
// Comment plugins
- private List<WeblogEntryCommentPlugin> commentPlugins = new
ArrayList<WeblogEntryCommentPlugin>();
+ private List<WeblogEntryCommentPlugin> commentPlugins = new ArrayList<>();
/**
@@ -72,7 +72,7 @@ public class PluginManagerImpl implements PluginManager {
*/
@Override
public Map<String, WeblogEntryPlugin> getWeblogEntryPlugins(Weblog
website) {
- Map<String, WeblogEntryPlugin> ret = new LinkedHashMap<String,
WeblogEntryPlugin>();
+ Map<String, WeblogEntryPlugin> ret = new LinkedHashMap<>();
for (Class pluginClass : PluginManagerImpl.mPagePlugins.values()) {
try {
WeblogEntryPlugin plugin =
(WeblogEntryPlugin)pluginClass.newInstance();
diff --git
a/app/src/main/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java
b/app/src/main/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java
index 2d0ed81..6b0754d 100644
---
a/app/src/main/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java
+++
b/app/src/main/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java
@@ -65,7 +65,7 @@ public class HitCountProcessingJob implements Job {
hitCounter.resetHits();
// tally the counts, grouped by weblog handle
- Map<String, Long> hitsTally = new HashMap<String, Long>();
+ Map<String, Long> hitsTally = new HashMap<>();
for (String weblogHandle : currentHits) {
Long count = hitsTally.get(weblogHandle);
if(count == null) {
diff --git
a/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java
b/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java
index 0cceeb9..6f3d98b 100644
---
a/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java
+++
b/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java
@@ -65,7 +65,7 @@ public abstract class ThreadManagerImpl implements
ThreadManager {
public void initialize() throws InitializationException {
// initialize tasks, making sure that each task has a tasklock record
in the db
- List<RollerTask> webloggerTasks = new ArrayList<RollerTask>();
+ List<RollerTask> webloggerTasks = new ArrayList<>();
String tasksStr = WebloggerConfig.getProperty("tasks.enabled");
String[] tasks = StringUtils.stripAll(StringUtils.split(tasksStr,
","));
for ( String taskName : tasks ) {
diff --git
a/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
b/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
index f1df894..7c80191 100644
---
a/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
+++
b/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
@@ -43,7 +43,7 @@ public class DatabaseInstaller {
private final DatabaseProvider db;
private final DatabaseScriptProvider scripts;
private final String version;
- private List<String> messages = new ArrayList<String>();
+ private List<String> messages = new ArrayList<>();
// the name of the property which holds the dbversion value
private static final String DBVERSION_PROP = "roller.database.version";
diff --git
a/app/src/main/java/org/apache/roller/weblogger/business/startup/SQLScriptRunner.java
b/app/src/main/java/org/apache/roller/weblogger/business/startup/SQLScriptRunner.java
index cf34383..ec9f7f2 100644
---
a/app/src/main/java/org/apache/roller/weblogger/business/startup/SQLScriptRunner.java
+++
b/app/src/main/java/org/apache/roller/weblogger/business/startup/SQLScriptRunner.java
@@ -35,8 +35,8 @@ import java.util.List;
*/
public class SQLScriptRunner {
- private List<String> commands = new ArrayList<String>();
- private List<String> messages = new ArrayList<String>();
+ private List<String> commands = new ArrayList<>();
+ private List<String> messages = new ArrayList<>();
private boolean failed = false;
private boolean errors = false;
diff --git
a/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
b/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
index fe8c0db..46ecb78 100644
---
a/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
+++
b/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
@@ -51,17 +51,17 @@ public class SharedThemeFromDir extends SharedTheme {
private ThemeTemplate stylesheet = null;
// we keep templates in a Map for faster lookups by name
- private Map<String, ThemeTemplate> templatesByName = new HashMap<String,
ThemeTemplate>();
+ private Map<String, ThemeTemplate> templatesByName = new HashMap<>();
// we keep templates in a Map for faster lookups by link
- private Map<String, ThemeTemplate> templatesByLink = new HashMap<String,
ThemeTemplate>();
+ private Map<String, ThemeTemplate> templatesByLink = new HashMap<>();
// we keep templates in a Map for faster lookups by action
- private Map<ComponentType, ThemeTemplate> templatesByAction = new
EnumMap<ComponentType, ThemeTemplate>(ComponentType.class);
+ private Map<ComponentType, ThemeTemplate> templatesByAction = new
EnumMap<>(ComponentType.class);
// we keep resources in a Map for faster lookups by path
// the Map contains ... (resource path, ThemeResource)
- private Map<String, ThemeResource> resources = new HashMap<String,
ThemeResource>();
+ private Map<String, ThemeResource> resources = new HashMap<>();
public SharedThemeFromDir(String themeDirPath)
throws ThemeInitializationException {
@@ -85,7 +85,7 @@ public class SharedThemeFromDir extends SharedTheme {
*/
@Override
public List<ThemeTemplate> getTemplates() {
- return new ArrayList<ThemeTemplate>(this.templatesByName.values());
+ return new ArrayList<>(this.templatesByName.values());
}
/**
@@ -140,7 +140,7 @@ public class SharedThemeFromDir extends SharedTheme {
@Override
public List<ThemeResource> getResources() {
- List<ThemeResource> myResources = new
ArrayList<ThemeResource>(this.resources.values());
+ List<ThemeResource> myResources = new
ArrayList<>(this.resources.values());
// make sure resources are sorted.
Collections.sort(myResources);
@@ -215,7 +215,7 @@ public class SharedThemeFromDir extends SharedTheme {
}
// available types with Roller
- List<RenditionType> availableTypesList = new
ArrayList<RenditionType>();
+ List<RenditionType> availableTypesList = new ArrayList<>();
availableTypesList.add(RenditionType.STANDARD);
if (themeMetadata.getDualTheme()) {
availableTypesList.add(RenditionType.MOBILE);
diff --git
a/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
b/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
index c8969f4..dbf525a 100644
---
a/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
+++
b/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
@@ -49,7 +49,7 @@ public class SharedThemeTemplate implements ThemeTemplate,
Serializable {
private String type = null;
//hash map to cache template Code objects parsed
- private Map<RenditionType, TemplateRendition> templateRenditionHashMap =
new EnumMap<RenditionType, TemplateRendition>(RenditionType.class);
+ private Map<RenditionType, TemplateRendition> templateRenditionHashMap =
new EnumMap<>(RenditionType.class);
public SharedThemeTemplate() {}
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 57d77a4..0147523 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
@@ -179,7 +179,7 @@ public class ThemeManagerImpl implements ThemeManager {
*/
@Override
public List<SharedTheme> getEnabledThemesList() {
- List<SharedTheme> allThemes = new
ArrayList<SharedTheme>(this.themes.values());
+ List<SharedTheme> allThemes = new
ArrayList<>(this.themes.values());
// sort 'em ... default ordering for themes is by name
Collections.sort(allThemes);
@@ -373,7 +373,7 @@ public class ThemeManagerImpl implements ThemeManager {
*/
private Map<String, SharedTheme> loadAllThemesFromDisk() {
- Map<String, SharedTheme> themeMap = new HashMap<String,
SharedTheme>();
+ Map<String, SharedTheme> themeMap = new HashMap<>();
// first, get a list of the themes available
File themesdir = new File(this.themeDir);
diff --git
a/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadata.java
b/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadata.java
index f8c1c03..1760cfa 100644
---
a/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadata.java
+++
b/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadata.java
@@ -33,8 +33,8 @@ public class ThemeMetadata {
private String previewImage = null;
private Boolean dualTheme = false;
private ThemeMetadataTemplate stylesheet = null;
- private Set<ThemeMetadataTemplate> templates = new
HashSet<ThemeMetadataTemplate>();
- private Set<String> resources = new HashSet<String>();
+ private Set<ThemeMetadataTemplate> templates = new HashSet<>();
+ private Set<String> resources = new HashSet<>();
public ThemeMetadata() {
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataTemplate.java
b/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataTemplate.java
index 0c24265..af906d9 100644
---
a/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataTemplate.java
+++
b/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataTemplate.java
@@ -40,7 +40,7 @@ public class ThemeMetadataTemplate {
// Hash table to keep metadata about parsed template code files
private Map<RenditionType, ThemeMetadataTemplateRendition>
templateRenditionTable
- = new EnumMap<RenditionType,
ThemeMetadataTemplateRendition>(RenditionType.class);
+ = new EnumMap<>(RenditionType.class);
public ComponentType getAction() {
return action;
diff --git
a/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java
b/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java
index f0cc07b..ff5ccb1 100644
---
a/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java
+++
b/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java
@@ -85,7 +85,7 @@ public class WeblogSharedTheme extends WeblogTheme {
@Override
public List<ThemeTemplate> getTemplates() throws WebloggerException {
- Map<String, ThemeTemplate> pages = new TreeMap<String,
ThemeTemplate>();
+ Map<String, ThemeTemplate> pages = new TreeMap<>();
// first get the pages from the db
try {
@@ -110,7 +110,7 @@ public class WeblogSharedTheme extends WeblogTheme {
log.error(e);
}
- return new ArrayList<ThemeTemplate>(pages.values());
+ return new ArrayList<>(pages.values());
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java
b/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java
index 7424e6c..efbc443 100644
--- a/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java
+++ b/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java
@@ -90,7 +90,7 @@ public final class PingConfig {
// This was introduced in order to support certain buggy (but popular) ping
// targets that implement minor variants of the WeblogUpdates.ping call.
// This is initialized once at startup, and referenced when pings are made.
- private static final Map<String, Set<String>> CONFIGURED_VARIANTS = new
HashMap<String, Set<String>>();
+ private static final Map<String, Set<String>> CONFIGURED_VARIANTS = new
HashMap<>();
// Pattern used to parse common ping targets as well as ping variants.
// Each initial commmon ping target is specified in the format
{{name}{url}}
@@ -226,7 +226,7 @@ public final class PingConfig {
if (m.matches() && m.groupCount() == 2) {
String url = m.group(1).trim();
String optionsList = m.group(2).trim();
- Set<String> variantOptions = new HashSet<String>();
+ Set<String> variantOptions = new HashSet<>();
String[] options = optionsList.split(",");
for (int j = 0; j < options.length; j++) {
String option = options[j].trim().toLowerCase();
diff --git
a/app/src/main/java/org/apache/roller/weblogger/config/runtime/ConfigDef.java
b/app/src/main/java/org/apache/roller/weblogger/config/runtime/ConfigDef.java
index b369465..3078313 100644
---
a/app/src/main/java/org/apache/roller/weblogger/config/runtime/ConfigDef.java
+++
b/app/src/main/java/org/apache/roller/weblogger/config/runtime/ConfigDef.java
@@ -39,7 +39,7 @@ public class ConfigDef {
public ConfigDef() {
- this.displayGroups = new ArrayList<DisplayGroup>();
+ this.displayGroups = new ArrayList<>();
}
public ConfigDef(List<DisplayGroup> displaygroups) {
diff --git
a/app/src/main/java/org/apache/roller/weblogger/config/runtime/DisplayGroup.java
b/app/src/main/java/org/apache/roller/weblogger/config/runtime/DisplayGroup.java
index 19622f8..796c788 100644
---
a/app/src/main/java/org/apache/roller/weblogger/config/runtime/DisplayGroup.java
+++
b/app/src/main/java/org/apache/roller/weblogger/config/runtime/DisplayGroup.java
@@ -40,7 +40,7 @@ public class DisplayGroup {
public DisplayGroup() {
- this.propertyDefs = new ArrayList<PropertyDef>();
+ this.propertyDefs = new ArrayList<>();
}
public DisplayGroup(List<PropertyDef> propdefs) {
diff --git
a/app/src/main/java/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefs.java
b/app/src/main/java/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefs.java
index 53d9723..a95ed82 100644
---
a/app/src/main/java/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefs.java
+++
b/app/src/main/java/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefs.java
@@ -38,7 +38,7 @@ public class RuntimeConfigDefs {
public RuntimeConfigDefs() {
- this.configDefs = new ArrayList<ConfigDef>();
+ this.configDefs = new ArrayList<>();
}
public RuntimeConfigDefs(List<ConfigDef> configs) {
diff --git
a/app/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java
b/app/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java
index 33999d5..95675b2 100644
---
a/app/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java
+++
b/app/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java
@@ -160,7 +160,7 @@ public class SyncWebsitesTask extends RollerTaskWithLeasing
{
}
// walk through all enable weblogs and add/update subs as needed
- List<String> liveUserFeeds = new ArrayList<String>();
+ List<String> liveUserFeeds = new ArrayList<>();
List<Weblog> websites = WebloggerFactory.getWeblogger()
.getWeblogManager().getWeblogs(Boolean.TRUE, Boolean.TRUE,
null, null, 0, -1);
for ( Weblog weblog : websites ) {
@@ -204,7 +204,7 @@ public class SyncWebsitesTask extends RollerTaskWithLeasing
{
}
// new subs added, existing subs updated, now delete old subs
- Set<Subscription> deleteSubs = new HashSet<Subscription>();
+ Set<Subscription> deleteSubs = new HashSet<>();
Set<Subscription> subs = group.getSubscriptions();
for (Subscription sub : subs) {
// only delete subs from the group if ...
diff --git
a/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java
b/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java
index 3140b97..cea9025 100644
--- a/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java
+++ b/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java
@@ -96,7 +96,7 @@ public class PlanetGroups extends PlanetUIAction implements
ServletRequestAware
}
public List<PlanetGroup> getGroups() {
- List<PlanetGroup> displayGroups = new ArrayList<PlanetGroup>();
+ List<PlanetGroup> displayGroups = new ArrayList<>();
for (PlanetGroup planetGroup : getPlanet().getGroups()) {
// The "all" group is considered a special group and cannot be
managed independently
diff --git
a/app/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java
b/app/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java
index d91ba76..ecf9ef1 100644
--- a/app/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java
+++ b/app/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java
@@ -56,7 +56,7 @@ public class GlobalPermission extends RollerPermission {
// loop through user's roles, adding actions implied by each
List<String> roles =
WebloggerFactory.getWeblogger().getUserManager().getRoles(user);
- List<String> actionsList = new ArrayList<String>();
+ List<String> actionsList = new ArrayList<>();
for (String role : roles) {
String impliedActions = WebloggerConfig.getProperty("role.action."
+ role);
if (impliedActions != null) {
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 01a12d9..e753c08 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
@@ -74,9 +74,9 @@ public class MediaFile implements Serializable {
// TODO: anchor to be populated
// private String anchor;
- private Set<MediaFileTag> tagSet = new HashSet<MediaFileTag>();
- private Set<String> removedTags = new HashSet<String>();
- private Set<String> addedTags = new HashSet<String>();
+ private Set<MediaFileTag> tagSet = new HashSet<>();
+ private Set<String> removedTags = new HashSet<>();
+ private Set<String> addedTags = new HashSet<>();
public MediaFile() {
}
@@ -201,8 +201,8 @@ public class MediaFile implements Serializable {
private void setTags(Set<MediaFileTag> tagSet) throws WebloggerException {
this.tagSet = tagSet;
- this.removedTags = new HashSet<String>();
- this.addedTags = new HashSet<String>();
+ this.removedTags = new HashSet<>();
+ this.addedTags = new HashSet<>();
}
/**
@@ -253,7 +253,7 @@ public class MediaFile implements Serializable {
return;
}
- HashSet<String> newTags = new HashSet<String>(updatedTags.size());
+ HashSet<String> newTags = new HashSet<>(updatedTags.size());
Locale localeObject = getWeblog() != null ? getWeblog()
.getLocaleInstance() : Locale.getDefault();
@@ -261,7 +261,7 @@ public class MediaFile implements Serializable {
newTags.add(Utilities.normalizeTag(inName, localeObject));
}
- HashSet<String> removeTags = new HashSet<String>();
+ HashSet<String> removeTags = new HashSet<>();
// remove old ones no longer passed.
for (MediaFileTag tag : getTags()) {
diff --git
a/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java
b/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java
index 99f23db..7b1d3b9 100644
---
a/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java
+++
b/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java
@@ -33,7 +33,7 @@ public class MediaFileDirectory {
String name;
String description;
Weblog weblog;
- Set<MediaFile> mediaFiles = new HashSet<MediaFile>();
+ Set<MediaFile> mediaFiles = new HashSet<>();
public MediaFileDirectory() {
}
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 05be733..dd02445 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
@@ -90,11 +90,11 @@ public class Weblog implements Serializable {
private Map<String, WeblogEntryPlugin> initializedPlugins = null;
- private List<WeblogCategory> weblogCategories = new
ArrayList<WeblogCategory>();
+ private List<WeblogCategory> weblogCategories = new ArrayList<>();
- private List<WeblogBookmarkFolder> bookmarkFolders = new
ArrayList<WeblogBookmarkFolder>();
+ private List<WeblogBookmarkFolder> bookmarkFolders = new ArrayList<>();
- private List<MediaFileDirectory> mediaFileDirectories = new
ArrayList<MediaFileDirectory>();
+ private List<MediaFileDirectory> mediaFileDirectories = new ArrayList<>();
public Weblog() {
}
@@ -644,7 +644,7 @@ public class Weblog implements Serializable {
if (length > MAX_ENTRIES) {
length = MAX_ENTRIES;
}
- List<WeblogEntry> recentEntries = new ArrayList<WeblogEntry>();
+ List<WeblogEntry> recentEntries = new ArrayList<>();
if (length < 1) {
return recentEntries;
}
@@ -675,8 +675,8 @@ public class Weblog implements Serializable {
if (length > MAX_ENTRIES) {
length = MAX_ENTRIES;
}
- List<WeblogEntry> recentEntries = new ArrayList<WeblogEntry>();
- List<String> tags = new ArrayList<String>();
+ List<WeblogEntry> recentEntries = new ArrayList<>();
+ List<String> tags = new ArrayList<>();
if (tag != null) {
tags.add(tag);
}
@@ -706,7 +706,7 @@ public class Weblog implements Serializable {
if (length > MAX_ENTRIES) {
length = MAX_ENTRIES;
}
- List<WeblogEntryComment> recentComments = new
ArrayList<WeblogEntryComment>();
+ List<WeblogEntryComment> recentComments = new ArrayList<>();
if (length < 1) {
return recentComments;
}
@@ -771,7 +771,7 @@ public class Weblog implements Serializable {
* @return Collection of WeblogEntryTag objects
*/
public List<TagStat> getPopularTags(int sinceDays, int length) {
- List<TagStat> results = new ArrayList<TagStat>();
+ List<TagStat> results = new ArrayList<>();
Date startDate = null;
if(sinceDays > 0) {
Calendar cal = Calendar.getInstance();
diff --git
a/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
b/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
index 8757712..a442547 100644
---
a/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
+++
b/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
@@ -44,7 +44,7 @@ public class WeblogBookmarkFolder implements Serializable,
Comparable<WeblogBook
// associations
private Weblog weblog = null;
- private List<WeblogBookmark> bookmarks = new ArrayList<WeblogBookmark>();
+ private List<WeblogBookmark> bookmarks = new ArrayList<>();
public WeblogBookmarkFolder() {
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 f12e336..448e0df 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
@@ -102,11 +102,11 @@ public class WeblogEntry implements Serializable {
private WeblogCategory category = null;
// Collection of name/value entry attributes
- private Set<WeblogEntryAttribute> attSet = new
TreeSet<WeblogEntryAttribute>();
+ private Set<WeblogEntryAttribute> attSet = new TreeSet<>();
- private Set<WeblogEntryTag> tagSet = new HashSet<WeblogEntryTag>();
- private Set<WeblogEntryTag> removedTags = new HashSet<WeblogEntryTag>();
- private Set<WeblogEntryTag> addedTags = new HashSet<WeblogEntryTag>();
+ private Set<WeblogEntryTag> tagSet = new HashSet<>();
+ private Set<WeblogEntryTag> removedTags = new HashSet<>();
+ private Set<WeblogEntryTag> addedTags = new HashSet<>();
//----------------------------------------------------------- Construction
@@ -234,7 +234,7 @@ public class WeblogEntry implements Serializable {
* Added for symmetry with PlanetEntryData object.
*/
public List<WeblogCategory> getCategories() {
- List<WeblogCategory> cats = new ArrayList<WeblogCategory>();
+ List<WeblogCategory> cats = new ArrayList<>();
cats.add(getCategory());
return cats;
}
@@ -536,8 +536,8 @@ public class WeblogEntry implements Serializable {
@SuppressWarnings("unused")
private void setTags(Set<WeblogEntryTag> tagSet) throws WebloggerException
{
this.tagSet = tagSet;
- this.removedTags = new HashSet<WeblogEntryTag>();
- this.addedTags = new HashSet<WeblogEntryTag>();
+ this.removedTags = new HashSet<>();
+ this.addedTags = new HashSet<>();
}
/**
@@ -581,7 +581,7 @@ public class WeblogEntry implements Serializable {
public String getTagsAsString() {
StringBuilder sb = new StringBuilder();
// Sort by name
- Set<WeblogEntryTag> tmp = new TreeSet<WeblogEntryTag>(new
WeblogEntryTagComparator());
+ Set<WeblogEntryTag> tmp = new TreeSet<>(new
WeblogEntryTagComparator());
tmp.addAll(getTags());
for (WeblogEntryTag entryTag : tmp) {
sb.append(entryTag.getName()).append(" ");
@@ -601,7 +601,7 @@ public class WeblogEntry implements Serializable {
}
List<String> updatedTags = Utilities.splitStringAsTags(tags);
- Set<String> newTags = new HashSet<String>(updatedTags.size());
+ Set<String> newTags = new HashSet<>(updatedTags.size());
Locale localeObject = getWebsite() != null ?
getWebsite().getLocaleInstance() : Locale.getDefault();
for (String name : updatedTags) {
@@ -724,7 +724,7 @@ 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<WeblogEntryComment>();
+ List<WeblogEntryComment> list = new ArrayList<>();
try {
WeblogEntryManager wmgr =
WebloggerFactory.getWeblogger().getWeblogEntryManager();
@@ -882,7 +882,7 @@ public class WeblogEntry implements Serializable {
if (getPlugins() != null) {
return Arrays.asList( StringUtils.split(getPlugins(), ",") );
}
- return new ArrayList<String>();
+ return new ArrayList<>();
}
/** Convenience method for checking status */
@@ -1005,7 +1005,7 @@ public class WeblogEntry implements Serializable {
displayContent = this.getTransformedSummary();
if(StringUtils.isNotEmpty(this.getText())) {
// add read more
- List<String> args = new ArrayList<String>();
+ List<String> args = new ArrayList<>();
args.add(readMoreLink);
// TODO: we need a more appropriate way to get the view
locale here
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 0fec206..a220c95 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
@@ -36,7 +36,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<String>();
+ public static final List<String> ALL_ACTIONS = new ArrayList<>();
static {
ALL_ACTIONS.add(EDIT_DRAFT);
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 b815c8c..b35a704 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
@@ -58,7 +58,7 @@ public class WeblogTemplate implements ThemeTemplate,
Serializable {
private Weblog weblog = null;
static {
- requiredTemplates = new HashSet<String>();
+ requiredTemplates = new HashSet<>();
requiredTemplates.add("Weblog");
requiredTemplates.add("_day");
}
@@ -157,7 +157,7 @@ public class WeblogTemplate implements ThemeTemplate,
Serializable {
this.outputContentType = outputContentType;
}
- private List<CustomTemplateRendition> templateRenditions = new
ArrayList<CustomTemplateRendition>();
+ private List<CustomTemplateRendition> templateRenditions = new
ArrayList<>();
/**
* Determine if this WeblogTemplate is required or not.
diff --git
a/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java
b/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java
index 7eeb706..ff20656 100644
---
a/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java
+++
b/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java
@@ -55,7 +55,7 @@ public final class WeblogBookmarkFolderWrapper {
public List<WeblogBookmarkWrapper> getBookmarks() {
// iterate through and wrap
- List<WeblogBookmarkWrapper> wrappedCollection = new
ArrayList<WeblogBookmarkWrapper>(this.pojo.getBookmarks().size());
+ List<WeblogBookmarkWrapper> wrappedCollection = new
ArrayList<>(this.pojo.getBookmarks().size());
for (WeblogBookmark bookmark : this.pojo.getBookmarks()) {
wrappedCollection.add(WeblogBookmarkWrapper.wrap(bookmark));
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java
b/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java
index 73da6b0..3b948f2 100644
---
a/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java
+++
b/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java
@@ -209,7 +209,7 @@ public final class WeblogEntryWrapper {
public List getTags() {
// Sort by name
- Set<WeblogEntryTag> initialCollection = new
TreeSet<WeblogEntryTag>(new WeblogEntryTagComparator());
+ Set<WeblogEntryTag> initialCollection = new TreeSet<>(new
WeblogEntryTagComparator());
initialCollection.addAll(this.pojo.getTags());
// iterate through and wrap
diff --git
a/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
b/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
index 375cba6..703846c 100644
---
a/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
+++
b/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
@@ -83,7 +83,7 @@ public final class WeblogWrapper {
public List<ThemeTemplateWrapper> getTemplates() throws WebloggerException
{
List<? extends ThemeTemplate> unwrapped =
this.pojo.getTheme().getTemplates();
- List<ThemeTemplateWrapper> wrapped = new
ArrayList<ThemeTemplateWrapper>(unwrapped.size());
+ List<ThemeTemplateWrapper> wrapped = new ArrayList<>(unwrapped.size());
int i = 0;
for (ThemeTemplate template : unwrapped) {
@@ -293,7 +293,7 @@ public final class WeblogWrapper {
public List<WeblogCategoryWrapper> getWeblogCategories() {
List<WeblogCategory> unwrapped = this.pojo.getWeblogCategories();
- List<WeblogCategoryWrapper> wrapped = new
ArrayList<WeblogCategoryWrapper>(unwrapped.size());
+ List<WeblogCategoryWrapper> wrapped = new
ArrayList<>(unwrapped.size());
int i = 0;
for (WeblogCategory category : unwrapped) {
@@ -310,7 +310,7 @@ public final class WeblogWrapper {
public List<WeblogEntryWrapper> getRecentWeblogEntries(String cat,int
length) {
List<WeblogEntry> unwrapped = this.pojo.getRecentWeblogEntries(cat,
length);
- List<WeblogEntryWrapper> wrapped = new
ArrayList<WeblogEntryWrapper>(unwrapped.size());
+ List<WeblogEntryWrapper> wrapped = new ArrayList<>(unwrapped.size());
int i = 0;
for (WeblogEntry we : unwrapped) {
@@ -323,7 +323,7 @@ public final class WeblogWrapper {
public List<WeblogEntryWrapper> getRecentWeblogEntriesByTag(String tag,int
length) {
List<WeblogEntry> unwrapped =
pojo.getRecentWeblogEntriesByTag(tag,length);
- List<WeblogEntryWrapper> wrapped = new
ArrayList<WeblogEntryWrapper>(unwrapped.size());
+ List<WeblogEntryWrapper> wrapped = new ArrayList<>(unwrapped.size());
int i = 0;
for (WeblogEntry we : unwrapped) {
@@ -336,7 +336,7 @@ public final class WeblogWrapper {
public List<WeblogEntryCommentWrapper> getRecentComments(int length) {
List<WeblogEntryComment> unwrapped =
this.pojo.getRecentComments(length);
- List<WeblogEntryCommentWrapper> wrapped = new
ArrayList<WeblogEntryCommentWrapper>(unwrapped.size());
+ List<WeblogEntryCommentWrapper> wrapped = new
ArrayList<>(unwrapped.size());
int i = 0;
for (WeblogEntryComment wec : unwrapped) {
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/core/security/AuthoritiesPopulator.java
b/app/src/main/java/org/apache/roller/weblogger/ui/core/security/AuthoritiesPopulator.java
index 0d26776..5aca637 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/core/security/AuthoritiesPopulator.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/core/security/AuthoritiesPopulator.java
@@ -56,7 +56,7 @@ public class AuthoritiesPopulator implements
LdapAuthoritiesPopulator {
}
User user;
- List<String> roles = new ArrayList<String>();
+ List<String> roles = new ArrayList<>();
try {
Weblogger roller = WebloggerFactory.getWeblogger();
UserManager umgr = roller.getUserManager();
@@ -69,7 +69,7 @@ public class AuthoritiesPopulator implements
LdapAuthoritiesPopulator {
}
int roleCount = roles.size() + (defaultRole != null ? 1 : 0);
- List<GrantedAuthority> authorities = new
ArrayList<GrantedAuthority>(roleCount);
+ List<GrantedAuthority> authorities = new ArrayList<>(roleCount);
for (String role : roles) {
authorities.add(new SimpleGrantedAuthority(role));
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java
b/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java
index ccb81a4..db41c19 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java
@@ -61,7 +61,7 @@ public class RollerUserDetailsService implements
UserDetailsService {
// openid authentication in order to receive OpenID Simple
Registration (SREG)
// attributes from the authentication filter and save them
if (userData == null) {
- authorities = new ArrayList<SimpleGrantedAuthority>(1);
+ authorities = new ArrayList<>(1);
SimpleGrantedAuthority g = new
SimpleGrantedAuthority("rollerOpenidLogin");
authorities.add(g);
name = "openid";
@@ -96,7 +96,7 @@ public class RollerUserDetailsService implements
UserDetailsService {
private List<SimpleGrantedAuthority> getAuthorities(User userData,
UserManager umgr) throws WebloggerException {
List<String> roles = umgr.getRoles(userData);
- List<SimpleGrantedAuthority> authorities = new
ArrayList<SimpleGrantedAuthority>(roles.size());
+ List<SimpleGrantedAuthority> authorities = new
ArrayList<>(roles.size());
for (String role : roles) {
authorities.add(new SimpleGrantedAuthority(role));
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
b/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
index e416bf5..cafe178 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
@@ -54,10 +54,10 @@ public final class MenuHelper {
private static Log log = LogFactory.getLog(MenuHelper.class);
- private static Map<String, ParsedMenu> menus = new HashMap<String,
ParsedMenu>();
+ private static Map<String, ParsedMenu> menus = new HashMap<>();
// menu, menuName, tabName action/subaction check
- private static Map<String, HashMap<String, HashSet<String>>> itemMenu =
new HashMap<String, HashMap<String, HashSet<String>>>();
+ private static Map<String, HashMap<String, HashSet<String>>> itemMenu =
new HashMap<>();
private MenuHelper() {
}
@@ -375,7 +375,7 @@ public final class MenuHelper {
// Build our tab action relation
HashMap<String, HashSet<String>> menu = itemMenu.get(menuId);
if (menu == null) {
- menu = new HashMap<String, HashSet<String>>();
+ menu = new HashMap<>();
}
for (Element e : menuItems) {
@@ -388,7 +388,7 @@ public final class MenuHelper {
item.add(tabItem.getAction());
}
} else {
- item = new HashSet<String>();
+ item = new HashSet<>();
item.add(tabItem.getAction());
}
@@ -432,7 +432,7 @@ public final class MenuHelper {
String subActions = element.getAttributeValue("subactions");
if (subActions != null) {
- Set<String> set = new HashSet<String>();
+ Set<String> set = new HashSet<>();
for (String string : Utilities.stringToStringList(subActions,
",")) {
set.add(string);
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuTab.java
b/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuTab.java
index edf42ff..de8e117 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuTab.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuTab.java
@@ -30,7 +30,7 @@ public class MenuTab {
private String key = null;
private String action = null;
private boolean selected = false;
- private List<MenuTabItem> items = new ArrayList<MenuTabItem>();
+ private List<MenuTabItem> items = new ArrayList<>();
public void addItem(MenuTabItem item) {
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/ParsedMenu.java
b/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/ParsedMenu.java
index e06f6c6..c17ed4f 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/ParsedMenu.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/ParsedMenu.java
@@ -27,7 +27,7 @@ import java.util.List;
*/
public class ParsedMenu {
- private List<ParsedTab> tabs = new ArrayList<ParsedTab>();
+ private List<ParsedTab> tabs = new ArrayList<>();
public void addTab(ParsedTab tab) {
this.tabs.add(tab);
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/ParsedTab.java
b/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/ParsedTab.java
index 4df703c..a3f08c7 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/ParsedTab.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/ParsedTab.java
@@ -33,7 +33,7 @@ public class ParsedTab {
private String enabledProperty = null;
private String disabledProperty = null;
- private List<ParsedTabItem> tabItems = new ArrayList<ParsedTabItem>();
+ private List<ParsedTabItem> tabItems = new ArrayList<>();
public void addItem(ParsedTabItem item) {
this.tabItems.add(item);
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RendererManager.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RendererManager.java
index afaa7dd..a86f9d4 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RendererManager.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RendererManager.java
@@ -38,7 +38,7 @@ public final class RendererManager {
private static Log log = LogFactory.getLog(RendererManager.class);
// a set of all renderer factories we are consulting
- private static Set<RendererFactory> rendererFactories = new
HashSet<RendererFactory>();
+ private static Set<RendererFactory> rendererFactories = new HashSet<>();
static {
// lookup set of renderer factories we are going to use
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java
index 3064542..92b78a2 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java
@@ -65,7 +65,7 @@ public class WeblogRequestMapper implements RequestMapper {
public WeblogRequestMapper() {
- this.restricted = new HashSet<String>();
+ this.restricted = new HashSet<>();
// build roller restricted list
String restrictList =
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/RequestMappingFilter.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/RequestMappingFilter.java
index 03d5810..fc64b5a 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/RequestMappingFilter.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/RequestMappingFilter.java
@@ -47,7 +47,7 @@ public class RequestMappingFilter implements Filter {
private static Log log = LogFactory.getLog(RequestMappingFilter.class);
// list of RequestMappers that want to inspect the request
- private final List<RequestMapper> requestMappers = new
ArrayList<RequestMapper>();
+ private final List<RequestMapper> requestMappers = new ArrayList<>();
@Override
public void init(FilterConfig filterConfig) {
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 94e322a..bd97ae1 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
@@ -177,7 +177,7 @@ public class PlanetModel implements Model {
* @param length Max number of results to return
*/
public List<Subscription> getRankedSubscriptions(String groupHandle, int
sinceDays, int length) {
- List<Subscription> list = new ArrayList<Subscription>();
+ List<Subscription> 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/SearchResultsFeedModel.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java
index 5f78577..d37147e 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
@@ -67,7 +67,7 @@ public class SearchResultsFeedModel implements Model {
// the pager used by the 3.0+ rendering system
private SearchResultsFeedPager pager = null;
- private List<WeblogEntryWrapper> results = new
LinkedList<WeblogEntryWrapper>();
+ private List<WeblogEntryWrapper> results = new LinkedList<>();
private Set categories = new TreeSet();
@@ -195,7 +195,7 @@ public class SearchResultsFeedModel implements Model {
}
try {
- TreeSet<String> categorySet = new TreeSet<String>();
+ TreeSet<String> categorySet = new TreeSet<>();
Weblogger roller = WebloggerFactory.getWeblogger();
WeblogEntryManager weblogMgr =
roller.getWeblogEntryManager();
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 b3b805f..e897ecf 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
@@ -66,7 +66,7 @@ public class SearchResultsModel extends PageModel {
// the actual search results mapped by Day -> Set of entries
private Map<Date, TreeSet<WeblogEntryWrapper>> results
- = new TreeMap<Date,
TreeSet<WeblogEntryWrapper>>(Collections.reverseOrder());
+ = new TreeMap<>(Collections.reverseOrder());
// the pager used by the 3.0+ rendering system
private SearchResultsPager pager = null;
@@ -196,7 +196,7 @@ public class SearchResultsModel extends PageModel {
}
try {
- TreeSet<String> categorySet = new TreeSet<String>();
+ TreeSet<String> categorySet = new TreeSet<>();
Weblogger roller = WebloggerFactory.getWeblogger();
WeblogEntryManager weblogMgr =
roller.getWeblogEntryManager();
@@ -244,7 +244,7 @@ public class SearchResultsModel extends PageModel {
TreeSet<WeblogEntryWrapper> set = this.results.get(midnight);
if (set == null) {
// date is not mapped yet, so we need a new Set
- set = new TreeSet<WeblogEntryWrapper>(new
WeblogEntryWrapperComparator());
+ set = new TreeSet<>(new WeblogEntryWrapperComparator());
this.results.put(midnight, set);
}
set.add(entry);
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 3c503f3..96b0862 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
@@ -391,7 +391,7 @@ public class SiteModel implements Model {
* @param len Max number of results to return
*/
public List<WeblogWrapper> getNewWeblogs(int sinceDays, int length) {
- List<WeblogWrapper> results = new ArrayList<WeblogWrapper>();
+ List<WeblogWrapper> results = new ArrayList<>();
Date startDate = JPAWeblogEntryManagerImpl.getStartDateNow(sinceDays);
try {
List<Weblog> weblogs =
WebloggerFactory.getWeblogger().getWeblogManager().getWeblogs(
@@ -412,7 +412,7 @@ public class SiteModel implements Model {
* @param len Max number of results to return
*/
public List<UserWrapper> getNewUsers(int sinceDays, int length) {
- List<UserWrapper> results = new ArrayList<UserWrapper>();
+ List<UserWrapper> results = new ArrayList<>();
try {
Weblogger roller = WebloggerFactory.getWeblogger();
UserManager umgr = roller.getUserManager();
@@ -434,7 +434,7 @@ public class SiteModel implements Model {
*/
public List<StatCount> getHotWeblogs(int sinceDays, int length) {
- List<StatCount> results = new ArrayList<StatCount>();
+ List<StatCount> results = new ArrayList<>();
try {
WeblogEntryManager mgr =
WebloggerFactory.getWeblogger().getWeblogEntryManager();
List<WeblogHitCount> hotBlogs = mgr.getHotWeblogs(sinceDays, 0,
length);
@@ -504,7 +504,7 @@ public class SiteModel implements Model {
* @param length Max number of results to return
*/
public List<WeblogEntryWrapper> getPinnedWeblogEntries(int length) {
- List<WeblogEntryWrapper> results = new ArrayList<WeblogEntryWrapper>();
+ List<WeblogEntryWrapper> results = new ArrayList<>();
try {
Weblogger roller = WebloggerFactory.getWeblogger();
WeblogEntryManager wmgr = roller.getWeblogEntryManager();
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java
index 2a7deb1..eff70c9 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java
@@ -82,7 +82,7 @@ public class CommentsPager extends AbstractPager {
// calculate offset
int offset = getPage() * length;
- List<WeblogEntryCommentWrapper> results = new
ArrayList<WeblogEntryCommentWrapper>();
+ List<WeblogEntryCommentWrapper> results = new ArrayList<>();
Date startDate = null;
if(sinceDays > 0) {
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/MediaFilesPager.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/MediaFilesPager.java
index 3b07f27..b16a27d 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/MediaFilesPager.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/MediaFilesPager.java
@@ -66,7 +66,7 @@ public class MediaFilesPager extends AbstractPager {
// calculate offset
//int offset = getPage() * length;
- List<MediaFile> results = new ArrayList<MediaFile>();
+ List<MediaFile> results = new ArrayList<>();
try {
MediaFileManager mgr =
WebloggerFactory.getWeblogger().getMediaFileManager();
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java
index e2021ec..61e50ed 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java
@@ -88,7 +88,7 @@ public class PlanetEntriesPager extends AbstractPager {
startDate = cal.getTime();
}
- List<SubscriptionEntry> results = new
ArrayList<SubscriptionEntry>();
+ List<SubscriptionEntry> results = new ArrayList<>();
try {
PlanetManager planetManager =
WebloggerFactory.getWeblogger().getPlanetManager();
Planet planet = planetManager.getWeblogger("default");
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java
index b3fa301..335f175 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java
@@ -128,7 +128,7 @@ public class UsersPager extends AbstractPager {
// calculate offset
int offset = getPage() * length;
- List<UserWrapper> results = new ArrayList<UserWrapper>();
+ List<UserWrapper> results = new ArrayList<>();
try {
Weblogger roller = WebloggerFactory.getWeblogger();
UserManager umgr = roller.getUserManager();
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java
index bc12fe6..c841a68 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java
@@ -116,7 +116,7 @@ public class WeblogEntriesDayPager extends
AbstractWeblogEntriesPager {
endDate = DateUtil.getEndOfDay(endDate, cal);
if (entries == null) {
- entries = new TreeMap<Date,
List<WeblogEntryWrapper>>(Collections.reverseOrder());
+ entries = new TreeMap<>(Collections.reverseOrder());
try {
WeblogEntrySearchCriteria wesc = new
WeblogEntrySearchCriteria();
wesc.setWeblog(weblog);
@@ -135,7 +135,7 @@ public class WeblogEntriesDayPager extends
AbstractWeblogEntriesPager {
int count = 0;
for (Map.Entry<Date, List<WeblogEntry>> entry :
mmap.entrySet()) {
// now we need to go through each entry in a day and wrap
- List<WeblogEntryWrapper> wrapped = new
ArrayList<WeblogEntryWrapper>();
+ List<WeblogEntryWrapper> wrapped = new ArrayList<>();
List<WeblogEntry> unwrapped = entry.getValue();
for (int i=0; i < unwrapped.size(); i++) {
if (count++ < length) {
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java
index ec9f741..8bfb6bb 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java
@@ -70,7 +70,7 @@ public class WeblogEntriesLatestPager extends
AbstractWeblogEntriesPager {
public Map<Date, List<WeblogEntryWrapper>> getEntries() {
if (entries == null) {
- entries = new TreeMap<Date,
List<WeblogEntryWrapper>>(Collections.reverseOrder());
+ entries = new TreeMap<>(Collections.reverseOrder());
try {
WeblogEntrySearchCriteria wesc = new
WeblogEntrySearchCriteria();
wesc.setWeblog(weblog);
@@ -87,7 +87,7 @@ public class WeblogEntriesLatestPager extends
AbstractWeblogEntriesPager {
int count = 0;
for (Map.Entry<Date, List<WeblogEntry>> entry :
mmap.entrySet()) {
// now we need to go through each entry in a day and wrap
- List<WeblogEntryWrapper> wrapped = new
ArrayList<WeblogEntryWrapper>();
+ List<WeblogEntryWrapper> wrapped = new ArrayList<>();
List<WeblogEntry> unwrapped = entry.getValue();
for (int i=0; i < unwrapped.size(); i++) {
if (count++ < length) {
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java
index 6d68052..807129a 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java
@@ -95,7 +95,7 @@ public class WeblogEntriesListPager extends AbstractPager {
// calculate offset
int offset = getPage() * length;
- List<WeblogEntryWrapper> results = new
ArrayList<WeblogEntryWrapper>();
+ List<WeblogEntryWrapper> results = new ArrayList<>();
Date startDate = null;
if(sinceDays > 0) {
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java
index efa27c9..da48c99 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java
@@ -106,7 +106,7 @@ public class WeblogEntriesMonthPager extends
AbstractWeblogEntriesPager {
Date endDate = DateUtil.getEndOfMonth(date, cal);
if (entries == null) {
- entries = new TreeMap<Date,
List<WeblogEntryWrapper>>(Collections.reverseOrder());
+ entries = new TreeMap<>(Collections.reverseOrder());
try {
WeblogEntrySearchCriteria wesc = new
WeblogEntrySearchCriteria();
wesc.setWeblog(weblog);
@@ -125,7 +125,7 @@ public class WeblogEntriesMonthPager extends
AbstractWeblogEntriesPager {
int count = 0;
for (Map.Entry<Date, List<WeblogEntry>> entry :
mmap.entrySet()) {
// now we need to go through each entry in a day and wrap
- List<WeblogEntryWrapper> wrapped = new
ArrayList<WeblogEntryWrapper>();
+ List<WeblogEntryWrapper> wrapped = new ArrayList<>();
List<WeblogEntry> unwrapped = entry.getValue();
for (int i=0; i < unwrapped.size(); i++) {
if (count++ < length) {
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java
index 843e4f3..cb5423d 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java
@@ -96,7 +96,7 @@ public class WeblogsPager extends AbstractPager {
if(letter != null) {
int page = getPage() + 1;
if(hasMoreItems()) {
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
params.put("page", ""+page);
params.put("letter", letter);
return createURL(getUrl(), params);
@@ -114,7 +114,7 @@ public class WeblogsPager extends AbstractPager {
if(letter != null) {
int page = getPage() - 1;
if (page >= 0) {
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
params.put("page", ""+page);
params.put("letter", letter);
return createURL(getUrl(), params);
@@ -133,7 +133,7 @@ public class WeblogsPager extends AbstractPager {
// calculate offset
int offset = getPage() * length;
- List<WeblogWrapper> results = new ArrayList<WeblogWrapper>();
+ List<WeblogWrapper> results = new ArrayList<>();
Date startDate = null;
if (sinceDays != -1) {
Calendar cal = Calendar.getInstance();
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidationManager.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidationManager.java
index efbd7a1..043801f 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidationManager.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidationManager.java
@@ -33,7 +33,7 @@ import org.apache.roller.weblogger.util.Utilities;
*/
public class CommentValidationManager {
private static Log log = LogFactory.getLog(CommentValidationManager.class);
- private List<CommentValidator> validators = new
ArrayList<CommentValidator>();
+ private List<CommentValidator> validators = new ArrayList<>();
public CommentValidationManager() {
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/LdapCommentAuthenticator.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/LdapCommentAuthenticator.java
index a9b3fb0..27a5e1e 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/LdapCommentAuthenticator.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/LdapCommentAuthenticator.java
@@ -117,7 +117,7 @@ public class LdapCommentAuthenticator implements
CommentAuthenticator {
if(rollerPropertiesValid && userDataValid){
try {
- Hashtable<String,String> env = new
Hashtable<String,String>();
+ Hashtable<String,String> env = new
Hashtable<>();
env.put(Context.INITIAL_CONTEXT_FACTORY,
"com.sun.jndi.ldap.LdapCtxFactory");
if(ldapSecurityLevel != null
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
index 2a049b8..e9fbda1 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
@@ -217,7 +217,7 @@ public class FeedServlet extends HttpServlet {
}
// looks like we need to render content
- HashMap<String, Object> model = new HashMap<String, Object>();
+ HashMap<String, Object> model = new HashMap<>();
String pageId;
try {
// determine what template to render with
@@ -241,7 +241,7 @@ public class FeedServlet extends HttpServlet {
}
// populate the rendering model
- Map<String, Object> initData = new HashMap<String, Object>();
+ Map<String, Object> initData = new HashMap<>();
initData.put("parsedRequest", feedRequest);
// define url strategy
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
index 75bbcdb..9daee11 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
@@ -436,7 +436,7 @@ public class PageServlet extends HttpServlet {
}
}
- HashMap<String, Object> model = new HashMap<String, Object>();
+ HashMap<String, Object> model = new HashMap<>();
try {
PageContext pageContext = JspFactory.getDefaultFactory()
.getPageContext(this, request, response, "", false,
@@ -446,7 +446,7 @@ public class PageServlet extends HttpServlet {
request.setAttribute("pageRequest", pageRequest);
// populate the rendering model
- Map<String, Object> initData = new HashMap<String, Object>();
+ Map<String, Object> initData = new HashMap<>();
initData.put("requestParameters", request.getParameterMap());
initData.put("parsedRequest", pageRequest);
initData.put("pageContext", pageContext);
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
index 6494e24..432a0c3 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
@@ -130,7 +130,7 @@ public class PlanetFeedServlet extends HttpServlet {
}
// looks like we need to render content
- HashMap<String, Object> model = new HashMap<String, Object>();
+ HashMap<String, Object> model = new HashMap<>();
try {
// populate the rendering model
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java
index 5c154ee..cd23152 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java
@@ -112,7 +112,7 @@ public class RSDServlet extends HttpServlet {
response.setContentType("application/rsd+xml; charset=utf-8");
// populate the model
- HashMap<String, Object> model = new HashMap<String, Object>();
+ HashMap<String, Object> model = new HashMap<>();
model.put("website", weblog);
model.put("absBaseURL",
WebloggerRuntimeConfig.getAbsoluteContextURL());
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java
index f2c0860..649abed 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java
@@ -58,7 +58,7 @@ public final class PlanetCache {
cacheEnabled = WebloggerConfig.getBooleanProperty(CACHE_ID +
".enabled");
- Map<String, String> cacheProps = new HashMap<String, String>();
+ Map<String, String> cacheProps = new HashMap<>();
cacheProps.put("id", CACHE_ID);
Enumeration allProps = WebloggerConfig.keys();
String prop;
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java
index a957ce7..68b341d 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java
@@ -74,7 +74,7 @@ public final class SiteWideCache implements CacheHandler {
cacheEnabled = WebloggerConfig.getBooleanProperty(CACHE_ID+".enabled");
- Map<String, String> cacheProps = new HashMap<String, String>();
+ Map<String, String> cacheProps = new HashMap<>();
cacheProps.put("id", CACHE_ID);
Enumeration allProps = WebloggerConfig.keys();
String prop = null;
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java
index e217fcc..7224c04 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java
@@ -117,8 +117,8 @@ public class WeblogCacheWarmupJob implements Job {
// populate the rendering model
- Map<String, Object> modelMap = new HashMap<String, Object>();
- Map<String, WeblogFeedRequest> initData = new HashMap<String,
WeblogFeedRequest>();
+ Map<String, Object> modelMap = new HashMap<>();
+ Map<String, WeblogFeedRequest> initData = new HashMap<>();
initData.put("request", null);
initData.put("feedRequest", feedRequest);
initData.put("weblogRequest", feedRequest);
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDeviceResolver.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDeviceResolver.java
index 8272c6d..d02929b 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDeviceResolver.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/mobile/LiteDeviceResolver.java
@@ -48,10 +48,10 @@ import javax.servlet.http.HttpServletRequest;
* @author Yuri Mednikov
*/
public class LiteDeviceResolver implements DeviceResolver {
- private final List<String> mobileUserAgentPrefixes = new
ArrayList<String>();
- private final List<String> mobileUserAgentKeywords = new
ArrayList<String>();
- private final List<String> tabletUserAgentKeywords = new
ArrayList<String>();
- private final List<String> normalUserAgentKeywords = new
ArrayList<String>();
+ private final List<String> mobileUserAgentPrefixes = new ArrayList<>();
+ private final List<String> mobileUserAgentKeywords = new ArrayList<>();
+ private final List<String> tabletUserAgentKeywords = new ArrayList<>();
+ private final List<String> normalUserAgentKeywords = new ArrayList<>();
public LiteDeviceResolver() {
init();
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/WebappResourceLoader.java
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/WebappResourceLoader.java
index a74cfec..882a7d0 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/WebappResourceLoader.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/WebappResourceLoader.java
@@ -113,7 +113,7 @@ public class WebappResourceLoader extends ResourceLoader {
}
// init the template paths map
- templatePaths = new HashMap<String, String>();
+ templatePaths = new HashMap<>();
if (log.isDebugEnabled()) {
log.debug("WebappResourceLoader: initialization complete.");
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 c4dd02b..a9ca1f9 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
@@ -114,7 +114,7 @@ public class GlobalCommentManagement extends UIAction
implements ServletRequestA
csc.setMaxResults(COUNT+1);
List<WeblogEntryComment> rawComments = wmgr.getComments(csc);
- comments = new ArrayList<WeblogEntryComment>();
+ comments = new ArrayList<>();
comments.addAll(rawComments);
if(!comments.isEmpty()) {
@@ -140,7 +140,7 @@ public class GlobalCommentManagement extends UIAction
implements ServletRequestA
// use the action data to build a url representing this action, including
query data
private String buildBaseUrl() {
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
if(!StringUtils.isEmpty(getBean().getSearchString())) {
params.put("bean.searchString", getBean().getSearchString());
@@ -252,7 +252,7 @@ public class GlobalCommentManagement extends UIAction
implements ServletRequestA
try {
WeblogEntryManager wmgr =
WebloggerFactory.getWeblogger().getWeblogEntryManager();
- List<Weblog> flushList = new ArrayList<Weblog>();
+ List<Weblog> flushList = new ArrayList<>();
// delete all comments with delete box checked
List<String> deletes =
Arrays.asList(getBean().getDeleteComments());
@@ -328,7 +328,7 @@ public class GlobalCommentManagement extends UIAction
implements ServletRequestA
public List<KeyValueObject> getCommentStatusOptions() {
- List<KeyValueObject> opts = new ArrayList<KeyValueObject>();
+ List<KeyValueObject> opts = new ArrayList<>();
opts.add(new KeyValueObject("ALL", getText("generic.all")));
opts.add(new KeyValueObject("ONLY_PENDING",
getText("commentManagement.onlyPending")));
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java
index fa47f4c..7c37dbc 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java
@@ -50,8 +50,8 @@ public class GlobalCommentManagementBean {
public void loadCheckboxes(List<WeblogEntryComment> comments) {
- List<String> allComments = new ArrayList<String>();
- List<String> spamList = new ArrayList<String>();
+ List<String> allComments = new ArrayList<>();
+ List<String> spamList = new ArrayList<>();
for (WeblogEntryComment comment : comments) {
allComments.add(comment.getId());
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java
index e764b9d..6284e46 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java
@@ -277,7 +277,7 @@ public class UserEdit extends UIAction {
} catch (WebloggerException ex) {
log.error("ERROR getting permissions for user " +
user.getUserName(), ex);
}
- return new ArrayList<WeblogPermission>();
+ return new ArrayList<>();
}
public String getAuthMethod() {
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 2f4b87c..2e2110e 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
@@ -63,7 +63,7 @@ public class ThemeDataServlet extends HttpServlet {
if (themeId == null) {
themes = themeMgr.getEnabledThemesList();
} else {
- themes = new ArrayList<SharedTheme>(1);
+ themes = new ArrayList<>(1);
try {
SharedTheme theme = themeMgr.getTheme(themeId);
themes.add(theme);
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
index 1e6398c..60c8aa8 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
@@ -91,7 +91,7 @@ public class Bookmarks extends UIAction {
public String execute() {
// build list of folders that the user can navigate to
- List<WeblogBookmarkFolder> newFolders = new
ArrayList<WeblogBookmarkFolder>();
+ List<WeblogBookmarkFolder> newFolders = new ArrayList<>();
try {
// Build list of all folders, except for current one
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
index 572e8f9..1c823b7 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
@@ -53,7 +53,7 @@ public class CategoryRemove extends UIAction {
private String targetCategoryId = null;
// all categories from the action weblog
- private List<WeblogCategory> allCategories = new
ArrayList<WeblogCategory>();
+ private List<WeblogCategory> allCategories = new ArrayList<>();
public CategoryRemove() {
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
index 032b4f5..7ccd7d4 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
@@ -110,7 +110,7 @@ public class Comments extends UIAction {
csc.setMaxResults(COUNT + 1);
List<WeblogEntryComment> rawComments = wmgr.getComments(csc);
- comments = new ArrayList<WeblogEntryComment>();
+ comments = new ArrayList<>();
comments.addAll(rawComments);
if (!comments.isEmpty()) {
if (comments.size() > COUNT) {
@@ -137,7 +137,7 @@ public class Comments extends UIAction {
// query data
private String buildBaseUrl() {
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
if (!StringUtils.isEmpty(getBean().getEntryId())) {
params.put("bean.entryId", getBean().getEntryId());
@@ -223,7 +223,7 @@ public class Comments extends UIAction {
// if search is enabled, we will need to re-index all entries with
// comments that have been deleted, so build a list of those
entries
- Set<WeblogEntry> reindexEntries = new HashSet<WeblogEntry>();
+ Set<WeblogEntry> reindexEntries = new HashSet<>();
if (WebloggerConfig.getBooleanProperty("search.enabled")) {
CommentSearchCriteria csc = getCommentSearchCriteria();
@@ -270,12 +270,12 @@ public class Comments extends UIAction {
try {
WeblogEntryManager wmgr =
WebloggerFactory.getWeblogger().getWeblogEntryManager();
- List<WeblogEntryComment> flushList = new
ArrayList<WeblogEntryComment>();
+ List<WeblogEntryComment> flushList = new ArrayList<>();
// if search is enabled, we will need to re-index all entries with
// comments that have been approved, so build a list of those
// entries
- Set<WeblogEntry> reindexList = new HashSet<WeblogEntry>();
+ Set<WeblogEntry> reindexList = new HashSet<>();
// delete all comments with delete box checked
List<String> deletes =
Arrays.asList(getBean().getDeleteComments());
@@ -302,7 +302,7 @@ public class Comments extends UIAction {
log.debug(spamIds.size() + " comments marked as spam");
// track comments approved via moderation
- List<WeblogEntryComment> approvedComments = new
ArrayList<WeblogEntryComment>();
+ List<WeblogEntryComment> approvedComments = new ArrayList<>();
String[] ids = Utilities.stringToStringArray(getBean().getIds(),
",");
@@ -409,7 +409,7 @@ public class Comments extends UIAction {
public List<KeyValueObject> getCommentStatusOptions() {
- List<KeyValueObject> opts = new ArrayList<KeyValueObject>();
+ List<KeyValueObject> opts = new ArrayList<>();
opts.add(new KeyValueObject("ALL", getText("generic.all")));
opts.add(new KeyValueObject("ONLY_PENDING",
getText("commentManagement.onlyPending")));
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java
index d24a1fa..52cb32c 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java
@@ -52,9 +52,9 @@ public class CommentsBean {
public void loadCheckboxes(List<WeblogEntryComment> comments) {
- List<String> allComments = new ArrayList<String>();
- List<String> approvedList = new ArrayList<String>();
- List<String> spamList = new ArrayList<String>();
+ List<String> allComments = new ArrayList<>();
+ List<String> approvedList = new ArrayList<>();
+ List<String> spamList = new ArrayList<>();
for (WeblogEntryComment comment : comments) {
allComments.add(comment.getId());
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
index d7caa94..0a3bb60 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
@@ -101,7 +101,7 @@ public class Entries extends UIAction {
wesc.setOffset(getBean().getPage() * COUNT);
wesc.setMaxResults(COUNT + 1);
List<WeblogEntry> rawEntries = wmgr.getWeblogEntries(wesc);
- entries = new ArrayList<WeblogEntry>();
+ entries = new ArrayList<>();
entries.addAll(rawEntries);
if (!entries.isEmpty()) {
log.debug("query found "+rawEntries.size()+" results");
@@ -130,7 +130,7 @@ public class Entries extends UIAction {
// use the action data to build a url representing this action, including
query data
private String buildBaseUrl() {
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
if(!StringUtils.isEmpty(getBean().getCategoryName())) {
params.put("bean.categoryPath", getBean().getCategoryName());
@@ -165,7 +165,7 @@ public class Entries extends UIAction {
public List<WeblogCategory> getCategories() {
// make list of categories with first option being being a transient
// category just meant to represent the default option of any category
- List<WeblogCategory> cats = new ArrayList<WeblogCategory>();
+ List<WeblogCategory> cats = new ArrayList<>();
WeblogCategory tmpCat = new WeblogCategory();
tmpCat.setName("Any");
@@ -186,7 +186,7 @@ public class Entries extends UIAction {
public List<KeyValueObject> getSortByOptions() {
- List<KeyValueObject> opts = new ArrayList<KeyValueObject>();
+ List<KeyValueObject> opts = new ArrayList<>();
opts.add(new
KeyValueObject(WeblogEntrySearchCriteria.SortBy.PUBLICATION_TIME.name(),
getText("weblogEntryQuery.label.pubTime")));
opts.add(new
KeyValueObject(WeblogEntrySearchCriteria.SortBy.UPDATE_TIME.name(),
getText("weblogEntryQuery.label.updateTime")));
@@ -195,7 +195,7 @@ public class Entries extends UIAction {
}
public List<KeyValueObject> getStatusOptions() {
- List<KeyValueObject> opts = new ArrayList<KeyValueObject>();
+ List<KeyValueObject> opts = new ArrayList<>();
opts.add(new KeyValueObject("ALL",
getText("weblogEntryQuery.label.allEntries")));
opts.add(new KeyValueObject("DRAFT",
getText("weblogEntryQuery.label.draftOnly")));
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 1418d02..72108c1 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
@@ -448,7 +448,7 @@ public final class EntryEdit extends UIAction {
.getWeblogEntryPlugins(getActionWeblog());
if (!plugins.isEmpty()) {
- availablePlugins = new ArrayList<WeblogEntryPlugin>();
+ availablePlugins = new ArrayList<>();
for (WeblogEntryPlugin plugin : plugins.values()) {
availablePlugins.add(plugin);
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
index 1e6cb22..e48c80a 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
@@ -59,9 +59,9 @@ public class MediaFileAdd extends MediaFileBase {
// an array of filenames for uploaded files
private String[] uploadedFilesFileName = null;
- private List<MediaFile> newImages = new ArrayList<MediaFile>();
+ private List<MediaFile> newImages = new ArrayList<>();
- private List<MediaFile> newFiles = new ArrayList<MediaFile>();
+ private List<MediaFile> newFiles = new ArrayList<>();
private String directoryName = null;
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
index f023021..335255b 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
@@ -125,7 +125,7 @@ public class MediaFileImageChooser extends MediaFileBase {
* displaying path information as breadcrumb.
*/
public List<KeyValueObject> getCurrentDirectoryHierarchy() {
- List<KeyValueObject> directoryHierarchy = new
ArrayList<KeyValueObject>();
+ List<KeyValueObject> directoryHierarchy = new ArrayList<>();
String fullPath = "/" + this.currentDirectory.getName();
if (fullPath.length() > 1) {
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
index c277a36..8bd5e14 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
@@ -212,7 +212,7 @@ public class MediaFileView extends MediaFileBase {
this.directoryId = directory.getId();
this.directoryName = directory.getName();
- this.childFiles = new ArrayList<MediaFile>();
+ this.childFiles = new ArrayList<>();
this.childFiles.addAll(directory.getMediaFiles());
if ("type".equals(sortBy)) {
@@ -282,7 +282,7 @@ public class MediaFileView extends MediaFileBase {
try {
List<MediaFile> rawResults =
manager.searchMediaFiles(getActionWeblog(), filter);
boolean hasMore = false;
- List<MediaFile> results = new ArrayList<MediaFile>();
+ List<MediaFile> results = new ArrayList<>();
results.addAll(rawResults);
if (results.size() > MediaFileSearchBean.PAGE_SIZE) {
results.remove(results.size() - 1);
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
index 3e6a378..8e7fb91 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
@@ -71,7 +71,7 @@ public class Members extends UIAction implements
ParameterAware {
int numAdmins = 0; // make sure at least one admin
int removed = 0;
int changed = 0;
- List<WeblogPermission> permsList = new ArrayList<WeblogPermission>();
+ List<WeblogPermission> permsList = new ArrayList<>();
try {
UserManager userMgr =
WebloggerFactory.getWeblogger().getUserManager();
List<WeblogPermission> permsFromDB =
userMgr.getWeblogPermissionsIncludingPending(getActionWeblog());
@@ -181,6 +181,6 @@ public class Members extends UIAction implements
ParameterAware {
// serious problem, but not much we can do here
log.error("ERROR getting weblog permissions", ex);
}
- return new ArrayList<WeblogPermission>();
+ return new ArrayList<>();
}
}
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 7cf23f6..1be3dad 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
@@ -211,7 +211,7 @@ public class Pings extends UIAction {
AutoPingManager autoPingMgr =
WebloggerFactory.getWeblogger().getAutopingManager();
// Build isEnabled map (keyed by ping target id and values
Boolean.TRUE/Boolean.FALSE)
- Map<String, Boolean> isEnabled = new HashMap<String, Boolean>();
+ Map<String, Boolean> isEnabled = new HashMap<>();
List<AutoPing> autoPings = Collections.emptyList();
try {
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
index 83ad4fc..dd1261d 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
@@ -175,7 +175,7 @@ public class TemplateEdit extends UIAction {
}
public Map<TemplateLanguage, String> getTemplateLanguages() {
- Map<TemplateLanguage, String> langMap = new EnumMap<TemplateLanguage,
String>(TemplateLanguage.class);
+ Map<TemplateLanguage, String> langMap = new
EnumMap<>(TemplateLanguage.class);
for (TemplateLanguage lang : TemplateLanguage.values()) {
langMap.put(lang, lang.getReadableName());
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
index d9eb4d9..3f201b0 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
@@ -76,7 +76,7 @@ public class Templates extends UIAction {
// get current list of templates, minus custom stylesheet
List<WeblogTemplate> raw = WebloggerFactory.getWeblogger()
.getWeblogManager().getTemplates(getActionWeblog());
- List<WeblogTemplate> pages = new ArrayList<WeblogTemplate>();
+ List<WeblogTemplate> pages = new ArrayList<>();
pages.addAll(raw);
// Remove style sheet from list so not to show when theme is
@@ -88,7 +88,7 @@ public class Templates extends UIAction {
setTemplates(pages);
// build list of action types that may be added
- Map<ComponentType, String> actionsMap = new EnumMap<ComponentType,
String>(ComponentType.class);
+ Map<ComponentType, String> actionsMap = new
EnumMap<>(ComponentType.class);
addComponentTypeToMap(actionsMap, ComponentType.CUSTOM);
if (WeblogTheme.CUSTOM.equals(getActionWeblog().getEditorTheme()))
{
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
index 4957a1c..8e25a65 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
@@ -86,7 +86,7 @@ public class WeblogConfig extends UIAction {
// set plugins list
PluginManager ppmgr =
WebloggerFactory.getWeblogger().getPluginManager();
Map<String, WeblogEntryPlugin> pluginsMap =
ppmgr.getWeblogEntryPlugins(getActionWeblog());
- List<WeblogEntryPlugin> plugins = new
ArrayList<WeblogEntryPlugin>();
+ List<WeblogEntryPlugin> plugins = new ArrayList<>();
for (WeblogEntryPlugin entryPlugin : pluginsMap.values()) {
plugins.add(entryPlugin);
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/pagers/CommentsPager.java
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/pagers/CommentsPager.java
index c3964e8..7f1b0de 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/pagers/CommentsPager.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/pagers/CommentsPager.java
@@ -54,7 +54,7 @@ public class CommentsPager {
public String getNextLink() {
if(isMoreItems()) {
int nextPage = pageNum + 1;
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
params.put("bean.page", ""+nextPage);
return createURL(baseUrl, params);
}
@@ -65,7 +65,7 @@ public class CommentsPager {
public String getPrevLink() {
if (pageNum > 0) {
int prevPage = pageNum - 1;
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
params.put("bean.page", ""+prevPage);
return createURL(baseUrl, params);
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/pagers/EntriesPager.java
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/pagers/EntriesPager.java
index b8bacc3..58e1768 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/pagers/EntriesPager.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/pagers/EntriesPager.java
@@ -54,7 +54,7 @@ public class EntriesPager {
public String getNextLink() {
if(isMoreItems()) {
int nextPage = pageNum + 1;
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
params.put("bean.page", ""+nextPage);
return createURL(baseUrl, params);
}
@@ -65,7 +65,7 @@ public class EntriesPager {
public String getPrevLink() {
if (pageNum > 0) {
int prevPage = pageNum - 1;
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
params.put("bean.page", ""+prevPage);
return createURL(baseUrl, params);
}
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 b4aa37d..fd5d7c1 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
@@ -203,7 +203,7 @@ public abstract class UIAction extends ActionSupport
@Override
public String getText(String aTextName, List<?> args) {
- List<Object> cleanedArgs = new ArrayList<Object>(args.size());
+ List<Object> cleanedArgs = new ArrayList<>(args.size());
for (Object el : args) {
cleanedArgs.add(el instanceof String ? cleanTextArg((String) el) :
el);
}
@@ -221,7 +221,7 @@ public abstract class UIAction extends ActionSupport
@Override
public String getText(String aTextName, String defaultValue, List<?> args)
{
- List<Object> cleanedArgs = new ArrayList<Object>(args.size());
+ List<Object> cleanedArgs = new ArrayList<>(args.size());
for (Object el : args) {
cleanedArgs.add(el instanceof String ? cleanTextArg((String) el) :
el);
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/util/Bannedwordslist.java
b/app/src/main/java/org/apache/roller/weblogger/util/Bannedwordslist.java
index 3311fb3..4ad3b9c 100644
--- a/app/src/main/java/org/apache/roller/weblogger/util/Bannedwordslist.java
+++ b/app/src/main/java/org/apache/roller/weblogger/util/Bannedwordslist.java
@@ -74,8 +74,8 @@ public final class Bannedwordslist {
private static final String BANNEDWORDSLIST_URL = null;
private Date lastModified = null;
- private List<String> bannedwordslistStr = new LinkedList<String>();
- private List<Pattern> bannedwordslistRegex = new LinkedList<Pattern>();
+ private List<String> bannedwordslistStr = new LinkedList<>();
+ private List<Pattern> bannedwordslistRegex = new LinkedList<>();
// setup our singleton at class loading time
static {
@@ -328,7 +328,7 @@ public final class Bannedwordslist {
// test plain String.indexOf
List<String> stringRules = bannedwordslistStr;
if (moreStringRules != null && !moreStringRules.isEmpty()) {
- stringRules = new ArrayList<String>();
+ stringRules = new ArrayList<>();
stringRules.addAll(moreStringRules);
stringRules.addAll(bannedwordslistStr);
}
@@ -339,7 +339,7 @@ public final class Bannedwordslist {
// test regex bannedwordslisted
List<Pattern> regexRules = bannedwordslistRegex;
if (moreRegexRules != null && !moreRegexRules.isEmpty()) {
- regexRules = new ArrayList<Pattern>();
+ regexRules = new ArrayList<>();
regexRules.addAll(moreRegexRules);
regexRules.addAll(bannedwordslistRegex);
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/util/BannedwordslistChecker.java
b/app/src/main/java/org/apache/roller/weblogger/util/BannedwordslistChecker.java
index cabc111..46ec921 100644
---
a/app/src/main/java/org/apache/roller/weblogger/util/BannedwordslistChecker.java
+++
b/app/src/main/java/org/apache/roller/weblogger/util/BannedwordslistChecker.java
@@ -66,8 +66,8 @@ public final class BannedwordslistChecker {
*/
public static boolean checkReferrer(Weblog website, String referrerURL) {
if
(WebloggerConfig.getBooleanProperty("site.bannedwordslist.enable.referrers")) {
- List<String> stringRules = new ArrayList<String>();
- List<Pattern> regexRules = new ArrayList<Pattern>();
+ List<String> stringRules = new ArrayList<>();
+ List<Pattern> regexRules = new ArrayList<>();
Bannedwordslist.populateSpamRules(
website.getBannedwordslist(), stringRules, regexRules, null);
if (WebloggerRuntimeConfig.getProperty("spam.bannedwordslist") !=
null) {
@@ -85,8 +85,8 @@ public final class BannedwordslistChecker {
*/
private static boolean testComment(WeblogEntryComment c) {
boolean ret = false;
- List<String> stringRules = new ArrayList<String>();
- List<Pattern> regexRules = new ArrayList<Pattern>();
+ List<String> stringRules = new ArrayList<>();
+ List<Pattern> regexRules = new ArrayList<>();
Weblog website = c.getWeblogEntry().getWebsite();
Bannedwordslist.populateSpamRules(
website.getBannedwordslist(), stringRules, regexRules,
diff --git
a/app/src/main/java/org/apache/roller/weblogger/util/GenericThrottle.java
b/app/src/main/java/org/apache/roller/weblogger/util/GenericThrottle.java
index b25ea05..ef46135 100644
--- a/app/src/main/java/org/apache/roller/weblogger/util/GenericThrottle.java
+++ b/app/src/main/java/org/apache/roller/weblogger/util/GenericThrottle.java
@@ -63,7 +63,7 @@ public class GenericThrottle {
}
// cache props
- Map<String,String> cacheProps = new HashMap<String,String>();
+ Map<String,String> cacheProps = new HashMap<>();
cacheProps.put("id", "throttle");
cacheProps.put("size", ""+maxEntries);
cacheProps.put("timeout", ""+this.interval);
diff --git
a/app/src/main/java/org/apache/roller/weblogger/util/HTMLSanitizer.java
b/app/src/main/java/org/apache/roller/weblogger/util/HTMLSanitizer.java
index dc84fbb..dbbdc44 100644
--- a/app/src/main/java/org/apache/roller/weblogger/util/HTMLSanitizer.java
+++ b/app/src/main/java/org/apache/roller/weblogger/util/HTMLSanitizer.java
@@ -122,7 +122,7 @@ public class HTMLSanitizer {
public static SanitizeResult sanitizer(String html, Pattern allowedTags,
Pattern forbiddenTags) {
SanitizeResult ret = new SanitizeResult();
- Stack<String> openTags = new Stack<String>();
+ Stack<String> openTags = new Stack<>();
List<String> tokens = tokenize(html);
@@ -453,7 +453,7 @@ public class HTMLSanitizer {
public String text = "";
public String val = "";
public boolean isValid = true;
- public List<String> invalidTags = new ArrayList<String>();
+ public List<String> invalidTags = new ArrayList<>();
}
public static String encode(String s) {
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 d617133..3134bc6 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
@@ -97,7 +97,7 @@ public class LRUCache2
public synchronized void purge(String[] patterns)
{
- List<String> purgeList = new ArrayList<String>();
+ List<String> purgeList = new ArrayList<>();
for (Object objKey : cache.keySet()) {
String key = (String) objKey;
for (String s : patterns) {
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 9978e13..4c52e70 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
@@ -95,7 +95,7 @@ public class MailUtil {
String content;
// list of enabled website authors and admins
- List<String> reviewers = new ArrayList<String>();
+ List<String> reviewers = new ArrayList<>();
List<User> websiteUsers = wmgr.getWeblogUsers(entry.getWebsite(),
true);
// build list of reviewers (website users with author permission)
@@ -277,7 +277,7 @@ public class MailUtil {
}
// build list of email addresses to send notification to
- Set<String> subscribers = new TreeSet<String>();
+ Set<String> subscribers = new TreeSet<>();
// If we are to notify subscribers, then...
if (commentObject.getApproved() && notifySubscribers) {
@@ -402,7 +402,7 @@ public class MailUtil {
ownermsg.append(resources.getString("email.comment.management.link") + ": ");
ownermsg.append((isPlainText) ? "\n" : "<br/>");
- Map<String, String> parameters = new HashMap<String, String>();
+ Map<String, String> parameters = new HashMap<>();
parameters.put("bean.entryId", entry.getId());
String deleteURL =
WebloggerFactory.getWeblogger().getUrlStrategy().getActionURL(
"comments", "/roller-ui/authoring", weblog.getHandle(),
parameters, true);
diff --git
a/app/src/main/java/org/apache/roller/weblogger/util/RollerMessages.java
b/app/src/main/java/org/apache/roller/weblogger/util/RollerMessages.java
index 1705615..7c40423 100644
--- a/app/src/main/java/org/apache/roller/weblogger/util/RollerMessages.java
+++ b/app/src/main/java/org/apache/roller/weblogger/util/RollerMessages.java
@@ -27,8 +27,8 @@ import java.util.List;
*/
public class RollerMessages
{
- private List<RollerMessage> mErrors = new ArrayList<RollerMessage>();
- private List<RollerMessage> mMessages = new ArrayList<RollerMessage>();
+ private List<RollerMessage> mErrors = new ArrayList<>();
+ private List<RollerMessage> mMessages = new ArrayList<>();
public RollerMessages()
{
diff --git a/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java
b/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java
index 2c471aa..dfb8fb4 100644
--- a/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java
+++ b/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java
@@ -326,7 +326,7 @@ public class Utilities {
/** Convert string with delimiters to string list.
*/
public static List<String> stringToStringList(String instr, String delim) {
- List<String> stringList = new ArrayList<String>();
+ List<String> stringList = new ArrayList<>();
String[] str = StringUtils.split(instr, delim);
Collections.addAll(stringList, str);
return stringList;
diff --git
a/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheManager.java
b/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheManager.java
index ccd14e3..15a7490 100644
--- a/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheManager.java
+++ b/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheManager.java
@@ -59,10 +59,10 @@ public final class CacheManager {
private static CacheFactory cacheFactory = null;
// a set of all registered cache handlers
- private static Set<CacheHandler> cacheHandlers = new
HashSet<CacheHandler>();
+ private static Set<CacheHandler> cacheHandlers = new HashSet<>();
// a map of all registered caches
- private static Map<String, Cache> caches = new HashMap<String, Cache>();
+ private static Map<String, Cache> caches = new HashMap<>();
static {
@@ -309,7 +309,7 @@ public final class CacheManager {
* something a bit more elaborate, like JMX.
*/
public static Map<String, Map<String, Object>> getStats() {
- Map<String, Map<String, Object>> allStats = new HashMap<String,
Map<String, Object>>();
+ Map<String, Map<String, Object>> allStats = new HashMap<>();
for (Cache cache : caches.values()) {
allStats.put(cache.getId(), cache.getStats());
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheImpl.java
b/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheImpl.java
index 8ffc4ed..b1ef250 100644
--- a/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheImpl.java
+++ b/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheImpl.java
@@ -115,7 +115,7 @@ public class LRUCacheImpl implements Cache {
@Override
public Map<String, Object> getStats() {
- Map<String, Object> stats = new HashMap<String, Object>();
+ Map<String, Object> stats = new HashMap<>();
stats.put("startTime", this.startTime);
stats.put("hits", this.hits);
stats.put("misses", this.misses);
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 3b48240..3da086c 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
@@ -192,7 +192,7 @@ public class EntryCollection {
link.setType("text/html");
feed.setAlternateLinks(Collections.singletonList(link));
- List<Entry> atomEntries = new ArrayList<Entry>();
+ List<Entry> atomEntries = new ArrayList<>();
int count = 0;
for (WeblogEntry rollerEntry : entries) {
if (count++ >= MAX_ENTRIES) {
@@ -205,7 +205,7 @@ public class EntryCollection {
feed.setUpdated(entry.getUpdated());
}
}
- List<Link> links = new ArrayList<Link>();
+ List<Link> links = new ArrayList<>();
if (entries.size() > max) {
// add next link
int nextOffset = start + max;
@@ -323,7 +323,7 @@ public class EntryCollection {
Content content = new Content();
content.setType(Content.HTML);
content.setValue(entry.getText());
- List<Content> contents = new ArrayList<Content>();
+ List<Content> contents = new ArrayList<>();
contents.add(content);
atomEntry.setContents(contents);
@@ -342,14 +342,14 @@ public class EntryCollection {
atomEntry.setAuthors(
(List<SyndPerson>)Collections.singletonList(author));
// Add Atom category for Weblogger category, using category scheme
- List<Category> categories = new ArrayList<Category>();
+ List<Category> categories = new ArrayList<>();
Category atomCat = new Category();
atomCat.setScheme(RollerAtomService.getWeblogCategoryScheme(entry.getWebsite()));
atomCat.setTerm(entry.getCategory().getName());
categories.add(atomCat);
// Add Atom categories for each Weblogger tag with null scheme
- Set<WeblogEntryTag> tmp = new TreeSet<WeblogEntryTag>(new
WeblogEntryTagComparator());
+ Set<WeblogEntryTag> tmp = new TreeSet<>(new
WeblogEntryTagComparator());
tmp.addAll(entry.getTags());
for (WeblogEntryTag tag : tmp) {
Category newcat = new Category();
@@ -361,7 +361,7 @@ public class EntryCollection {
Link altlink = new Link();
altlink.setRel("alternate");
altlink.setHref(entry.getPermalink());
- List<Link> altlinks = new ArrayList<Link>();
+ List<Link> altlinks = new ArrayList<>();
altlinks.add(altlink);
atomEntry.setAlternateLinks(altlinks);
@@ -370,11 +370,11 @@ public class EntryCollection {
editlink.setHref(
atomURL
+"/"+entry.getWebsite().getHandle() + "/entry/" +
entry.getId());
- List<Link> otherlinks = new ArrayList<Link>();
+ List<Link> otherlinks = new ArrayList<>();
otherlinks.add(editlink);
atomEntry.setOtherLinks(otherlinks);
- List<Module> modules = new ArrayList<Module>();
+ List<Module> modules = new ArrayList<>();
AppModule app = new AppModuleImpl();
app.setDraft(!WeblogEntry.PubStatus.PUBLISHED.equals(entry.getStatus()));
app.setEdited(entry.getUpdateTime());
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 2dfd99b..ee50a27 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
@@ -134,7 +134,7 @@ public class RollerAtomService extends AtomService {
* from site's file-upload allowed extensions.
*/
private List<String> getAcceptedContentTypeRange() throws
WebloggerException {
- List<String> accepts = new ArrayList<String>();
+ List<String> accepts = new ArrayList<>();
Weblogger roller = WebloggerFactory.getWeblogger();
Map config = roller.getPropertiesManager().getProperties();
String allows =
((RuntimeConfigProperty)config.get("uploads.types.allowed")).getValue();
