This is an automated email from the ASF dual-hosted git repository. mbien pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/roller.git.
from f5f3e6a Merge pull request #78 from ymaheshwari1/unused-css new f60aa0b project wide refactoring to String isEmpty() or isBlank(). new fb504c5 removed redundant toString(). new 8741056 use EnumMap where applicable, Arrays.asList() and isEmpty(). new fe00f34 use EnumSet where applicable, Set.of and (synchronized) HashMap instead of HashTable. new 410dd72 project wide refactoring to !Collection::isEmpty. new 73d2873 added @Deprecated to methods which were deprecated via javadoc comments. new d852d9c project wide @Override refactoring. new 3495b51 Merge pull request #76 from mbien/refactor The 4561 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../planet/business/AbstractManagerImpl.java | 3 ++ .../planet/business/MultiPlanetURLStrategy.java | 7 +++ .../planet/business/fetcher/RomeFeedFetcher.java | 6 ++- .../roller/planet/business/jpa/JPAPlanetImpl.java | 5 ++ .../planet/business/jpa/JPAPlanetManagerImpl.java | 25 ++++++++++ .../updater/SingleThreadedFeedUpdater.java | 5 +- .../org/apache/roller/planet/pojos/Planet.java | 1 + .../apache/roller/planet/pojos/PlanetGroup.java | 1 + .../apache/roller/planet/pojos/StaticTemplate.java | 2 + .../apache/roller/planet/pojos/Subscription.java | 4 ++ .../roller/planet/pojos/SubscriptionEntry.java | 5 +- .../roller/planet/tasks/GeneratePlanetTask.java | 1 + .../roller/planet/tasks/RefreshPlanetTask.java | 1 + .../planet/util/rome/ContentModuleGenerator.java | 3 ++ .../planet/util/rome/ContentModuleParser.java | 2 + .../weblogger/business/AbstractURLStrategy.java | 9 ++++ .../weblogger/business/FileContentManagerImpl.java | 9 +++- .../weblogger/business/GuiceWebloggerProvider.java | 2 + .../weblogger/business/MultiWeblogURLStrategy.java | 31 ++++++++++-- .../weblogger/business/PreviewURLStrategy.java | 4 +- .../apache/roller/weblogger/business/TestTask.java | 6 +++ .../roller/weblogger/business/UserManager.java | 2 + .../roller/weblogger/business/WebloggerImpl.java | 26 ++++++++++ .../business/jpa/JPAAutoPingManagerImpl.java | 11 +++++ .../business/jpa/JPABookmarkManagerImpl.java | 14 +++++- .../business/jpa/JPAMediaFileManagerImpl.java | 29 ++++++++++- .../business/jpa/JPAOAuthManagerImpl.java | 11 +++++ .../business/jpa/JPAPingQueueManagerImpl.java | 8 +++- .../business/jpa/JPAPingTargetManagerImpl.java | 17 +++++-- .../business/jpa/JPAPropertiesManagerImpl.java | 6 +++ .../business/jpa/JPAThreadManagerImpl.java | 2 + .../weblogger/business/jpa/JPAUserManagerImpl.java | 31 +++++++++++- .../business/jpa/JPAWeblogEntryManagerImpl.java | 56 +++++++++++++++++++--- .../business/jpa/JPAWeblogManagerImpl.java | 31 ++++++++++-- .../weblogger/business/jpa/JPAWebloggerImpl.java | 1 + .../weblogger/business/jpa/JPAWebloggerModule.java | 1 + .../weblogger/business/pings/PingQueueTask.java | 6 +++ .../business/pings/WeblogUpdatePinger.java | 1 + .../business/plugins/PluginManagerImpl.java | 10 +++- .../business/plugins/comment/AutoformatPlugin.java | 10 ++-- .../business/plugins/comment/HTMLSubsetPlugin.java | 4 ++ .../business/plugins/comment/LinkMarkupPlugin.java | 4 ++ .../plugins/entry/ConvertLineBreaksPlugin.java | 12 +++-- .../plugins/entry/ObfuscateEmailPlugin.java | 4 ++ .../business/plugins/entry/SmileysPlugin.java | 4 ++ .../business/runnable/HitCountProcessingJob.java | 3 ++ .../business/runnable/ResetHitCountsTask.java | 6 +++ .../business/runnable/RollerTaskWithLeasing.java | 1 + .../business/runnable/ScheduledEntriesTask.java | 6 +++ .../weblogger/business/runnable/TaskScheduler.java | 1 + .../business/runnable/ThreadManagerImpl.java | 7 +++ .../search/operations/AddEntryOperation.java | 1 + .../search/operations/ReIndexEntryOperation.java | 1 + .../operations/RebuildWebsiteIndexOperation.java | 1 + .../search/operations/RemoveEntryOperation.java | 1 + .../operations/RemoveWebsiteIndexOperation.java | 1 + .../startup/ClasspathDatabaseScriptProvider.java | 1 + .../weblogger/business/themes/SharedTheme.java | 6 +++ .../business/themes/SharedThemeFromDir.java | 12 ++++- .../themes/SharedThemeResourceFromDir.java | 7 +++ .../business/themes/SharedThemeTemplate.java | 14 +++++- .../themes/SharedThemeTemplateRendition.java | 9 ++++ .../business/themes/ThemeManagerImpl.java | 15 ++++-- .../business/themes/ThemeMetadataTemplate.java | 3 +- .../business/themes/WeblogCustomTheme.java | 13 +++++ .../business/themes/WeblogSharedTheme.java | 13 +++++ .../apache/roller/weblogger/config/PingConfig.java | 4 +- .../weblogger/config/WebloggerRuntimeConfig.java | 2 +- .../roller/weblogger/config/runtime/ConfigDef.java | 1 + .../weblogger/config/runtime/DisplayGroup.java | 1 + .../weblogger/config/runtime/PropertyDef.java | 1 + .../planet/tasks/RefreshRollerPlanetTask.java | 6 +++ .../weblogger/planet/tasks/SyncWebsitesTask.java | 6 +++ .../roller/weblogger/planet/ui/PlanetConfig.java | 1 + .../apache/roller/weblogger/pojos/AutoPing.java | 5 +- .../weblogger/pojos/CustomTemplateRendition.java | 7 +++ .../roller/weblogger/pojos/GlobalPermission.java | 1 + .../apache/roller/weblogger/pojos/MediaFile.java | 3 ++ .../weblogger/pojos/MediaFileComparator.java | 1 + .../roller/weblogger/pojos/MediaFileDirectory.java | 1 + .../pojos/MediaFileDirectoryComparator.java | 1 + .../roller/weblogger/pojos/MediaFileTag.java | 3 ++ .../weblogger/pojos/OAuthAccessorRecord.java | 3 ++ .../weblogger/pojos/OAuthConsumerRecord.java | 3 ++ .../roller/weblogger/pojos/PingQueueEntry.java | 3 ++ .../apache/roller/weblogger/pojos/PingTarget.java | 3 ++ .../roller/weblogger/pojos/RollerPermission.java | 3 +- .../weblogger/pojos/RuntimeConfigProperty.java | 3 ++ .../apache/roller/weblogger/pojos/StatCount.java | 3 ++ .../weblogger/pojos/StatCountCountComparator.java | 1 + .../roller/weblogger/pojos/StaticTemplate.java | 6 +++ .../weblogger/pojos/StaticThemeTemplate.java | 10 ++++ .../org/apache/roller/weblogger/pojos/TagStat.java | 1 + .../roller/weblogger/pojos/TagStatComparator.java | 1 + .../weblogger/pojos/TagStatCountComparator.java | 1 + .../org/apache/roller/weblogger/pojos/User.java | 3 ++ .../apache/roller/weblogger/pojos/UserRole.java | 3 ++ .../org/apache/roller/weblogger/pojos/Weblog.java | 3 ++ .../roller/weblogger/pojos/WeblogBookmark.java | 4 ++ .../weblogger/pojos/WeblogBookmarkFolder.java | 6 ++- .../roller/weblogger/pojos/WeblogCategory.java | 2 + .../apache/roller/weblogger/pojos/WeblogEntry.java | 12 +++-- .../weblogger/pojos/WeblogEntryAttribute.java | 4 ++ .../roller/weblogger/pojos/WeblogEntryComment.java | 3 ++ .../roller/weblogger/pojos/WeblogEntryTag.java | 3 ++ .../weblogger/pojos/WeblogEntryTagAggregate.java | 3 ++ .../weblogger/pojos/WeblogEntryTagComparator.java | 3 +- .../pojos/WeblogEntryWrapperComparator.java | 1 + .../roller/weblogger/pojos/WeblogHitCount.java | 3 ++ .../roller/weblogger/pojos/WeblogPermission.java | 3 ++ .../roller/weblogger/pojos/WeblogTemplate.java | 13 +++++ .../weblogger/pojos/wrapper/WeblogWrapper.java | 1 + .../roller/weblogger/ui/core/RollerSession.java | 1 + .../weblogger/ui/core/filters/BootstrapFilter.java | 1 + .../ui/core/filters/CharEncodingFilter.java | 1 + .../weblogger/ui/core/filters/DebugFilter.java | 1 + .../weblogger/ui/core/filters/IPBanFilter.java | 1 + .../weblogger/ui/core/filters/InitFilter.java | 1 + .../weblogger/ui/core/filters/LoadSaltFilter.java | 1 + .../ui/core/filters/PersistenceSessionFilter.java | 1 + .../ui/core/filters/RoleAssignmentFilter.java | 1 + .../ui/core/filters/ValidateSaltFilter.java | 12 ++--- .../weblogger/ui/core/plugins/Summernote.java | 3 ++ .../weblogger/ui/core/plugins/TextEditor.java | 3 ++ .../ui/core/plugins/UIPluginManagerImpl.java | 4 +- .../ui/core/security/AuthoritiesPopulator.java | 3 +- .../ui/core/security/BasicUserAutoProvision.java | 1 + .../ui/core/security/RollerUserDetailsService.java | 1 + .../ui/core/tags/calendar/CalendarTag.java | 1 + .../ui/core/tags/calendar/WeblogCalendarModel.java | 14 +++++- .../weblogger/ui/rendering/RendererManager.java | 6 +-- .../ui/rendering/WeblogRequestMapper.java | 5 +- .../ui/rendering/filters/RequestMappingFilter.java | 7 +-- .../ui/rendering/model/CalendarModel.java | 2 + .../weblogger/ui/rendering/model/ConfigModel.java | 2 + .../weblogger/ui/rendering/model/FeedModel.java | 14 +++--- .../weblogger/ui/rendering/model/MenuModel.java | 2 + .../weblogger/ui/rendering/model/MessageModel.java | 2 + .../weblogger/ui/rendering/model/PageModel.java | 2 + .../weblogger/ui/rendering/model/PlanetModel.java | 2 + .../ui/rendering/model/SearchResultsFeedModel.java | 4 +- .../ui/rendering/model/SearchResultsModel.java | 2 +- .../weblogger/ui/rendering/model/SiteModel.java | 2 + .../weblogger/ui/rendering/model/URLModel.java | 2 + .../ui/rendering/model/UtilitiesModel.java | 2 + .../ui/rendering/pagers/AbstractPager.java | 6 +++ .../pagers/AbstractWeblogEntriesPager.java | 10 ++++ .../ui/rendering/pagers/CommentsPager.java | 3 +- .../ui/rendering/pagers/MediaFilesPager.java | 3 +- .../ui/rendering/pagers/PlanetEntriesPager.java | 1 + .../rendering/pagers/SearchResultsFeedPager.java | 7 +-- .../ui/rendering/pagers/SearchResultsPager.java | 11 +++++ .../weblogger/ui/rendering/pagers/UsersPager.java | 1 + .../ui/rendering/pagers/WeblogEntriesDayPager.java | 3 +- .../rendering/pagers/WeblogEntriesLatestPager.java | 3 +- .../rendering/pagers/WeblogEntriesListPager.java | 3 +- .../rendering/pagers/WeblogEntriesMonthPager.java | 3 +- .../pagers/WeblogEntriesPermalinkPager.java | 1 + .../ui/rendering/pagers/WeblogsPager.java | 1 + .../plugins/comments/AkismetCommentValidator.java | 2 + .../comments/BannedwordslistCommentValidator.java | 2 + .../plugins/comments/CommentValidationManager.java | 2 +- .../comments/DefaultCommentAuthenticator.java | 2 + .../comments/ExcessLinksCommentValidator.java | 2 + .../comments/ExcessSizeCommentValidator.java | 2 + .../plugins/comments/LdapCommentAuthenticator.java | 2 + .../plugins/comments/MathCommentAuthenticator.java | 2 + .../TrackbackLinkbackCommentValidator.java | 2 + .../ui/rendering/servlets/FeedServlet.java | 3 +- .../ui/rendering/servlets/PageServlet.java | 3 +- .../ui/rendering/util/WeblogCommentRequest.java | 2 +- .../ui/rendering/util/WeblogFeedRequest.java | 5 +- .../ui/rendering/util/WeblogPageRequest.java | 2 +- .../weblogger/ui/rendering/util/WeblogRequest.java | 4 +- .../ui/rendering/util/WeblogSearchRequest.java | 6 +-- .../ui/rendering/util/WeblogTrackbackRequest.java | 2 +- .../ui/rendering/util/cache/SiteWideCache.java | 14 ++++-- .../rendering/util/cache/WeblogCacheWarmupJob.java | 3 ++ .../ui/rendering/util/cache/WeblogFeedCache.java | 2 +- .../ui/rendering/util/cache/WeblogPageCache.java | 5 +- .../ui/rendering/util/mobile/LiteDevice.java | 4 ++ .../rendering/util/mobile/LiteDeviceResolver.java | 1 + .../ui/rendering/velocity/VelocityRenderer.java | 1 + .../velocity/VelocityRendererFactory.java | 1 + .../ui/struts2/admin/GlobalCommentManagement.java | 5 +- .../weblogger/ui/struts2/admin/GlobalConfig.java | 2 + .../weblogger/ui/struts2/admin/UserEdit.java | 2 +- .../weblogger/ui/struts2/core/CreateWeblog.java | 6 +-- .../weblogger/ui/struts2/core/OAuthAuthorize.java | 1 + .../roller/weblogger/ui/struts2/core/Register.java | 3 +- .../weblogger/ui/struts2/editor/Bookmarks.java | 2 +- .../weblogger/ui/struts2/editor/Comments.java | 4 +- .../weblogger/ui/struts2/editor/Entries.java | 2 +- .../weblogger/ui/struts2/editor/EntriesBean.java | 1 + .../weblogger/ui/struts2/editor/EntryBean.java | 3 +- .../weblogger/ui/struts2/editor/EntryEdit.java | 2 +- .../weblogger/ui/struts2/editor/MediaFileAdd.java | 2 +- .../ui/struts2/editor/MediaFileSearchBean.java | 9 +--- .../weblogger/ui/struts2/editor/Members.java | 1 + .../roller/weblogger/ui/struts2/editor/Pings.java | 4 +- .../roller/weblogger/ui/struts2/util/UIAction.java | 6 +++ .../ui/struts2/util/UIActionInterceptor.java | 1 + .../struts2/util/UIActionPrepareInterceptor.java | 1 + .../ui/struts2/util/UISecurityInterceptor.java | 1 + .../roller/weblogger/ui/struts2/util/UIUtils.java | 1 + .../weblogger/ui/tags/TruncateNicelyTag.java | 1 + .../roller/weblogger/ui/tags/WordWrapTag.java | 1 + .../roller/weblogger/util/Bannedwordslist.java | 5 +- .../roller/weblogger/util/HTMLSanitizer.java | 4 +- .../apache/roller/weblogger/util/LRUCache2.java | 1 + .../roller/weblogger/util/LinkbackExtractor.java | 2 +- .../org/apache/roller/weblogger/util/MailUtil.java | 2 +- .../roller/weblogger/util/MediacastResource.java | 1 + .../roller/weblogger/util/MediacastUtil.java | 2 +- .../roller/weblogger/util/RollerMessages.java | 1 + .../util/StandaloneWebappClassLoader.java | 1 + .../apache/roller/weblogger/util/URLUtilities.java | 2 +- .../roller/weblogger/util/cache/CacheManager.java | 2 +- .../util/cache/ExpiringLRUCacheFactoryImpl.java | 1 + .../weblogger/util/cache/LRUCacheFactoryImpl.java | 1 + .../webservices/atomprotocol/EntryCollection.java | 8 ++-- .../webservices/atomprotocol/MediaCollection.java | 5 +- .../atomprotocol/RollerAtomHandler.java | 16 +++++++ .../atomprotocol/RollerAtomHandlerFactory.java | 1 + .../webservices/xmlrpc/BloggerAPIHandler.java | 2 +- .../webservices/xmlrpc/MetaWeblogAPIHandler.java | 2 +- .../planet/business/RomeFeedFetcherTest.java | 4 +- .../business/SingleThreadedFeedUpdaterTest.java | 2 +- .../roller/weblogger/business/BookmarkTest.java | 2 +- .../roller/weblogger/util/LRUCache2Test.java | 1 + 230 files changed, 912 insertions(+), 166 deletions(-)