You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/03/29 04:32:32 UTC
svn commit: r1582942 - in /roller/trunk/app/src/main/java/org/apache/roller:
planet/pojos/ weblogger/business/ weblogger/ui/core/filters/
weblogger/ui/core/security/ weblogger/ui/rendering/model/
weblogger/ui/rendering/pagers/ weblogger/ui/rendering/se...
Author: gmazza
Date: Sat Mar 29 03:32:31 2014
New Revision: 1582942
URL: http://svn.apache.org/r1582942
Log:
Fixed some Sonar issues.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/MailProvider.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CharEncodingFilter.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CustomOpenIDAuthenticationProcessingFilter.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/SchemeEnforcementFilter.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/MediaFilesPager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerVelocity.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/ThemeResourceLoader.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/WebappResourceLoader.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheImpl.java
Modified: roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java?rev=1582942&r1=1582941&r2=1582942&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java Sat Mar 29 03:32:31 2014
@@ -161,8 +161,8 @@ public class PlanetGroup implements Seri
if (cats == null || cats.length == 0) {
return true;
}
- for (int i=0; i<cats.length; i++) {
- if (entry.inCategory(cats[i])) {
+ for (String cat : cats) {
+ if (entry.inCategory(cat)) {
return true;
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/MailProvider.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/MailProvider.java?rev=1582942&r1=1582941&r2=1582942&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/MailProvider.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/MailProvider.java Sat Mar 29 03:32:31 2014
@@ -20,7 +20,6 @@ package org.apache.roller.weblogger.busi
import java.util.Properties;
import javax.mail.MessagingException;
-import javax.mail.NoSuchProviderException;
import javax.mail.Session;
import javax.mail.Transport;
import javax.naming.Context;
@@ -39,7 +38,7 @@ public class MailProvider {
private static final Log LOG = LogFactory.getLog(MailProvider.class);
- private enum ConfigurationType {JNDI_NAME, MAIL_PROPERTIES; }
+ private enum ConfigurationType {JNDI_NAME, MAIL_PROPERTIES }
private Session session = null;
@@ -76,7 +75,7 @@ public class MailProvider {
jndiName = "java:comp/env/" + jndiName;
}
try {
- Context ctx = (Context) new InitialContext();
+ Context ctx = new InitialContext();
session = (Session) ctx.lookup(jndiName);
} catch (NamingException ex) {
throw new StartupException("ERROR looking up mail-session with JNDI name: " + jndiName);
@@ -114,9 +113,9 @@ public class MailProvider {
/**
* Create and connect to transport, caller is responsible for closing transport.
*/
- public Transport getTransport() throws NoSuchProviderException, MessagingException {
+ public Transport getTransport() throws MessagingException {
- Transport transport = null;
+ Transport transport;
if (type == ConfigurationType.MAIL_PROPERTIES) {
// Configure transport ourselves using mail properties
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CharEncodingFilter.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CharEncodingFilter.java?rev=1582942&r1=1582941&r2=1582942&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CharEncodingFilter.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CharEncodingFilter.java Sat Mar 29 03:32:31 2014
@@ -40,7 +40,6 @@ import org.apache.commons.logging.LogFac
*/
public class CharEncodingFilter implements Filter {
- private FilterConfig mFilterConfig = null;
private static Log mLogger =
LogFactory.getFactory().getInstance(CharEncodingFilter.class);
@@ -48,7 +47,6 @@ public class CharEncodingFilter implemen
* init
*/
public void init(FilterConfig filterConfig) throws ServletException {
- mFilterConfig = filterConfig;
}
/**
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CustomOpenIDAuthenticationProcessingFilter.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CustomOpenIDAuthenticationProcessingFilter.java?rev=1582942&r1=1582941&r2=1582942&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CustomOpenIDAuthenticationProcessingFilter.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CustomOpenIDAuthenticationProcessingFilter.java Sat Mar 29 03:32:31 2014
@@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthenticationException;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.openid.OpenIDAuthenticationToken;
import org.springframework.security.openid.OpenIDAuthenticationFilter;
@@ -48,9 +47,11 @@ public class CustomOpenIDAuthenticationP
private String claimedIdentityFieldName = DEFAULT_CLAIMED_IDENTITY_FIELD;
private static Log log = LogFactory.getLog(CustomOpenIDAuthenticationProcessingFilter.class);
+ /**
+ * @throws org.springframework.security.core.AuthenticationException
+ */
@Override
- public Authentication attemptAuthentication(HttpServletRequest req, HttpServletResponse rsp) throws AuthenticationException,
- IOException {
+ public Authentication attemptAuthentication(HttpServletRequest req, HttpServletResponse rsp) throws IOException {
OpenIDAuthenticationToken auth = null;
// Processing standard OpenId user authentication
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/SchemeEnforcementFilter.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/SchemeEnforcementFilter.java?rev=1582942&r1=1582941&r2=1582942&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/SchemeEnforcementFilter.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/SchemeEnforcementFilter.java Sat Mar 29 03:32:31 2014
@@ -24,6 +24,8 @@
package org.apache.roller.weblogger.ui.core.filters;
import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -141,11 +143,7 @@ public class SchemeEnforcementFilter imp
int i = theUrl.lastIndexOf('.');
- if (i <= 0 || i == theUrl.length() - 1) {
- return true;
- }
-
- return ignored.contains(theUrl.substring(i + 1));
+ return i <= 0 || i == theUrl.length()-1 || ignored.contains(theUrl.substring(i + 1));
}
@@ -188,15 +186,12 @@ public class SchemeEnforcementFilter imp
String cfgs = WebloggerConfig
.getProperty("schemeenforcement.https.urls");
String[] cfgsArray = cfgs.split(",");
- for (int i = 0; i < cfgsArray.length; i++) {
- this.allowedUrls.add(cfgsArray[i]);
- }
+ Collections.addAll(this.allowedUrls, cfgsArray);
+
cfgs = WebloggerConfig
.getProperty("schemeenforcement.https.ignored");
cfgsArray = StringUtils.stripAll(StringUtils.split(cfgs, ","));
- for (int i = 0; i < cfgsArray.length; i++) {
- this.ignored.add(cfgsArray[i]);
- }
+ Collections.addAll(this.ignored, cfgsArray);
// some logging for the curious
log.info("Scheme enforcement = enabled");
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java?rev=1582942&r1=1582941&r2=1582942&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java Sat Mar 29 03:32:31 2014
@@ -24,9 +24,11 @@ import org.springframework.dao.DataRetri
public class RollerUserDetailsService implements UserDetailsService {
private static Log log = LogFactory.getLog(RollerUserDetailsService.class);
- public UserDetails loadUserByUsername(String userName)
- throws UsernameNotFoundException, DataAccessException {
- Weblogger roller = null;
+ /**
+ * @throws UsernameNotFoundException, DataAccessException
+ */
+ public UserDetails loadUserByUsername(String userName) {
+ Weblogger roller;
try {
roller = WebloggerFactory.getWeblogger();
} catch (Exception e) {
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java?rev=1582942&r1=1582941&r2=1582942&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java Sat Mar 29 03:32:31 2014
@@ -191,7 +191,7 @@ public class FeedModel implements Model
super(urlStrategy, urlStrategy.getWeblogFeedURL(feedRequest.getWeblog(),
feedRequest.getLocale(), feedRequest.getType(),
feedRequest.getFormat(), null, null,
- null, false, true), feedRequest.getWeblog(), feedRequest.getLocale(), -1, feedRequest.getPage(), DEFAULT_ENTRIES);
+ null, false, true), feedRequest.getWeblog(), -1, feedRequest.getPage(), DEFAULT_ENTRIES);
this.feedRequest = feedRequest;
}
@@ -223,7 +223,7 @@ public class FeedModel implements Model
super(urlStrategy, urlStrategy.getWeblogFeedURL(feedRequest.getWeblog(),
feedRequest.getLocale(), feedRequest.getType(),
feedRequest.getFormat(), null, null,
- null, false, true), feedRequest.getWeblog(), -1, feedRequest.getPage(), 10);
+ null, false, true), feedRequest.getPage(), 10);
this.feedRequest = feedRequest;
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java?rev=1582942&r1=1582941&r2=1582942&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java Sat Mar 29 03:32:31 2014
@@ -108,7 +108,6 @@ public class PlanetModel implements Mode
null,
null,
pagerUrl,
- weblogRequest.getLocale(),
sinceDays,
pageNum,
length);
@@ -131,7 +130,6 @@ public class PlanetModel implements Mode
null,
groupHandle,
pagerUrl,
- weblogRequest.getLocale(),
sinceDays,
pageNum,
length);
@@ -154,7 +152,6 @@ public class PlanetModel implements Mode
feedURL,
null,
pagerUrl,
- weblogRequest.getLocale(),
-1,
pageNum,
length);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java?rev=1582942&r1=1582941&r2=1582942&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java Sat Mar 29 03:32:31 2014
@@ -217,7 +217,6 @@ public class SiteModel implements Model
urlStrategy,
pagerUrl,
null,
- weblogRequest.getLocale(),
sinceDays,
pageNum,
length);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java?rev=1582942&r1=1582941&r2=1582942&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java Sat Mar 29 03:32:31 2014
@@ -42,7 +42,6 @@ public class CommentsPager extends Abstr
private static Log log = LogFactory.getLog(CommentsPager.class);
private Weblog weblog = null;
- private String locale = null;
private int sinceDays = -1;
private int length = 0;
@@ -59,7 +58,6 @@ public class CommentsPager extends Abstr
URLStrategy strat,
String baseUrl,
Weblog weblog,
- String locale,
int sinceDays,
int page,
int length) {
@@ -67,7 +65,6 @@ public class CommentsPager extends Abstr
super(strat, baseUrl, page);
this.weblog = weblog;
- this.locale = locale;
this.sinceDays = sinceDays;
this.length = length;
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/MediaFilesPager.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/MediaFilesPager.java?rev=1582942&r1=1582941&r2=1582942&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/MediaFilesPager.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/MediaFilesPager.java Sat Mar 29 03:32:31 2014
@@ -38,32 +38,21 @@ import org.apache.roller.weblogger.pojos
public class MediaFilesPager extends AbstractPager {
private static Log log = LogFactory.getLog(MediaFilesPager.class);
-
- private Weblog weblog = null;
- private int sinceDays = -1;
private int length = 0;
// the collection for the pager
private List<MediaFile> mediaFiles;
- // are there more items?
- private boolean more = false;
-
// most recent update time of current set of entries
private Date lastUpdated = null;
public MediaFilesPager(
URLStrategy strat,
String baseUrl,
- Weblog weblog,
- int sinceDays,
int page,
int length) {
super(strat, baseUrl, page);
-
- this.weblog = weblog;
- this.sinceDays = sinceDays;
this.length = length;
// initialize the collection
@@ -93,16 +82,16 @@ public class MediaFilesPager extends Abs
public boolean hasMoreItems() {
- return more;
+ return false;
}
/** Get last updated time from items in pager */
public Date getLastUpdated() {
if (lastUpdated == null) {
// feeds are sorted by pubtime, so first might not be last updated
- List<MediaFile> items = (List<MediaFile>)getItems();
+ List<MediaFile> items = getItems();
if (items != null && items.size() > 0) {
- Timestamp newest = ((MediaFile)items.get(0)).getLastUpdated();
+ Timestamp newest = items.get(0).getLastUpdated();
for (MediaFile file : items) {
if (file.getLastUpdated().after(newest)) {
newest = file.getLastUpdated();
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java?rev=1582942&r1=1582941&r2=1582942&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java Sat Mar 29 03:32:31 2014
@@ -42,7 +42,6 @@ public class PlanetEntriesPager extends
private String feedURL = null;
private String groupHandle = null;
- private String locale = null;
private int sinceDays = -1;
private int length = 0;
@@ -58,7 +57,6 @@ public class PlanetEntriesPager extends
String feedURL,
String groupHandle,
String baseUrl,
- String locale,
int sinceDays,
int page,
int length) {
@@ -67,7 +65,6 @@ public class PlanetEntriesPager extends
this.feedURL = feedURL;
this.groupHandle = groupHandle;
- this.locale = locale;
this.sinceDays = sinceDays;
this.length = length;
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java?rev=1582942&r1=1582941&r2=1582942&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java Sat Mar 29 03:32:31 2014
@@ -300,12 +300,12 @@ public class CommentServlet extends Http
if (!preview) {
- if (validationScore == 100 && weblog.getCommentModerationRequired()) {
+ if (validationScore == RollerConstants.PERCENT_100 && weblog.getCommentModerationRequired()) {
// Valid comments go into moderation if required
comment.setStatus(WeblogEntryComment.PENDING);
message = messageUtils
.getString("commentServlet.submittedToModerator");
- } else if (validationScore == 100) {
+ } else if (validationScore == RollerConstants.PERCENT_100) {
// else they're approved
comment.setStatus(WeblogEntryComment.APPROVED);
message = messageUtils
@@ -355,7 +355,7 @@ public class CommentServlet extends Http
// Send email notifications only to subscribers if comment
// is 100% valid
- boolean notifySubscribers = (validationScore == 100);
+ boolean notifySubscribers = (validationScore == RollerConstants.PERCENT_100);
MailUtil.sendEmailNotification(comment, messages,
messageUtils, notifySubscribers);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java?rev=1582942&r1=1582941&r2=1582942&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java Sat Mar 29 03:32:31 2014
@@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.business.WebloggerFactory;
@@ -162,10 +163,10 @@ public class TrackbackServlet extends Ht
int validationScore = commentValidationManager.validateComment(comment, messages);
logger.debug("Comment Validation score: " + validationScore);
- if (validationScore == 100 && weblog.getCommentModerationRequired()) {
+ if (validationScore == RollerConstants.PERCENT_100 && weblog.getCommentModerationRequired()) {
// Valid comments go into moderation if required
comment.setStatus(WeblogEntryComment.PENDING);
- } else if (validationScore == 100) {
+ } else if (validationScore == RollerConstants.PERCENT_100) {
// else they're approved
comment.setStatus(WeblogEntryComment.APPROVED);
} else {
@@ -190,7 +191,7 @@ public class TrackbackServlet extends Ht
// Send email notifications
MailUtil.sendEmailNotification(comment, messages,
I18nMessages.getMessages(trackbackRequest.getLocaleInstance()),
- validationScore == 100);
+ validationScore == RollerConstants.PERCENT_100);
if(WeblogEntryComment.PENDING.equals(comment.getStatus())) {
pw.println(this.getSuccessResponse("Trackback submitted to moderator"));
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java?rev=1582942&r1=1582941&r2=1582942&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java Sat Mar 29 03:32:31 2014
@@ -57,9 +57,9 @@ public class RollerResourceLoader extend
* @param name
* name of template
* @return InputStream containing template
+ * @throws ResourceNotFoundException
*/
- public InputStream getResourceStream(String name)
- throws ResourceNotFoundException {
+ public InputStream getResourceStream(String name) {
logger.debug("Looking for: " + name);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerVelocity.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerVelocity.java?rev=1582942&r1=1582941&r2=1582942&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerVelocity.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerVelocity.java Sat Mar 29 03:32:31 2014
@@ -97,35 +97,35 @@ public class RollerVelocity {
/**
* Convenience static method for looking up a template.
+ * @throws ResourceNotFoundException, ParseErrorException
*/
- public static Template getTemplate(String name)
- throws ResourceNotFoundException, ParseErrorException, Exception {
+ public static Template getTemplate(String name) {
return velocityEngine.getTemplate(name + "|standard");
}
/**
* Convenience static method for looking up a template.
+ * @throws ResourceNotFoundException, ParseErrorException
*/
public static Template getTemplate(String name,
- MobileDeviceRepository.DeviceType deviceType)
- throws ResourceNotFoundException, ParseErrorException, Exception {
+ MobileDeviceRepository.DeviceType deviceType) {
return velocityEngine.getTemplate(name + "|" + deviceType);
}
/**
* Convenience static method for looking up a template.
+ * @throws ResourceNotFoundException, ParseErrorException
*/
- public static Template getTemplate(String name, String encoding)
- throws ResourceNotFoundException, ParseErrorException, Exception {
+ public static Template getTemplate(String name, String encoding) {
return velocityEngine.getTemplate(name + "|standard", encoding);
}
/**
* Convenience static method for looking up a template.
+ * @throws ResourceNotFoundException, ParseErrorException
*/
public static Template getTemplate(String name,
- MobileDeviceRepository.DeviceType deviceType, String encoding)
- throws ResourceNotFoundException, ParseErrorException, Exception {
+ MobileDeviceRepository.DeviceType deviceType, String encoding) {
return velocityEngine.getTemplate(name + "|" + deviceType, encoding);
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/ThemeResourceLoader.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/ThemeResourceLoader.java?rev=1582942&r1=1582941&r2=1582942&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/ThemeResourceLoader.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/ThemeResourceLoader.java Sat Mar 29 03:32:31 2014
@@ -54,8 +54,10 @@ public class ThemeResourceLoader extends
logger.debug(configuration);
}
- public InputStream getResourceStream(String name)
- throws ResourceNotFoundException {
+ /**
+ * @throws ResourceNotFoundException
+ */
+ public InputStream getResourceStream(String name) {
if (log.isDebugEnabled()) {
logger.debug("Looking for: " + name);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/WebappResourceLoader.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/WebappResourceLoader.java?rev=1582942&r1=1582941&r2=1582942&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/WebappResourceLoader.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/WebappResourceLoader.java Sat Mar 29 03:32:31 2014
@@ -121,11 +121,10 @@ public class WebappResourceLoader extend
* @param name
* name of template to get
* @return InputStream containing the template
- * @throws ResourceNotFoundException
- * if template not found in classpath.
+ * @throws ResourceNotFoundException if template not found in classpath.
+ *
*/
- public InputStream getResourceStream(String name)
- throws ResourceNotFoundException {
+ public InputStream getResourceStream(String name) {
InputStream result = null;
Exception exception = null;
@@ -143,7 +142,7 @@ public class WebappResourceLoader extend
throw new ResourceNotFoundException("Invalid ThemeRL key " + name);
}
- String savedPath = (String) templatePaths.get(name);
+ String savedPath = templatePaths.get(name);
if (savedPath != null) {
result = servletContext.getResourceAsStream(savedPath + split[0]);
}
@@ -214,7 +213,7 @@ public class WebappResourceLoader extend
fileName = fileName.substring(1);
}
- String savedPath = (String) templatePaths.get(fileName);
+ String savedPath = templatePaths.get(fileName);
// names are <template>|<deviceType>
// loading weblog.vm etc will not have the type so only check for
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java?rev=1582942&r1=1582941&r2=1582942&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java Sat Mar 29 03:32:31 2014
@@ -72,50 +72,37 @@ public class LinkbackExtractor
* @param refererURL
* @param requestURL
*/
- public LinkbackExtractor(String refererURL, String requestURL)
- throws IOException
- {
- try
- {
+ public LinkbackExtractor(String refererURL, String requestURL) throws IOException {
+ try {
extractByParsingHtml(refererURL, requestURL);
- if (mRssLink != null)
- {
+ if (mRssLink != null) {
extractByParsingRss(mRssLink, requestURL);
}
- }
- catch (Exception e)
- {
- if (mLogger.isDebugEnabled())
- {
+ } catch (Exception e) {
+ if (mLogger.isDebugEnabled()) {
mLogger.debug("Extracting linkback", e);
}
}
}
//------------------------------------------------------------------------
- private void extractByParsingHtml(String refererURL, String requestURL)
- throws IOException
- {
+ private void extractByParsingHtml(String refererURL, String requestURL) throws IOException {
URL url = new URL(refererURL);
InputStream is = url.openStream();
mRefererURL = refererURL;
- if (requestURL.startsWith("http://www."))
- {
+ if (requestURL.startsWith("http://www.")) {
mRequestURLWWW = requestURL;
mRequestURL = "http://" + mRequestURLWWW.substring(11);
- }
- else
- {
+ } else {
mRequestURL = requestURL;
mRequestURLWWW = "http://www." + mRequestURL.substring(7);
}
// Trick gets Swing's HTML parser
Parser parser = (new HTMLEditorKit() {
- public Parser getParser()
- {
+ public Parser getParser() {
return super.getParser();
}
}).getParser();
@@ -124,16 +111,12 @@ public class LinkbackExtractor
StringBuilder sb = new StringBuilder();
InputStreamReader isr = new InputStreamReader(is);
BufferedReader br = new BufferedReader(isr);
- try
- {
+ try {
String line = null;
- while ((line = br.readLine()) != null)
- {
+ while ((line = br.readLine()) != null) {
sb.append(line);
}
- }
- finally
- {
+ } finally {
br.close();
}
@@ -142,27 +125,23 @@ public class LinkbackExtractor
StringReader sr = new StringReader(sb.toString());
parser.parse(sr, new LinkbackCallback(), true);
- if (mStart != 0 && mEnd != 0 && mEnd > mStart)
- {
+ if (mStart != 0 && mEnd != 0 && mEnd > mStart) {
mExcerpt = sb.toString().substring(mStart, mEnd);
mExcerpt = Utilities.removeHTML(mExcerpt);
- if (mExcerpt.length() > MAX_EXCERPT_CHARS)
- {
+ if (mExcerpt.length() > MAX_EXCERPT_CHARS) {
mExcerpt = mExcerpt.substring(0, MAX_EXCERPT_CHARS) + "...";
}
}
- if (mTitle.startsWith(">") && mTitle.length() > 1)
- {
+ if (mTitle.startsWith(">") && mTitle.length() > 1) {
mTitle = mTitle.substring(1);
}
}
//------------------------------------------------------------------------
private void extractByParsingRss(String rssLink, String requestURL)
- throws IllegalArgumentException, FeedException, IOException
- {
+ throws FeedException, IOException {
SyndFeedInput feedInput = new SyndFeedInput();
SyndFeed feed = feedInput.build(
new InputStreamReader(new URL(rssLink).openStream()));
@@ -170,41 +149,32 @@ public class LinkbackExtractor
int count = 0;
- if (mLogger.isDebugEnabled())
- {
+ if (mLogger.isDebugEnabled()) {
mLogger.debug("Feed parsed, title: " + feedTitle);
}
- for (Object objItem : feed.getEntries())
- {
+ for (Object objItem : feed.getEntries()) {
count++;
SyndEntry item = (SyndEntry) objItem;
- if (item.getDescription().getValue().contains(requestURL))
- {
+ if (item.getDescription().getValue().contains(requestURL)) {
mFound = true;
mPermalink = item.getLink();
- if (feedTitle != null && feedTitle.trim().length() > 0)
- {
+ if (feedTitle != null && feedTitle.trim().length() > 0) {
mTitle = feedTitle + ": " + item.getTitle();
- }
- else
- {
+ } else {
mTitle = item.getTitle();
}
mExcerpt = item.getDescription().getValue();
mExcerpt = Utilities.removeHTML(mExcerpt);
- if (mExcerpt.length() > MAX_EXCERPT_CHARS)
- {
+ if (mExcerpt.length() > MAX_EXCERPT_CHARS) {
mExcerpt = mExcerpt.substring(0, MAX_EXCERPT_CHARS) + "...";
}
break;
}
}
- if (mLogger.isDebugEnabled())
- {
- mLogger.debug("Parsed " + count + " articles, found linkback="
- + mFound);
+ if (mLogger.isDebugEnabled()) {
+ mLogger.debug("Parsed " + count + " articles, found linkback=" + mFound);
}
}
@@ -214,8 +184,7 @@ public class LinkbackExtractor
*
* @return String
*/
- public String getExcerpt()
- {
+ public String getExcerpt() {
return mExcerpt;
}
@@ -225,8 +194,7 @@ public class LinkbackExtractor
*
* @return String
*/
- public String getTitle()
- {
+ public String getTitle() {
return mTitle;
}
@@ -236,8 +204,7 @@ public class LinkbackExtractor
*
* @return String
*/
- public String getPermalink()
- {
+ public String getPermalink() {
return mPermalink;
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java?rev=1582942&r1=1582941&r2=1582942&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java Sat Mar 29 03:32:31 2014
@@ -19,7 +19,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import java.util.NoSuchElementException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -324,14 +323,12 @@ public class Utilities {
}
// --------------------------------------------------------------------------
- /** Convert string with delimeters to string list. */
- public static List<String> stringToStringList(String instr, String delim)
- throws NoSuchElementException, NumberFormatException {
+ /** Convert string with delimiters to string list.
+ */
+ public static List<String> stringToStringList(String instr, String delim) {
List<String> stringList = new ArrayList<String>();
String[] str = StringUtils.split(instr, delim);
- for (String string : str) {
- stringList.add(string);
- }
+ Collections.addAll(stringList, str);
return stringList;
}
@@ -343,7 +340,7 @@ public class Utilities {
int i = 0;
for (String string : str) {
int nInt = Integer.parseInt(string);
- intArray[i++] = new Integer(nInt).intValue();
+ intArray[i++] = nInt;
}
return intArray;
}
@@ -364,8 +361,8 @@ public class Utilities {
// ------------------------------------------------------------------------
public static void copyFile(File from, File to) throws IOException {
- InputStream in = null;
- OutputStream out = null;
+ InputStream in;
+ OutputStream out;
try {
in = new FileInputStream(from);
@@ -497,7 +494,7 @@ public class Utilities {
public static String encodePassword(String password, String algorithm) {
byte[] unencodedPassword = password.getBytes();
- MessageDigest md = null;
+ MessageDigest md;
try {
// first create an instance, given the provider
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheImpl.java?rev=1582942&r1=1582941&r2=1582942&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheImpl.java Sat Mar 29 03:32:31 2014
@@ -25,6 +25,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
/**
@@ -114,17 +115,17 @@ public class LRUCacheImpl implements Cac
public Map<String, Object> getStats() {
- Map stats = new HashMap();
+ Map<String, Object> stats = new HashMap<String, Object>();
stats.put("startTime", this.startTime);
- stats.put("hits", new Double(this.hits));
- stats.put("misses", new Double(this.misses));
- stats.put("puts", new Double(this.puts));
- stats.put("removes", new Double(this.removes));
+ stats.put("hits", this.hits);
+ stats.put("misses", this.misses);
+ stats.put("puts", this.puts);
+ stats.put("removes", this.removes);
// calculate efficiency
if((misses - removes) > 0) {
double efficiency = hits / (misses + hits);
- stats.put("efficiency", new Double(efficiency * 100));
+ stats.put("efficiency", efficiency * RollerConstants.PERCENT_100);
}
return stats;