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/24 02:31:53 UTC
svn commit: r1580686 [1/2] - in /roller/trunk/app/src:
main/java/org/apache/roller/planet/business/jpa/
main/java/org/apache/roller/planet/business/updater/
main/java/org/apache/roller/util/
main/java/org/apache/roller/weblogger/business/ main/java/org...
Author: gmazza
Date: Mon Mar 24 01:31:51 2014
New Revision: 1580686
URL: http://svn.apache.org/r1580686
Log:
Reduced Sonar complains regarding end of line comments and use of magic numbers where practical.
Added:
roller/trunk/app/src/main/java/org/apache/roller/util/RollerConstants.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/HitCountQueue.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/ReferrerProcessingJob.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ContinuousWorkerThread.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/Job.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/RollerTask.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/RollerTaskWithLeasing.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ScheduledEntriesTask.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/TaskScheduler.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/TurnoverReferersTask.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/FieldConstants.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileType.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarTag.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/BlacklistCommentValidator.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidationManager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessLinksCommentValidator.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessSizeCommentValidator.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/TrackbackLinkbackCommentValidator.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewThemeImageServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/ModDateHeaderUtil.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SaltCache.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/VelocityRenderer.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileSearchBean.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogExport.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Blacklist.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/BlacklistChecker.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/HTMLSanitizer.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Trackback.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/CachedContent.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheFactoryImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java
Modified: roller/trunk/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java Mon Mar 24 01:31:51 2014
@@ -36,6 +36,7 @@ import org.apache.roller.planet.pojos.Su
import org.apache.roller.planet.pojos.PlanetGroup;
import org.apache.roller.planet.pojos.Subscription;
import org.apache.roller.planet.business.AbstractManagerImpl;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.jpa.JPAPersistenceStrategy;
@@ -275,7 +276,7 @@ public class JPAPlanetManagerImpl extend
long startTime = System.currentTimeMillis();
StringBuilder sb = new StringBuilder();
- List params = new ArrayList();
+ List<Object> params = new ArrayList<Object>();
int size = 0;
sb.append("SELECT e FROM SubscriptionEntry e ");
sb.append("JOIN e.subscription.groups g ");
@@ -308,7 +309,8 @@ public class JPAPlanetManagerImpl extend
long endTime = System.currentTimeMillis();
- log.debug("Generated aggregation of " + ret.size() + " in " + ((endTime-startTime)/1000.0) + " seconds");
+ log.debug("Generated aggregation of " + ret.size() + " in " +
+ ((endTime-startTime) / RollerConstants.SEC_IN_MS) + " seconds");
} catch (Exception e) {
throw new WebloggerException(e);
Modified: roller/trunk/app/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java Mon Mar 24 01:31:51 2014
@@ -29,6 +29,7 @@ import org.apache.roller.planet.business
import org.apache.roller.planet.pojos.PlanetGroup;
import org.apache.roller.planet.pojos.Subscription;
import org.apache.roller.planet.pojos.SubscriptionEntry;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
@@ -40,14 +41,10 @@ public class SingleThreadedFeedUpdater i
private static Log log = LogFactory.getLog(SingleThreadedFeedUpdater.class);
- private static final double MS_TO_SEC_DIVISOR = 1000.0;
-
-
public SingleThreadedFeedUpdater() {
// no-op
}
-
-
+
/**
* @inheritDoc
*/
@@ -123,7 +120,7 @@ public class SingleThreadedFeedUpdater i
long subEndTime = System.currentTimeMillis();
log.debug("updated feed -- "+sub.getFeedURL()+" -- in " +
- ((subEndTime-subStartTime) / MS_TO_SEC_DIVISOR) + " seconds. " + entries +
+ ((subEndTime-subStartTime) / RollerConstants.SEC_IN_MS) + " seconds. " + entries +
" entries updated.");
}
@@ -149,7 +146,7 @@ public class SingleThreadedFeedUpdater i
long endTime = System.currentTimeMillis();
log.info("--- DONE --- Updated subscriptions in "
- + ((endTime-startTime) / MS_TO_SEC_DIVISOR) + " seconds");
+ + ((endTime-startTime) / RollerConstants.SEC_IN_MS) + " seconds");
}
@@ -172,7 +169,7 @@ public class SingleThreadedFeedUpdater i
long endTime = System.currentTimeMillis();
log.info("--- DONE --- Updated subscriptions in "
- + ((endTime-startTime) / MS_TO_SEC_DIVISOR) + " seconds");
+ + ((endTime-startTime) / RollerConstants.SEC_IN_MS) + " seconds");
}
Added: roller/trunk/app/src/main/java/org/apache/roller/util/RollerConstants.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/util/RollerConstants.java?rev=1580686&view=auto
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/util/RollerConstants.java (added)
+++ roller/trunk/app/src/main/java/org/apache/roller/util/RollerConstants.java Mon Mar 24 01:31:51 2014
@@ -0,0 +1,37 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. The ASF licenses this file to You
+* under the Apache License, Version 2.0 (the "License"); you may not
+* use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License. For additional information regarding
+* copyright in this work, please see the NOTICE file in the top level
+* directory of this distribution.
+*/
+package org.apache.roller.util;
+
+public final class RollerConstants {
+
+ public static final int PERCENT_100 = 100;
+
+ public static final int ONE_KB_IN_BYTES = 1024;
+ public static final int FOUR_KB_IN_BYTES = 4096;
+ public static final int EIGHT_KB_IN_BYTES = 8192;
+ public static final int TWENTYFOUR_KB_IN_BYTES = 24576;
+
+ public static final int HALF_SEC_IN_MS = 500;
+ public static final int SEC_IN_MS = 1000;
+ public static final int MIN_IN_MS = 60 * SEC_IN_MS;
+
+ private RollerConstants(){
+ // never instantiable
+ throw new AssertionError();
+ }
+}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManagerImpl.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManagerImpl.java Mon Mar 24 01:31:51 2014
@@ -28,6 +28,7 @@ import java.math.BigDecimal;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.FileContent;
@@ -107,12 +108,12 @@ public class FileContentManagerImpl impl
// create File that we are about to save
File saveFile = new File(dirPath.getAbsolutePath() + File.separator + fileId);
- byte[] buffer = new byte[8192];
+ byte[] buffer = new byte[RollerConstants.EIGHT_KB_IN_BYTES];
int bytesRead;
OutputStream bos = null;
try {
bos = new FileOutputStream(saveFile);
- while ((bytesRead = is.read(buffer, 0, 8192)) != -1) {
+ while ((bytesRead = is.read(buffer, 0, RollerConstants.EIGHT_KB_IN_BYTES)) != -1) {
bos.write(buffer, 0, bytesRead);
}
log.debug("The file has been written to ["+saveFile.getAbsolutePath()+"]");
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/HitCountQueue.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/HitCountQueue.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/HitCountQueue.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/HitCountQueue.java Mon Mar 24 01:31:51 2014
@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.business.runnable.ContinuousWorkerThread;
import org.apache.roller.weblogger.business.runnable.HitCountProcessingJob;
import org.apache.roller.weblogger.business.runnable.WorkerThread;
@@ -61,8 +62,8 @@ public class HitCountQueue {
String sleep = WebloggerConfig.getProperty("hitcount.queue.sleepTime", "180");
try {
- // multiply by 1000 because we expect input in seconds
- sleepTime = Integer.parseInt(sleep) * 1000;
+ // convert input in seconds to ms
+ sleepTime = Integer.parseInt(sleep) * RollerConstants.SEC_IN_MS;
} catch(NumberFormatException nfe) {
log.warn("Invalid sleep time ["+sleep+"], using default");
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java Mon Mar 24 01:31:51 2014
@@ -240,7 +240,9 @@ public class JPAWeblogManagerImpl implem
try {
WeblogEntryTagAggregate agg = (WeblogEntryTagAggregate)query.getSingleResult();
agg.setTotal(agg.getTotal() - stat.getCount());
- } catch (NoResultException ignored) {} // no agg to be updated
+ } catch (NoResultException ignored) {
+ // nothing to update
+ }
}
}
@@ -292,10 +294,10 @@ public class JPAWeblogManagerImpl implem
continue;
}
WeblogCategory c = new WeblogCategory(
- newWeblog, // newWeblog
- splitcats[i], // name
- null, // description
- null ); // image
+ newWeblog,
+ splitcats[i],
+ null,
+ null );
if (firstCat == null) {
firstCat = c;
}
@@ -321,12 +323,12 @@ public class JPAWeblogManagerImpl implem
String[] rollitems = splitroll[i].split("\\|");
if (rollitems != null && rollitems.length > 1) {
WeblogBookmark b = new WeblogBookmark(
- defaultFolder, // parent
- rollitems[0], // name
- "", // description
- rollitems[1].trim(), // url
- null, // feedurl
- null); // image
+ defaultFolder,
+ rollitems[0],
+ "",
+ rollitems[1].trim(),
+ null,
+ null);
this.strategy.store(b);
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java Mon Mar 24 01:31:51 2014
@@ -49,8 +49,8 @@ public class PingQueueTask extends Rolle
// interval at which the task is run, default is 5 minutes
private int interval = 5;
- // lease time given to task lock, default is 30 minutes
- private int leaseTime = 30;
+ // lease time given to task lock
+ private int leaseTime = RollerTaskWithLeasing.DEFAULT_LEASE_MINS;
public String getClientId() {
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java Mon Mar 24 01:31:51 2014
@@ -106,20 +106,21 @@ public class BookmarkPlugin implements W
StringBuffer textBuf = new StringBuffer(workingText.length());
int inLink = 0;
while (m.find()) {
+ // if m.group(1) is null, self-closed anchor tag <a ... /> so ignore
if (m.group(1) != null) {
- // self-closed anchor tag <a ... /> -- ignore
- } else if (m.group(2) != null) {
- // matched opening anchor tag <a ...>
- inLink++;
- } else if (m.group(3) != null) {
- // closing anchor tag </a>, but ignore nonmatching ones
- if (inLink > 0) {
- inLink--;
- }
- } else if (m.group(4) != null) {
- // matched the bookmark -- replace, but only if not within a link tag.
- if (inLink == 0) {
- m.appendReplacement(textBuf, bookmarkLink);
+ if (m.group(2) != null) {
+ // matched opening anchor tag <a ...>
+ inLink++;
+ } else if (m.group(3) != null) {
+ // closing anchor tag </a>, but ignore nonmatching ones
+ if (inLink > 0) {
+ inLink--;
+ }
+ } else if (m.group(4) != null) {
+ // matched the bookmark -- replace, but only if not within a link tag.
+ if (inLink == 0) {
+ m.appendReplacement(textBuf, bookmarkLink);
+ }
}
}
// Any remaining case indicates a bug. One could add an else with assertion here. Conservatively don't substitute.
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/ReferrerProcessingJob.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/ReferrerProcessingJob.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/ReferrerProcessingJob.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/ReferrerProcessingJob.java Mon Mar 24 01:31:51 2014
@@ -40,7 +40,7 @@ public class ReferrerProcessingJob imple
private static Log mLogger = LogFactory.getLog(ReferrerProcessingJob.class);
- Map inputs = null;
+ Map<String, Object> inputs = null;
IncomingReferrer referrer = null;
public ReferrerProcessingJob() {}
@@ -79,7 +79,7 @@ public class ReferrerProcessingJob imple
/**
* Set input.
*/
- public void input(Map input) {
+ public void input(Map<String, Object> input) {
this.inputs = input;
// we are looking for the "referrer" key
@@ -94,7 +94,7 @@ public class ReferrerProcessingJob imple
/**
* Get output.
*/
- public Map output() {
+ public Map<String, Object> output() {
return null;
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java Mon Mar 24 01:31:51 2014
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.List;
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.business.Weblogger;
import org.apache.roller.weblogger.business.runnable.ContinuousWorkerThread;
@@ -60,37 +61,32 @@ public class ReferrerQueueManagerImpl im
private final Weblogger roller;
private boolean asyncMode = false;
- private int numWorkers = 1;
- private int sleepTime = 10000;
private List<WorkerThread> workers = null;
- private List referrerQueue = null;
+ private List<IncomingReferrer> referrerQueue = null;
private int referrerCount = 0;
private int maxAsyncQueueSize = 0;
// private because we are a singleton
@com.google.inject.Inject
protected ReferrerQueueManagerImpl(Weblogger roller) {
-
mLogger.info("Instantiating Referrer Queue Manager");
-
this.roller = roller;
+ int sleepTime = 10000;
+ int numWorkers = 1;
// lookup config options
this.asyncMode = WebloggerConfig.getBooleanProperty("referrers.asyncProcessing.enabled");
-
mLogger.info("Asynchronous referrer processing = "+this.asyncMode);
-
+
if(this.asyncMode) {
-
-
String num = WebloggerConfig.getProperty("referrers.queue.numWorkers");
String sleep = WebloggerConfig.getProperty("referrers.queue.sleepTime");
try {
- this.numWorkers = Integer.parseInt(num);
+ numWorkers = Integer.parseInt(num);
- if(numWorkers < 1) {
- this.numWorkers = 1;
+ if (numWorkers < 1) {
+ numWorkers = 1;
}
} catch(NumberFormatException nfe) {
@@ -99,21 +95,21 @@ public class ReferrerQueueManagerImpl im
try {
// multiply by 1000 because we expect input in seconds
- this.sleepTime = Integer.parseInt(sleep) * 1000;
+ sleepTime = Integer.parseInt(sleep) * RollerConstants.SEC_IN_MS;
} catch(NumberFormatException nfe) {
mLogger.warn("Invalid sleep time ["+sleep+"], using default");
}
// create the processing queue
- this.referrerQueue = Collections.synchronizedList(new ArrayList());
+ this.referrerQueue = Collections.synchronizedList(new ArrayList<IncomingReferrer>());
// start up workers
- this.workers = new ArrayList();
- ContinuousWorkerThread worker = null;
- QueuedReferrerProcessingJob job = null;
- for(int i=0; i < this.numWorkers; i++) {
+ this.workers = new ArrayList<WorkerThread>();
+ ContinuousWorkerThread worker;
+ QueuedReferrerProcessingJob job;
+ for(int i = 0; i < numWorkers; i++) {
job = new QueuedReferrerProcessingJob();
- worker = new ContinuousWorkerThread("ReferrerWorker"+i, job, this.sleepTime);
+ worker = new ContinuousWorkerThread("ReferrerWorker" + i, job, sleepTime);
workers.add(worker);
worker.start();
}
@@ -141,7 +137,7 @@ public class ReferrerQueueManagerImpl im
ReferrerProcessingJob job = new ReferrerProcessingJob();
// setup input
- HashMap inputs = new HashMap();
+ HashMap<String, Object> inputs = new HashMap<String, Object>();
inputs.put("referrer", referrer);
job.input(inputs);
@@ -181,7 +177,7 @@ public class ReferrerQueueManagerImpl im
public synchronized IncomingReferrer dequeue() {
if(!this.referrerQueue.isEmpty()) {
- return (IncomingReferrer) this.referrerQueue.remove(0);
+ return this.referrerQueue.remove(0);
}
return null;
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ContinuousWorkerThread.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ContinuousWorkerThread.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ContinuousWorkerThread.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ContinuousWorkerThread.java Mon Mar 24 01:31:51 2014
@@ -26,37 +26,28 @@ import org.apache.commons.logging.LogFac
* A worker that performs a given job continuously.
*/
public class ContinuousWorkerThread extends WorkerThread {
-
private static Log mLogger = LogFactory.getLog(ContinuousWorkerThread.class);
-
- // default sleep time is 10 seconds
- long sleepTime = 10000;
-
-
+ private static final int DEFAULT_SLEEP_IN_MS = 10000;
+ long sleepTime = DEFAULT_SLEEP_IN_MS;
+
public ContinuousWorkerThread(String id) {
super(id);
}
-
-
+
public ContinuousWorkerThread(String id, long sleep) {
super(id);
-
this.sleepTime = sleep;
}
-
-
+
public ContinuousWorkerThread(String id, Job job) {
super(id, job);
}
-
-
+
public ContinuousWorkerThread(String id, Job job, long sleep) {
super(id, job);
-
this.sleepTime = sleep;
}
-
-
+
/**
* Thread execution.
*
@@ -77,10 +68,10 @@ public class ContinuousWorkerThread exte
// job is done, lets sleep it off for a bit
try {
- mLogger.debug(this.id+" SLEEPING for "+this.sleepTime+" milliseconds ...");
+ mLogger.debug(this.id + " SLEEPING for " + this.sleepTime + " milliseconds ...");
this.sleep(this.sleepTime);
} catch (InterruptedException e) {
- mLogger.info(this.id+" INTERRUPT: "+e.getMessage());
+ mLogger.info(this.id + " INTERRUPT: " + e.getMessage());
break;
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java Mon Mar 24 01:31:51 2014
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
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.business.HitCountQueue;
import org.apache.roller.weblogger.business.WebloggerFactory;
@@ -93,7 +94,7 @@ public class HitCountProcessingJob imple
long endTime = System.currentTimeMillis();
- log.debug("Completed: "+ (endTime-startTime)/1000 + " secs");
+ log.debug("Completed: "+ (endTime-startTime)/ RollerConstants.SEC_IN_MS + " secs");
} catch (WebloggerException ex) {
log.error("Error persisting updated hit counts", ex);
@@ -104,11 +105,11 @@ public class HitCountProcessingJob imple
}
- public void input(Map input) {
+ public void input(Map<String, Object> input) {
// no-op
}
- public Map output() {
+ public Map<String, Object> output() {
return null;
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/Job.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/Job.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/Job.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/Job.java Mon Mar 24 01:31:51 2014
@@ -23,6 +23,7 @@
package org.apache.roller.weblogger.business.runnable;
+import java.util.List;
import java.util.Map;
/**
@@ -41,12 +42,12 @@ public interface Job {
/**
* Pass in input to be used for the job.
*/
- void input(Map input);
+ void input(Map<String, Object> input);
/**
* Get any output from the job.
*/
- Map output();
+ Map<String, Object> output();
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java Mon Mar 24 01:31:51 2014
@@ -44,10 +44,10 @@ public class ResetHitCountsTask extends
private String startTimeDesc = "startOfDay";
// interval at which the task is run, default is 1 day
- private int interval = 1440;
+ private int interval = RollerTask.DEFAULT_INTERVAL_MINS;
// lease time given to task lock, default is 30 minutes
- private int leaseTime = 30;
+ private int leaseTime = RollerTaskWithLeasing.DEFAULT_LEASE_MINS;
public String getClientId() {
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/RollerTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/RollerTask.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/RollerTask.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/RollerTask.java Mon Mar 24 01:31:51 2014
@@ -34,6 +34,7 @@ import org.apache.roller.util.DateUtil;
*/
public abstract class RollerTask implements Runnable {
private String taskName = null;
+ protected static final int DEFAULT_INTERVAL_MINS = 1440;
/**
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/RollerTaskWithLeasing.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/RollerTaskWithLeasing.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/RollerTaskWithLeasing.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/RollerTaskWithLeasing.java Mon Mar 24 01:31:51 2014
@@ -30,7 +30,7 @@ import org.apache.roller.weblogger.busin
*/
public abstract class RollerTaskWithLeasing extends RollerTask {
private static Log log = LogFactory.getLog(RollerTaskWithLeasing.class);
-
+ protected static final int DEFAULT_LEASE_MINS = 30;
/**
* Run the task.
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ScheduledEntriesTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ScheduledEntriesTask.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ScheduledEntriesTask.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ScheduledEntriesTask.java Mon Mar 24 01:31:51 2014
@@ -52,7 +52,7 @@ public class ScheduledEntriesTask extend
private int interval = 1;
// lease time given to task lock, default is 30 minutes
- private int leaseTime = 30;
+ private int leaseTime = RollerTaskWithLeasing.DEFAULT_LEASE_MINS;
public String getClientId() {
@@ -144,7 +144,7 @@ public class ScheduledEntriesTask extend
null, // startDate
now, // endDate
null, // catName
- null,WeblogEntry.SCHEDULED, // status
+ null,WeblogEntry.SCHEDULED,
null, // text
null, // sortBy
null, // sortOrder
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/TaskScheduler.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/TaskScheduler.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/TaskScheduler.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/TaskScheduler.java Mon Mar 24 01:31:51 2014
@@ -26,6 +26,7 @@ import java.util.concurrent.Executors;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.util.DateUtil;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.TaskLock;
@@ -45,9 +46,6 @@ import org.apache.roller.weblogger.pojos
public class TaskScheduler implements Runnable {
private static Log log = LogFactory.getLog(TaskScheduler.class);
-
- private static final long ONE_MINUTE_MS = (60 * 1000);
-
private final ExecutorService pool;
private final List<RollerTask> tasks;
@@ -151,14 +149,14 @@ public class TaskScheduler implements Ru
// if we missed the last scheduled run time then see when the
// most appropriate next run time should be and wait 'til then
boolean needToWait = false;
- if(currentTime.getTime() > (nextRunTime.getTime() + ONE_MINUTE_MS)) {
+ if(currentTime.getTime() > (nextRunTime.getTime() + RollerConstants.MIN_IN_MS)) {
log.debug("MISSED last run, checking if waiting is necessary");
if("startOfDay".equals(task.getStartTimeDesc())) {
// for daily tasks we only run during the first
// couple minutes of the day
Date startOfDay = DateUtil.getStartOfDay(currentTime);
- if(currentTime.getTime() > startOfDay.getTime() + (2 * ONE_MINUTE_MS)) {
+ if(currentTime.getTime() > startOfDay.getTime() + (2 * RollerConstants.MIN_IN_MS)) {
needToWait = true;
log.debug("WAITING for next reasonable run time");
}
@@ -166,7 +164,7 @@ public class TaskScheduler implements Ru
// for hourly tasks we only run during the first
// couple minutes of the hour
Date startOfHour = DateUtil.getStartOfHour(currentTime);
- if(currentTime.getTime() > startOfHour.getTime() + (2 * ONE_MINUTE_MS)) {
+ if(currentTime.getTime() > startOfHour.getTime() + (2 * RollerConstants.MIN_IN_MS)) {
needToWait = true;
log.debug("WAITING for next reasonable run time");
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java Mon Mar 24 01:31:51 2014
@@ -27,6 +27,7 @@ import java.util.concurrent.Future;
import org.apache.commons.lang3.StringUtils;
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.business.InitializationException;
import org.apache.roller.weblogger.config.WebloggerConfig;
@@ -106,7 +107,7 @@ public abstract class ThreadManagerImpl
TaskScheduler scheduler = new TaskScheduler(webloggerTasks);
// start scheduler thread, but only if it's not already running
- if (schedulerThread == null && scheduler != null) {
+ if (schedulerThread == null) {
LOG.debug("Starting scheduler thread");
schedulerThread = new Thread(scheduler, "Roller Weblogger Task Scheduler");
// set thread priority between MAX and NORM so we get slightly preferential treatment
@@ -118,7 +119,7 @@ public abstract class ThreadManagerImpl
public void executeInBackground(Runnable runnable)
throws InterruptedException {
- Future task = serviceScheduler.submit(runnable);
+ serviceScheduler.submit(runnable);
}
@@ -130,7 +131,7 @@ public abstract class ThreadManagerImpl
// thread, here we can add a little code here to loop until it realizes
// the task is done
while(!task.isDone()) {
- Thread.sleep(500);
+ Thread.sleep(RollerConstants.HALF_SEC_IN_MS);
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/TurnoverReferersTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/TurnoverReferersTask.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/TurnoverReferersTask.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/TurnoverReferersTask.java Mon Mar 24 01:31:51 2014
@@ -43,10 +43,10 @@ public class TurnoverReferersTask extend
private String startTimeDesc = "startOfDay";
// interval at which the task is run, default is 1 day
- private int interval = 1440;
+ private int interval = RollerTask.DEFAULT_INTERVAL_MINS;
// lease time given to task lock, default is 30 minutes
- private int leaseTime = 30;
+ private int leaseTime = RollerTaskWithLeasing.DEFAULT_LEASE_MINS;
public String getClientId() {
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/FieldConstants.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/FieldConstants.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/FieldConstants.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/FieldConstants.java Mon Mar 24 01:31:51 2014
@@ -43,9 +43,8 @@ public final class FieldConstants {
public static final String C_EMAIL = "email";
public static final String C_NAME = "name";
public static final String CONSTANT = "constant";
- public static final String CONSTANT_V = "v"; // must be lowercase, or match
- // the transform rules of
- // the analyzer
+ // CONSTANT_V must be lowercase or match transform rules of analyzer
+ public static final String CONSTANT_V = "v";
public static final String WEBSITE_HANDLE = "handle";
public static final String LOCALE = "locale";
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java Mon Mar 24 01:31:51 2014
@@ -26,6 +26,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.WeblogEntryManager;
import org.apache.roller.weblogger.business.Weblogger;
@@ -115,11 +116,11 @@ public class RebuildWebsiteIndexOperatio
// Add Doc
WeblogEntryManager weblogManager = roller
.getWeblogEntryManager();
- List<WeblogEntry> entries = weblogManager.getWeblogEntries(website, // website
+ List<WeblogEntry> entries = weblogManager.getWeblogEntries(website,
null, null, // startDate
null, // endDate
null, // catName
- null, WeblogEntry.PUBLISHED, // status
+ null, WeblogEntry.PUBLISHED,
null, // text
null, // sortby (null means pubTime)
null, null, 0, -1); // offset, length, locale
@@ -130,8 +131,7 @@ public class RebuildWebsiteIndexOperatio
writer.addDocument(getDocument(entry));
mLogger.debug(MessageFormat.format(
"Indexed entry {0}: {1}",
- new Object[] { entry.getPubTime(),
- entry.getAnchor() }));
+ entry.getPubTime(), entry.getAnchor()));
}
// release the database connection
@@ -147,7 +147,7 @@ public class RebuildWebsiteIndexOperatio
}
Date end = new Date();
- double length = (end.getTime() - start.getTime()) / (double) 1000;
+ double length = (end.getTime() - start.getTime()) / (double) RollerConstants.SEC_IN_MS;
if (website == null) {
mLogger.info("Completed rebuilding index for all users in '"
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java Mon Mar 24 01:31:51 2014
@@ -25,6 +25,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.search.FieldConstants;
@@ -105,7 +106,7 @@ public class RemoveWebsiteIndexOperation
}
Date end = new Date();
- double length = (end.getTime() - start.getTime()) / (double) 1000;
+ double length = (end.getTime() - start.getTime()) / (double) RollerConstants.SEC_IN_MS;
if (website != null) {
mLogger.info("Completed deleting indices for website '"
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java Mon Mar 24 01:31:51 2014
@@ -76,8 +76,6 @@ public class SearchOperation extends Rea
private String locale;
private String parseError;
- private int docLimit = 500;
-
// ~ Constructors
// ===========================================================
@@ -103,8 +101,8 @@ public class SearchOperation extends Rea
* @see java.lang.Runnable#run()
*/
public void doRun() {
+ final int docLimit = 500;
searchresults = null;
-
searcher = null;
try {
@@ -211,7 +209,7 @@ public class SearchOperation extends Rea
/**
* Gets the parses the error.
- *
+ *
* @return the parses the error
*/
public String getParseError() {
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java Mon Mar 24 01:31:51 2014
@@ -122,13 +122,13 @@ public class WebloggerRomeFeedFetcher ex
// grab recent entries for this weblog
WeblogEntryManager wmgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
List<WeblogEntry> entries = wmgr.getWeblogEntries(
- localWeblog, // weblog
+ localWeblog,
null, // user
null, // startDate
null, // endDate
null, // catName
null, // tags
- WeblogEntry.PUBLISHED, // status
+ WeblogEntry.PUBLISHED,
null, // text
null, // sortby (null means pubTime)
null, // sortOrder
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java Mon Mar 24 01:31:51 2014
@@ -35,6 +35,7 @@ import org.apache.roller.weblogger.Weblo
import org.apache.roller.weblogger.business.GuiceWebloggerProvider;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.WebloggerProvider;
+import org.apache.roller.weblogger.business.runnable.RollerTask;
import org.apache.roller.weblogger.business.runnable.RollerTaskWithLeasing;
import org.apache.roller.weblogger.business.startup.WebloggerStartup;
import org.apache.roller.weblogger.config.WebloggerConfig;
@@ -59,10 +60,10 @@ public class SyncWebsitesTask extends Ro
private String startTimeDesc = "startOfDay";
// interval at which the task is run, default is 1 day
- private int interval = 1440;
+ private int interval = RollerTask.DEFAULT_INTERVAL_MINS;
// lease time given to ping task lock, default is 30 minutes
- private int leaseTime = 30;
+ private int leaseTime = RollerTaskWithLeasing.DEFAULT_LEASE_MINS;
public String getClientId() {
return clientId;
@@ -247,7 +248,7 @@ public class SyncWebsitesTask extends Ro
WebloggerFactory.bootstrap(provider);
SyncWebsitesTask task = new SyncWebsitesTask();
- task.init(); // use default name
+ task.init();
task.run();
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileType.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileType.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileType.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileType.java Mon Mar 24 01:31:51 2014
@@ -24,10 +24,11 @@ package org.apache.roller.weblogger.pojo
*/
public enum MediaFileType {
- AUDIO("audio", "Audio", "audio/"), // audio files
- VIDEO("video", "Video", "video/"), // video files
- IMAGE("image", "Image", "image/"), // image files
- OTHERS("default", "Others", null); // all other types
+ // Audio, video, image, other files
+ AUDIO("audio", "Audio", "audio/"),
+ VIDEO("video", "Video", "video/"),
+ IMAGE("image", "Image", "image/"),
+ OTHERS("default", "Others", null);
// Content type prefix used by files of this type
String contentTypePrefix;
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java Mon Mar 24 01:31:51 2014
@@ -852,10 +852,10 @@ public class Weblog implements Serializa
null, // weblog entry
null, // search String
null, // startDate
- null,WeblogEntryComment.APPROVED, // approved comments only
+ null,WeblogEntryComment.APPROVED,
true, // we want reverse chrono order
0, // offset
- length); // length
+ length);
} catch (WebloggerException e) {
log.error("ERROR: getting recent comments", e);
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java Mon Mar 24 01:31:51 2014
@@ -522,7 +522,7 @@ public class WeblogEntry implements Seri
this.locale = locale;
}
- public Set<WeblogEntryTag> getTags()
+ public Set<WeblogEntryTag> getTags()
{
return tagSet;
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java Mon Mar 24 01:31:51 2014
@@ -55,12 +55,11 @@ public class BigWeblogCalendarModel exte
try {
WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
monthMap = mgr.getWeblogEntryObjectMap(
-
- weblog, // website
- startDate, // startDate
- endDate, // endDate
- catName, // cat
- null,WeblogEntry.PUBLISHED, // status
+ weblog,
+ startDate,
+ endDate,
+ catName,
+ null,WeblogEntry.PUBLISHED,
locale,
0, -1);
} catch (WebloggerException e) {
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarTag.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarTag.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarTag.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarTag.java Mon Mar 24 01:31:51 2014
@@ -113,12 +113,17 @@ public class CalendarTag extends TagSupp
try {
// build week day names
this.buildDayNames();
-
- Date day=null; // day to be displayed
- Calendar dayCal; // set to day to be displayed
- Calendar cal; // for iterating through days of month
- Calendar todayCal; // for iterating through days of month
- CalendarModel model; // the calendar model
+
+ // day to be displayed
+ Date day;
+ // set to day to be displayed
+ Calendar dayCal;
+ // for iterating through days of month
+ Calendar cal;
+ // for iterating through days of month
+ Calendar todayCal;
+ // the calendar model
+ CalendarModel model;
// ---------------------------------
// --- initialize date variables ---
@@ -208,12 +213,12 @@ public class CalendarTag extends TagSupp
Date tddate = cal.getTime();
String url = model.computeUrl(tddate, false, false);
String content = model.getContent( tddate );
-
- if // day is in calendar month
- ((cal.get(Calendar.MONTH) == dayCal.get(Calendar.MONTH))
+
+ // day is in calendar month
+ if ((cal.get(Calendar.MONTH) == dayCal.get(Calendar.MONTH))
&& (cal.get(Calendar.YEAR) == dayCal.get(Calendar.YEAR))) {
- if // day is today then use today style
- (( cal.get(Calendar.DAY_OF_MONTH)
+ // day is today then use today style
+ if (( cal.get(Calendar.DAY_OF_MONTH)
== todayCal.get(Calendar.DAY_OF_MONTH))
&& ( cal.get(Calendar.MONTH)
== todayCal.get(Calendar.MONTH))
@@ -223,8 +228,8 @@ public class CalendarTag extends TagSupp
} else {
printDayInThisMonth(pw, cal, url, content);
}
- } else // apply day-not-in-month style ;-)
- {
+ } else {
+ // apply day-not-in-month style ;-)
printDayNotInMonth(pw, cal);
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java Mon Mar 24 01:31:51 2014
@@ -106,17 +106,17 @@ public class WeblogCalendarModel impleme
WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
List prevEntries = mgr.getWeblogEntries(
- weblog, // website
+ weblog,
null, // user
null, // startDate
// since we need an entry.pubTime<startDate, but the method use <=
new Date(startDate.getTime()-1), // endDate
cat, // cat
- null,WeblogEntry.PUBLISHED, // status
+ null,WeblogEntry.PUBLISHED,
null, // text
null, // sortby (null means pubTime)
- WeblogEntryManager.DESCENDING, // sortorder, null means DESCENDING
- locale, // locale
+ WeblogEntryManager.DESCENDING,
+ locale,
0, 1); // offset, range
if (prevEntries.size() > 0) {
WeblogEntry prevEntry = (WeblogEntry)prevEntries.get(0);
@@ -133,7 +133,7 @@ public class WeblogCalendarModel impleme
WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
List nextEntries = mgr.getWeblogEntries(
- weblog, // website
+ weblog,
null, // user
// since we need an entry.pubTime>endDate, but the method use >=
new Date(endDate.getTime()+1), // startDate
@@ -168,11 +168,11 @@ public class WeblogCalendarModel impleme
WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
monthMap = mgr.getWeblogEntryStringMap(
- weblog, // website
- startDate, // startDate
- endDate, // endDate
- catName, // cat
- null,WeblogEntry.PUBLISHED, // status
+ weblog,
+ startDate,
+ endDate,
+ catName,
+ null,WeblogEntry.PUBLISHED,
locale,
0, -1);
} catch (WebloggerException e) {
@@ -266,9 +266,8 @@ public class WeblogCalendarModel impleme
return null;
}
else if (dateString == null && !monthURL) {
- dateString = DateUtil.format8chars(day);
dateString = format8chars(day,getCalendar());
- } else if (dateString == null && monthURL) {
+ } else if (dateString == null) {
dateString = format6chars(day,getCalendar());
}
try {
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java Mon Mar 24 01:31:51 2014
@@ -26,6 +26,7 @@ import java.net.URLConnection;
import java.util.ResourceBundle;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
@@ -87,7 +88,7 @@ public class AkismetCommentValidator imp
return 0;
}
else {
- return 100;
+ return RollerConstants.PERCENT_100;
}
} catch (Exception e) {
log.error("ERROR checking comment against Akismet", e);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/BlacklistCommentValidator.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/BlacklistCommentValidator.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/BlacklistCommentValidator.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/BlacklistCommentValidator.java Mon Mar 24 01:31:51 2014
@@ -19,6 +19,8 @@
package org.apache.roller.weblogger.ui.rendering.plugins.comments;
import java.util.ResourceBundle;
+
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.util.RollerMessages;
import org.apache.roller.weblogger.util.BlacklistChecker;
@@ -28,7 +30,6 @@ import org.apache.roller.weblogger.util.
*/
public class BlacklistCommentValidator implements CommentValidator {
private ResourceBundle bundle = ResourceBundle.getBundle("ApplicationResources");
- private BlacklistChecker checker = new BlacklistChecker();
public String getName() {
return bundle.getString("comment.validator.blacklistName");
@@ -39,7 +40,7 @@ public class BlacklistCommentValidator i
messages.addError("comment.validator.blacklistMessage");
return 0;
}
- return 100;
+ return RollerConstants.PERCENT_100;
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidationManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidationManager.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidationManager.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/CommentValidationManager.java Mon Mar 24 01:31:51 2014
@@ -20,9 +20,9 @@ package org.apache.roller.weblogger.ui.r
import java.util.ArrayList;
import java.util.List;
-import java.util.ResourceBundle;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.util.RollerMessages;
@@ -32,28 +32,27 @@ import org.apache.roller.weblogger.util.
* Responsible for loading validators and using them to validate comments.
*/
public class CommentValidationManager {
- private static Log log = LogFactory.getLog(CommentValidationManager.class);
- private ResourceBundle bundle = ResourceBundle.getBundle("ApplicationResources");
+ private static Log log = LogFactory.getLog(CommentValidationManager.class);
private List<CommentValidator> validators = new ArrayList<CommentValidator>();
-
+
public CommentValidationManager() {
// instantiate the validators that are configured
try {
String vals = WebloggerConfig.getProperty("comment.validator.classnames");
String[] valsarray = Utilities.stringToStringArray(vals, ",");
- for(int i=0; i < valsarray.length; i++) {
+ for (String arrayVal : valsarray) {
try {
- Class valClass = Class.forName(valsarray[i]);
- CommentValidator val = (CommentValidator)valClass.newInstance();
+ Class valClass = Class.forName(arrayVal);
+ CommentValidator val = (CommentValidator) valClass.newInstance();
validators.add(val);
log.info("Configured CommentValidator: " + val.getName() + " / " + valClass.getName());
} catch (ClassNotFoundException cnfe) {
- log.warn("Error finding comment validator: " + valsarray[i]);
+ log.warn("Error finding comment validator: " + arrayVal);
} catch (InstantiationException ie) {
- log.warn("Error insantiating comment validator: " + valsarray[i]);
+ log.warn("Error insantiating comment validator: " + arrayVal);
} catch (IllegalAccessException iae) {
- log.warn("Error accessing comment validator: " + valsarray[i]);
+ log.warn("Error accessing comment validator: " + arrayVal);
}
}
@@ -71,13 +70,6 @@ public class CommentValidationManager {
}
/**
- * Return total number of validators (for teasting purposes).
- */
- public int getValidatorCount() {
- return validators.size();
- }
-
- /**
* @param comment Comment to be validated
* @param messages Messages object to which errors will be added
* @return Number indicating confidence that comment is valid (100 meaning 100%)
@@ -92,7 +84,7 @@ public class CommentValidationManager {
total = total / validators.size();
} else {
// When no validators: consider all comments valid
- total = 100;
+ total = RollerConstants.PERCENT_100;
}
return total;
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessLinksCommentValidator.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessLinksCommentValidator.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessLinksCommentValidator.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessLinksCommentValidator.java Mon Mar 24 01:31:51 2014
@@ -21,6 +21,8 @@ package org.apache.roller.weblogger.ui.r
import java.util.ResourceBundle;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.util.RollerMessages;
@@ -50,7 +52,7 @@ public class ExcessLinksCommentValidator
return 0;
}
}
- return 100;
+ return RollerConstants.PERCENT_100;
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessSizeCommentValidator.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessSizeCommentValidator.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessSizeCommentValidator.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/ExcessSizeCommentValidator.java Mon Mar 24 01:31:51 2014
@@ -19,6 +19,8 @@
package org.apache.roller.weblogger.ui.rendering.plugins.comments;
import java.util.ResourceBundle;
+
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.util.RollerMessages;
@@ -43,7 +45,7 @@ public class ExcessSizeCommentValidator
messages.addError("comment.validator.excessSizeMessage", Integer.toString(threshold));
return 0;
}
- return 100;
+ return RollerConstants.PERCENT_100;
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/TrackbackLinkbackCommentValidator.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/TrackbackLinkbackCommentValidator.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/TrackbackLinkbackCommentValidator.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/TrackbackLinkbackCommentValidator.java Mon Mar 24 01:31:51 2014
@@ -21,6 +21,8 @@ package org.apache.roller.weblogger.ui.r
import java.io.IOException;
import java.net.MalformedURLException;
import java.util.ResourceBundle;
+
+import org.apache.roller.util.RollerConstants;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
@@ -44,7 +46,7 @@ public class TrackbackLinkbackCommentVal
// linkback validation can be toggled at runtime, so check if it's enabled
// if it's disabled then just return a score of 100
if(!WebloggerRuntimeConfig.getBooleanProperty("site.trackbackVerification.enabled")) {
- return 100;
+ return RollerConstants.PERCENT_100;
}
int ret = 0;
@@ -61,7 +63,7 @@ public class TrackbackLinkbackCommentVal
} catch (IOException ignored2) {}
if (linkback != null && linkback.getExcerpt() != null) {
- ret = 100;
+ ret = RollerConstants.PERCENT_100;
} else {
messages.addError("comment.validator.trackbackLinkbackMessage");
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java Mon Mar 24 01:31:51 2014
@@ -28,6 +28,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.business.WebloggerFactory;
import org.apache.roller.weblogger.business.WeblogEntryManager;
@@ -84,10 +85,10 @@ public class FeedServlet extends HttpSer
log.debug("Entering");
- Weblog weblog = null;
- boolean isSiteWide = false;
+ Weblog weblog;
+ boolean isSiteWide;
- WeblogFeedRequest feedRequest = null;
+ WeblogFeedRequest feedRequest;
try {
// parse the incoming request and extract the relevant data
feedRequest = new WeblogFeedRequest(request);
@@ -146,7 +147,7 @@ public class FeedServlet extends HttpSer
}
// generate cache key
- String cacheKey = null;
+ String cacheKey;
if (isSiteWide) {
cacheKey = siteWideCache.generateKey(feedRequest);
} else {
@@ -154,7 +155,7 @@ public class FeedServlet extends HttpSer
}
// cached content checking
- CachedContent cachedContent = null;
+ CachedContent cachedContent;
if (isSiteWide) {
cachedContent = (CachedContent) siteWideCache.get(cacheKey);
} else {
@@ -214,8 +215,8 @@ public class FeedServlet extends HttpSer
}
// looks like we need to render content
- HashMap model = new HashMap();
- String pageId = null;
+ HashMap<String, Object> model = new HashMap<String, Object>();
+ String pageId;
try {
// determine what template to render with
boolean siteWide = WebloggerRuntimeConfig.isSiteWideWeblog(weblog
@@ -238,7 +239,7 @@ public class FeedServlet extends HttpSer
}
// populate the rendering model
- Map initData = new HashMap();
+ Map<String, Object> initData = new HashMap<String, Object>();
initData.put("parsedRequest", feedRequest);
// define url strategy
@@ -279,7 +280,7 @@ public class FeedServlet extends HttpSer
}
// lookup Renderer we are going to use
- Renderer renderer = null;
+ Renderer renderer;
try {
log.debug("Looking up renderer");
Template template = new StaticTemplate(pageId, "velocity");
@@ -304,8 +305,8 @@ public class FeedServlet extends HttpSer
return;
}
- // render content. use default size of about 24K for a standard page
- CachedContent rendererOutput = new CachedContent(24567);
+ // render content. use default size of 24K for a standard page
+ CachedContent rendererOutput = new CachedContent(RollerConstants.TWENTYFOUR_KB_IN_BYTES);
try {
log.debug("Doing rendering");
renderer.render(model, rendererOutput.getCachedWriter());
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java?rev=1580686&r1=1580685&r2=1580686&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java Mon Mar 24 01:31:51 2014
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRes
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.business.MediaFileManager;
import org.apache.roller.weblogger.business.WebloggerFactory;
@@ -65,9 +66,9 @@ public class MediaResourceServlet extend
MediaFileManager mfMgr = WebloggerFactory.getWeblogger()
.getMediaFileManager();
- Weblog weblog = null;
+ Weblog weblog;
- WeblogMediaResourceRequest resourceRequest = null;
+ WeblogMediaResourceRequest resourceRequest;
try {
// parse the incoming request and extract the relevant data
resourceRequest = new WeblogMediaResourceRequest(request);
@@ -85,9 +86,9 @@ public class MediaResourceServlet extend
return;
}
- long resourceLastMod = 0;
+ long resourceLastMod;
InputStream resourceStream = null;
- MediaFile mediaFile = null;
+ MediaFile mediaFile;
try {
mediaFile = mfMgr.getMediaFile(resourceRequest.getResourceId(),
@@ -132,11 +133,11 @@ public class MediaResourceServlet extend
resourceStream = mediaFile.getInputStream();
}
- OutputStream out = null;
+ OutputStream out;
try {
// ok, lets serve up the file
- byte[] buf = new byte[8192];
- int length = 0;
+ byte[] buf = new byte[RollerConstants.EIGHT_KB_IN_BYTES];
+ int length;
out = response.getOutputStream();
while ((length = resourceStream.read(buf)) > 0) {
out.write(buf, 0, length);