Author: gmazza
Date: Sat Apr 5 02:49:07 2014
New Revision: 1584953
URL: http://svn.apache.org/r1584953
Log:
More Sonar items fixed.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataTemplate.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/LdapCommentAuthenticator.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java?rev=1584953&r1=1584952&r2=1584953&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
Sat Apr 5 02:49:07 2014
@@ -28,6 +28,7 @@ import org.apache.roller.weblogger.busin
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
@@ -50,7 +51,7 @@ public class JPAUserManagerImpl implemen
private final JPAPersistenceStrategy strategy;
// cached mapping of userNames -> userIds
- private Map userNameToIdMap = new Hashtable();
+ private Map<String, String> userNameToIdMap = new HashMap<String,
String>();
@com.google.inject.Inject
@@ -177,7 +178,7 @@ public class JPAUserManagerImpl implemen
for (int i=0; i<params.length; i++) {
query.setParameter(i+1, params[i]);
}
- User user = null;
+ User user;
try {
user = (User)query.getSingleResult();
} catch (NoResultException e) {
@@ -196,14 +197,9 @@ public class JPAUserManagerImpl implemen
public List<User> getUsers(Weblog weblog, Boolean enabled, Date startDate,
Date endDate, int offset, int length)
throws WebloggerException {
- Query query = null;
-
- // if we are doing date range then we must have an end date
- if (startDate != null && endDate == null) {
- endDate = new Date();
- }
+ Query query;
- List params = new ArrayList();
+ List<Object> params = new ArrayList<Object>();
int size = 0;
StringBuilder queryString = new StringBuilder();
StringBuilder whereClause = new StringBuilder();
@@ -211,7 +207,7 @@ public class JPAUserManagerImpl implemen
if (weblog != null) {
queryString.append("SELECT u FROM User u JOIN u.permissions p ");
params.add(size++, weblog);
- whereClause.append(" WHERE p.website = ?" + size);
+ whereClause.append(" WHERE p.website = ?").append(size);
} else {
queryString.append("SELECT u FROM User u ");
}
@@ -223,7 +219,7 @@ public class JPAUserManagerImpl implemen
whereClause.append(" AND ");
}
params.add(size++, enabled);
- whereClause.append("u.enabled = ?" + size);
+ whereClause.append("u.enabled = ?").append(size);
}
if (startDate != null) {
@@ -233,16 +229,14 @@ public class JPAUserManagerImpl implemen
whereClause.append(" AND ");
}
- // if we are doing date range then we must have an end date
- if(endDate == null) {
- endDate = new Date();
- }
Timestamp start = new Timestamp(startDate.getTime());
- Timestamp end = new Timestamp(endDate.getTime());
+ // if we are doing date range then we must have an end date
+ // TODO: why? confirm end date needed
+ Timestamp end = new Timestamp(endDate != null ? endDate.getTime()
: new Date().getTime());
params.add(size++, start);
- whereClause.append("u.dateCreated > ?" + size);
+ whereClause.append("u.dateCreated > ?").append(size);
params.add(size++, end);
- whereClause.append(" AND u.dateCreated < ?" + size);
+ whereClause.append(" AND u.dateCreated < ?").append(size);
}
whereClause.append(" ORDER BY u.dateCreated DESC");
query = strategy.getDynamicQuery(queryString.toString() +
whereClause.toString());
@@ -268,25 +262,19 @@ public class JPAUserManagerImpl implemen
public List<User> getUsers(Boolean enabled, Date startDate, Date endDate,
int offset, int length)
throws WebloggerException {
- Query query = null;
- List results = null;
- boolean setRange = offset != 0 || length != -1;
+ Query query;
+
+ Timestamp end = new Timestamp(endDate != null ? endDate.getTime() :
new Date().getTime());
- if (endDate == null) {
- endDate = new Date();
- }
-
if (enabled != null) {
if (startDate != null) {
Timestamp start = new Timestamp(startDate.getTime());
- Timestamp end = new Timestamp(endDate.getTime());
query = strategy.getNamedQuery(
"User.getByEnabled&EndDate&StartDateOrderByStartDateDesc");
query.setParameter(1, enabled);
query.setParameter(2, end);
query.setParameter(3, start);
} else {
- Timestamp end = new Timestamp(endDate.getTime());
query = strategy.getNamedQuery(
"User.getByEnabled&EndDateOrderByStartDateDesc");
query.setParameter(1, enabled);
@@ -295,13 +283,11 @@ public class JPAUserManagerImpl implemen
} else {
if (startDate != null) {
Timestamp start = new Timestamp(startDate.getTime());
- Timestamp end = new Timestamp(endDate.getTime());
query = strategy.getNamedQuery(
"User.getByEndDate&StartDateOrderByStartDateDesc");
query.setParameter(1, end);
query.setParameter(2, start);
} else {
- Timestamp end = new Timestamp(endDate.getTime());
query = strategy.getNamedQuery(
"User.getByEndDateOrderByStartDateDesc");
query.setParameter(1, end);
@@ -320,12 +306,8 @@ public class JPAUserManagerImpl implemen
/**
* Get users of a website
*/
- public List getUsers(Weblog website, Boolean enabled, int offset, int
length) throws WebloggerException {
- Query query = null;
-
- if (length == -1) {
- length = Integer.MAX_VALUE - offset;
- }
+ public List<User> getUsers(Weblog website, Boolean enabled, int offset,
int length) throws WebloggerException {
+ Query query;
if (enabled != null) {
if (website != null) {
@@ -354,9 +336,9 @@ public class JPAUserManagerImpl implemen
}
- public List getUsersStartingWith(String startsWith, Boolean enabled,
+ public List<User> getUsersStartingWith(String startsWith, Boolean enabled,
int offset, int length) throws WebloggerException {
- Query query = null;
+ Query query;
if (enabled != null) {
if (startsWith != null) {
@@ -471,7 +453,7 @@ public class JPAUserManagerImpl implemen
for (int i = 0; i < params.length; i++) {
query.setParameter(i + 1, params[i]);
}
- User user = null;
+ User user;
try {
user = (User) query.getSingleResult();
} catch (NoResultException e) {
@@ -647,7 +629,7 @@ public class JPAUserManagerImpl implemen
Query q =
strategy.getNamedQuery("WeblogPermission.getByUserName&WeblogIdIncludingPending");
q.setParameter(1, user.getUserName());
q.setParameter(2, weblog.getHandle());
- WeblogPermission existingPerm = null;
+ WeblogPermission existingPerm;
try {
existingPerm = (WeblogPermission)q.getSingleResult();
@@ -666,7 +648,7 @@ public class JPAUserManagerImpl implemen
Query q =
strategy.getNamedQuery("WeblogPermission.getByUserName&WeblogIdIncludingPending");
q.setParameter(1, user.getUserName());
q.setParameter(2, weblog.getHandle());
- WeblogPermission existingPerm = null;
+ WeblogPermission existingPerm;
try {
existingPerm = (WeblogPermission)q.getSingleResult();
} catch (NoResultException ignored) {
@@ -683,7 +665,7 @@ public class JPAUserManagerImpl implemen
Query q =
strategy.getNamedQuery("WeblogPermission.getByUserName&WeblogIdIncludingPending");
q.setParameter(1, user.getUserName());
q.setParameter(2, weblog.getHandle());
- WeblogPermission oldperm = null;
+ WeblogPermission oldperm;
try {
oldperm = (WeblogPermission)q.getSingleResult();
} catch (NoResultException ignored) {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java?rev=1584953&r1=1584952&r2=1584953&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
Sat Apr 5 02:49:07 2014
@@ -59,14 +59,13 @@ import org.apache.roller.weblogger.busin
@com.google.inject.Singleton
public class JPAWeblogEntryManagerImpl implements WeblogEntryManager {
- protected static Log log = LogFactory.getLog(
- JPAWeblogEntryManagerImpl.class);
+ private static final Log LOG =
LogFactory.getLog(JPAWeblogEntryManagerImpl.class);
private final Weblogger roller;
private final JPAPersistenceStrategy strategy;
// cached mapping of entryAnchors -> entryIds
- private Hashtable entryAnchorToIdMap = new Hashtable();
+ private HashMap<String, String> entryAnchorToIdMap = new HashMap<String,
String>();
/* inline creation of reverse comparator, anonymous inner class */
private static final Comparator REVERSE_COMPARATOR = new
ReverseComparator();
@@ -82,7 +81,7 @@ public class JPAWeblogEntryManagerImpl i
@com.google.inject.Inject
protected JPAWeblogEntryManagerImpl(Weblogger roller,
JPAPersistenceStrategy strategy) {
- log.debug("Instantiating JPA Weblog Manager");
+ LOG.debug("Instantiating JPA Weblog Manager");
this.roller = roller;
this.strategy = strategy;
}
@@ -294,7 +293,7 @@ public class JPAWeblogEntryManagerImpl i
throws WebloggerException {
if (current == null) {
- log.debug("current WeblogEntry cannot be null");
+ LOG.debug("current WeblogEntry cannot be null");
return Collections.emptyList();
}
@@ -405,25 +404,6 @@ public class JPAWeblogEntryManagerImpl i
queryString.append("e.website.enabled = ?").append(size);
}
- /*if (wesc.getTags() != null && wesc.getTags().size() > 0) {
- // A JOIN with WeblogEntryTag in parent query will cause a
DISTINCT in SELECT clause
- // WeblogEntry has a clob field and many databases do not link
DISTINCT for CLOB fields
- // Hence as a workaround using corelated EXISTS query.
- queryString.append(" AND EXISTS (SELECT t FROM WeblogEntryTag t
WHERE "
- + " t.weblogEntry = e AND t.name IN (");
- final String PARAM_SEPARATOR = ", ";
- for (int i = 0; i < wesc.getTags().size(); i++) {
- params.add(size++, wesc.getTags().get(i));
- queryString.append("?").append(size).append(PARAM_SEPARATOR);
- }
- // Remove the trailing PARAM_SEPARATOR
- queryString.delete(queryString.length() - PARAM_SEPARATOR.length(),
- queryString.length());
-
- // Close the brace FOR IN clause and EXIST clause
- queryString.append(" ) )");
- }*/
-
if (wesc.getUser() != null) {
params.add(size++, wesc.getUser().getUserName());
queryString.append(" AND e.creatorUserName = ?").append(size);
@@ -463,8 +443,8 @@ public class JPAWeblogEntryManagerImpl i
queryString.append(" OR e.title LIKE ?").append(size);
queryString.append(") ");
}
-
- if (wesc.getSortBy() != null && wesc.getSortBy().equals("updateTime"))
{
+
+ if (wesc.getSortBy() != null &&
wesc.getSortBy().equals(WeblogEntrySearchCriteria.SortBy.UPDATE_TIME)) {
queryString.append(" ORDER BY e.updateTime ");
} else {
queryString.append(" ORDER BY e.pubTime ");
@@ -570,7 +550,7 @@ public class JPAWeblogEntryManagerImpl i
WeblogEntry entry = this.getWeblogEntry((String)
this.entryAnchorToIdMap.get(mappingKey));
if(entry != null) {
- log.debug("entryAnchorToIdMap CACHE HIT - "+mappingKey);
+ LOG.debug("entryAnchorToIdMap CACHE HIT - " + mappingKey);
return entry;
} else {
// mapping hit with lookup miss? mapping must be old, remove
it
@@ -583,7 +563,7 @@ public class JPAWeblogEntryManagerImpl i
"WeblogEntry.getByWebsite&AnchorOrderByPubTimeDesc");
q.setParameter(1, website);
q.setParameter(2, anchor);
- WeblogEntry entry = null;
+ WeblogEntry entry;
try {
entry = (WeblogEntry)q.getSingleResult();
} catch (NoResultException e) {
@@ -592,7 +572,7 @@ public class JPAWeblogEntryManagerImpl i
// add mapping to cache
if(entry != null) {
- log.debug("entryAnchorToIdMap CACHE MISS - "+mappingKey);
+ LOG.debug("entryAnchorToIdMap CACHE MISS - " + mappingKey);
this.entryAnchorToIdMap.put(mappingKey, entry.getId());
}
return entry;
@@ -697,18 +677,18 @@ public class JPAWeblogEntryManagerImpl i
}
if (status != null) {
- String comparisionOperator;
+ String comparisonOperator;
if("ALL_IGNORE_SPAM".equals(status)) {
// we want all comments, except spam
// so that means where status != SPAM
status = WeblogEntryComment.SPAM;
- comparisionOperator = " <> ";
+ comparisonOperator = " <> ";
} else {
- comparisionOperator = " = ";
+ comparisonOperator = " = ";
}
params.add(size++, status);
appendConjuctionToWhereclause(whereClause, "c.status ")
- .append(comparisionOperator).append('?').append(size);
+ .append(comparisonOperator).append('?').append(size);
}
if(whereClause.length() != 0) {
@@ -855,21 +835,18 @@ public class JPAWeblogEntryManagerImpl i
int length) throws WebloggerException {
Query query;
List queryResults;
- if (endDate == null) {
- endDate = new Date();
- }
-
+
+ Timestamp end = new Timestamp(endDate != null? endDate.getTime() : new
Date().getTime());
+
if (website != null) {
if (startDate != null) {
Timestamp start = new Timestamp(startDate.getTime());
- Timestamp end = new Timestamp(endDate.getTime());
query = strategy.getNamedQuery(
"WeblogEntryComment.getMostCommentedWeblogEntryByWebsite&EndDate&StartDate");
query.setParameter(1, website);
query.setParameter(2, end);
query.setParameter(3, start);
} else {
- Timestamp end = new Timestamp(endDate.getTime());
query = strategy.getNamedQuery(
"WeblogEntryComment.getMostCommentedWeblogEntryByWebsite&EndDate");
query.setParameter(1, website);
@@ -878,13 +855,11 @@ public class JPAWeblogEntryManagerImpl i
} else {
if (startDate != null) {
Timestamp start = new Timestamp(startDate.getTime());
- Timestamp end = new Timestamp(endDate.getTime());
query = strategy.getNamedQuery(
"WeblogEntryComment.getMostCommentedWeblogEntryByEndDate&StartDate");
query.setParameter(1, end);
query.setParameter(2, start);
} else {
- Timestamp end = new Timestamp(endDate.getTime());
query = strategy.getNamedQuery(
"WeblogEntryComment.getMostCommentedWeblogEntryByEndDate");
query.setParameter(1, end);
@@ -952,8 +927,8 @@ public class JPAWeblogEntryManagerImpl i
*/
public void applyCommentDefaultsToEntries(Weblog website)
throws WebloggerException {
- if (log.isDebugEnabled()) {
- log.debug("applyCommentDefaults");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("applyCommentDefaults");
}
// TODO: Non-standard JPA bulk update, using parameter values in set
clause
@@ -1112,9 +1087,8 @@ public class JPAWeblogEntryManagerImpl i
StringBuilder queryString = new StringBuilder();
queryString.append("SELECT DISTINCT w.name ");
queryString.append("FROM WeblogEntryTagAggregate w WHERE w.name IN (");
- //?1) AND w.weblog = ?2");
- //Append tags as parameter markers to avoid potential escaping issues
- //The IN clause would be of form (?1, ?2, ?3, ..)
+ // 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);
final String paramSeparator = ", ";
int i;
@@ -1197,14 +1171,6 @@ public class JPAWeblogEntryManagerImpl i
weblogTagData.setTotal(weblogTagData.getTotal() + amount);
weblogTagData.setLastUsed(lastUsed);
strategy.store(weblogTagData);
- // Why use update query when only one object needs update?
-// Query update = strategy.getNamedUpdate(
-// "WeblogEntryTagAggregate.updateAddToTotalByName&Weblog");
-// update.setParameter(1, new Long(amount));
-// update.setParameter(2, lastUsed);
-// update.setParameter(3, weblogTagData.getName());
-// update.setParameter(4, website);
-// update.executeUpdate();
}
// create it only if we are going to need it.
@@ -1217,12 +1183,6 @@ public class JPAWeblogEntryManagerImpl i
siteTagData.setTotal(siteTagData.getTotal() + amount);
siteTagData.setLastUsed(lastUsed);
strategy.store(siteTagData);
- // Why use update query when only one object needs update?
-// Query update = strategy.getNamedUpdate(
-//
"WeblogEntryTagAggregate.updateAddToTotalByName&WeblogNull");
-// update.setParameter(1, new Long(amount));
-// update.setParameter(2, siteTagData.getName());
-// update.executeUpdate();
}
// delete all bad counts
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataTemplate.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataTemplate.java?rev=1584953&r1=1584952&r2=1584953&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataTemplate.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataTemplate.java
Sat Apr 5 02:49:07 2014
@@ -18,8 +18,7 @@
package org.apache.roller.weblogger.business.themes;
-
-import java.util.Hashtable;
+import java.util.HashMap;
/**
* A parsed 'template' element of a theme metadata descriptor.
@@ -37,8 +36,8 @@ public class ThemeMetadataTemplate {
private String contentsFile = null;
private String type = null;
// Hash table to keep metadata about parsed template code files
- private Hashtable<String, ThemeMetadataTemplateCode> templateCodeTable
- = new Hashtable<String, ThemeMetadataTemplateCode>();
+ private HashMap<String, ThemeMetadataTemplateCode> templateCodeTable
+ = new HashMap<String, ThemeMetadataTemplateCode>();
public String getAction() {
return action;
@@ -128,7 +127,7 @@ public class ThemeMetadataTemplate {
return this.getTemplateCodeTable().get(type);
}
- public Hashtable<String, ThemeMetadataTemplateCode> getTemplateCodeTable()
{
+ public HashMap<String, ThemeMetadataTemplateCode> getTemplateCodeTable() {
return templateCodeTable;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/LdapCommentAuthenticator.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/LdapCommentAuthenticator.java?rev=1584953&r1=1584952&r2=1584953&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/LdapCommentAuthenticator.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/LdapCommentAuthenticator.java
Sat Apr 5 02:49:07 2014
@@ -114,7 +114,7 @@ public class LdapCommentAuthenticator im
if(rollerPropertiesValid && userDataValid){
try {
- Hashtable<String,String> env = new
Hashtable<String,String>();
+ Hashtable<String,String> env = new
Hashtable<String,String>();
env.put(Context.INITIAL_CONTEXT_FACTORY,
"com.sun.jndi.ldap.LdapCtxFactory");
if(ldapSecurityLevel != null
@@ -126,7 +126,7 @@ public class LdapCommentAuthenticator im
env.put(Context.SECURITY_PRINCIPAL,
getQualifedDc(ldapDc, ldapOu, ldapUser));
env.put(Context.SECURITY_CREDENTIALS, ldapPass);
env.put(Context.PROVIDER_URL, "ldap://"; +
ldapHost + ":" + ldapPort);
- context = new InitialLdapContext(env, null);
+ context = new InitialLdapContext(env, null);
validUser = true;
LOG.info("LDAP Authentication Successful. user:
" + ldapUser);
} catch (Exception e) {
