Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

use date constructor directly when a calendar is not needed, better performances

Browse Source
This commit is contained in:
Athou
2013-06-25 16:57:48 +02:00
parent 11fe2b6590
commit 158abadf19
18 changed files with 29 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/commafeed/backend/StartupBean.java
View File

@@ -3,7 +3,6 @@ package com.commafeed.backend;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ExecutorService;
@@ -76,7 +75,7 @@ public class StartupBean {
@PostConstruct
private void init() {
startupTime = Calendar.getInstance().getTimeInMillis();
startupTime = System.currentTimeMillis();
databaseUpdater.update();
if (userDAO.getCount() == 0) {

3
src/main/java/com/commafeed/backend/dao/FeedDAO.java
View File

@@ -1,6 +1,5 @@
package com.commafeed.backend.dao;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -27,7 +26,7 @@ import com.google.common.collect.Lists;
public class FeedDAO extends GenericDAO<Feed> {
private List<Predicate> getUpdatablePredicates(Root<Feed> root) {
Date now = Calendar.getInstance().getTime();
Date now = new Date();
Predicate hasSubscriptions = builder.isNotEmpty(root
.get(Feed_.subscriptions));

5
src/main/java/com/commafeed/backend/feeds/FeedParser.java
View File

@@ -2,7 +2,6 @@ package com.commafeed.backend.feeds;
import java.io.StringReader;
import java.text.DateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -53,7 +52,7 @@ public class FeedParser {
FetchedFeed fetchedFeed = new FetchedFeed();
Feed feed = fetchedFeed.getFeed();
List<FeedEntry> entries = fetchedFeed.getEntries();
feed.setLastUpdated(Calendar.getInstance().getTime());
feed.setLastUpdated(new Date());
try {
String encoding = FeedUtils.guessEncoding(xml);
@@ -186,7 +185,7 @@ public class FeedParser {
}
private Date validateDate(Date date) {
Date now = Calendar.getInstance().getTime();
Date now = new Date();
if (date == null) {
return now;
}

5
src/main/java/com/commafeed/backend/feeds/FeedRefreshTaskGiver.java
View File

@@ -1,6 +1,5 @@
package com.commafeed.backend.feeds;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -44,7 +43,7 @@ public class FeedRefreshTaskGiver {
}
public void add(Feed feed) {
Date now = Calendar.getInstance().getTime();
Date now = new Date();
boolean heavyLoad = applicationSettingsService.get().isHeavyLoad();
Date threshold = DateUtils.addMinutes(now, heavyLoad ? -10 : -1);
if (feed.getLastUpdated() == null
@@ -68,7 +67,7 @@ public class FeedRefreshTaskGiver {
}
private void refill() {
Date now = Calendar.getInstance().getTime();
Date now = new Date();
int count = 3 * backgroundThreads;
List<Feed> feeds = feedDAO.findNextUpdatable(count);

3
src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java
View File

@@ -1,6 +1,5 @@
package com.commafeed.backend.feeds;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.List;
@@ -187,7 +186,7 @@ public class FeedRefreshUpdater {
private void handlePubSub(final Feed feed) {
if (feed.getPushHub() != null && feed.getPushTopic() != null) {
Date lastPing = feed.getPushLastPing();
Date now = Calendar.getInstance().getTime();
Date now = new Date();
if (lastPing == null || lastPing.before(DateUtils.addDays(now, -3))) {
new Thread() {
@Override

3
src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java
View File

@@ -1,6 +1,5 @@
package com.commafeed.backend.feeds;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -80,7 +79,7 @@ public class FeedRefreshWorker {
}
private void update(Feed feed) {
Date now = Calendar.getInstance().getTime();
Date now = new Date();
try {
FetchedFeed fetchedFeed = fetcher.fetch(feed.getUrl(), false,
feed.getLastModifiedHeader(), feed.getEtagHeader(),

5
src/main/java/com/commafeed/backend/feeds/FeedUtils.java
View File

@@ -3,7 +3,6 @@ package com.commafeed.backend.feeds;
import java.io.IOException;
import java.io.StringReader;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
@@ -274,7 +273,7 @@ public class FeedUtils {
*
*/
public static Date buildDisabledUntil(int errorCount) {
Date now = Calendar.getInstance().getTime();
Date now = new Date();
int retriesBeforeDisable = 3;
if (errorCount >= retriesBeforeDisable) {
@@ -290,7 +289,7 @@ public class FeedUtils {
*/
public static Date buildDisabledUntil(Date publishedDate,
Long averageEntryInterval) {
Date now = Calendar.getInstance().getTime();
Date now = new Date();
if (publishedDate == null) {
// feed with no entries, recheck in 24 hours

4
src/main/java/com/commafeed/backend/feeds/OPMLExporter.java
View File

@@ -1,6 +1,6 @@
package com.commafeed.backend.feeds;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import javax.ejb.Stateless;
@@ -30,7 +30,7 @@ public class OPMLExporter {
opml.setFeedType("opml_1.1");
opml.setTitle(String.format("%s subscriptions in CommaFeed",
user.getName()));
opml.setCreated(Calendar.getInstance().getTime());
opml.setCreated(new Date());
List<FeedCategory> categories = feedCategoryDAO.findAll(user);
List<FeedSubscription> subscriptions = feedSubscriptionDAO

4
src/main/java/com/commafeed/backend/services/FeedUpdateService.java
View File

@@ -1,6 +1,6 @@
package com.commafeed.backend.services;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import javax.ejb.Stateless;
@@ -48,7 +48,7 @@ public class FeedUpdateService {
content.setContent(FeedUtils.handleContent(content.getContent(),
feed.getLink(), false));
entry.setInserted(Calendar.getInstance().getTime());
entry.setInserted(new Date());
entry.getFeeds().add(feed);
update = entry;

6
src/main/java/com/commafeed/backend/services/UserService.java
View File

@@ -1,7 +1,7 @@
package com.commafeed.backend.services;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.UUID;
import javax.ejb.Stateless;
@@ -50,7 +50,7 @@ public class UserService {
boolean authenticated = encryptionService.authenticate(password,
user.getPassword(), user.getSalt());
if (authenticated) {
user.setLastLogin(Calendar.getInstance().getTime());
user.setLastLogin(new Date());
userDAO.saveOrUpdate(user);
return user;
}
@@ -98,7 +98,7 @@ public class UserService {
byte[] salt = encryptionService.generateSalt();
user.setName(name);
user.setEmail(email);
user.setCreated(Calendar.getInstance().getTime());
user.setCreated(new Date());
user.setSalt(salt);
user.setPassword(encryptionService.getEncryptedPassword(password, salt));
for (Role role : roles) {

3
src/main/java/com/commafeed/frontend/model/Subscription.java
View File

@@ -1,7 +1,6 @@
package com.commafeed.frontend.model;
import java.io.Serializable;
import java.util.Calendar;
import java.util.Date;
import javax.xml.bind.annotation.XmlAccessType;
@@ -23,7 +22,7 @@ public class Subscription implements Serializable {
public static Subscription build(FeedSubscription subscription,
String publicUrl, long unreadCount) {
Date now = Calendar.getInstance().getTime();
Date now = new Date();
FeedCategory category = subscription.getCategory();
Feed feed = subscription.getFeed();
Subscription sub = new Subscription();

4
src/main/java/com/commafeed/frontend/pages/PasswordRecoveryCallbackPage.java
View File

@@ -1,6 +1,6 @@
package com.commafeed.frontend.pages;
import java.util.Calendar;
import java.util.Date;
import javax.inject.Inject;
@@ -45,7 +45,7 @@ public class PasswordRecoveryCallbackPage extends BasePage {
throw new DisplayException("invalid token");
}
if (user.getRecoverPasswordTokenDate().before(
DateUtils.addDays(Calendar.getInstance().getTime(), -2))) {
DateUtils.addDays(new Date(), -2))) {
throw new DisplayException("token expired");
}

5
src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.java
View File

@@ -1,6 +1,6 @@
package com.commafeed.frontend.pages;
import java.util.Calendar;
import java.util.Date;
import java.util.UUID;
import org.apache.commons.codec.digest.DigestUtils;
@@ -39,8 +39,7 @@ public class PasswordRecoveryPage extends BasePage {
try {
user.setRecoverPasswordToken(DigestUtils.sha1Hex(UUID
.randomUUID().toString()));
user.setRecoverPasswordTokenDate(Calendar.getInstance()
.getTime());
user.setRecoverPasswordTokenDate(new Date());
userDAO.saveOrUpdate(user);
mailService.sendMail(user, "Password recovery",
buildEmailContent(user));

4
src/main/java/com/commafeed/frontend/pages/TestRssPage.java
View File

@@ -1,7 +1,7 @@
package com.commafeed.frontend.pages;
import java.io.StringWriter;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Random;
import java.util.UUID;
@@ -34,7 +34,7 @@ public class TestRssPage extends WebPage {
entry.setUri(uuid);
entry.setTitle(uuid);
entry.setLink("http://www.example.com/" + uuid);
entry.setPublishedDate(Calendar.getInstance().getTime());
entry.setPublishedDate(new Date());
entries.add(entry);
}
feed.setEntries(entries);

4
src/main/java/com/commafeed/frontend/resources/TimestampProcessor.java
View File

@@ -3,7 +3,6 @@ package com.commafeed.frontend.resources;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
import java.util.Calendar;
import org.apache.commons.io.IOUtils;
@@ -15,8 +14,7 @@ import ro.isdc.wro.model.resource.processor.ResourcePreProcessor;
@SupportedResourceType(ResourceType.JS)
public class TimestampProcessor implements ResourcePreProcessor {
private static final String NOW = ""
+ Calendar.getInstance().getTimeInMillis();
private static final String NOW = "" + System.currentTimeMillis();
@Override
public void process(Resource resource, Reader reader, Writer writer)

3
src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java
View File

@@ -1,7 +1,6 @@
package com.commafeed.frontend.rest.resources;
import java.io.StringWriter;
import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@@ -144,7 +143,7 @@ public class CategoryREST extends AbstractResourceREST {
entries.getEntries().remove(entries.getEntries().size() - 1);
}
entries.setTimestamp(Calendar.getInstance().getTimeInMillis());
entries.setTimestamp(System.currentTimeMillis());
return Response.ok(entries).build();
}

2
src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
View File

@@ -124,7 +124,7 @@ public class FeedREST extends AbstractResourceREST {
}
}
entries.setTimestamp(Calendar.getInstance().getTimeInMillis());
entries.setTimestamp(System.currentTimeMillis());
return Response.ok(entries).build();
}

4
src/main/java/com/commafeed/frontend/rest/resources/PubSubHubbubCallbackREST.java
View File

@@ -1,6 +1,6 @@
package com.commafeed.frontend.rest.resources;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import javax.inject.Inject;
@@ -65,7 +65,7 @@ public class PubSubHubbubCallbackREST {
for (Feed feed : feeds) {
log.debug("activated push notifications for {}",
feed.getPushTopic());
feed.setPushLastPing(Calendar.getInstance().getTime());
feed.setPushLastPing(new Date());
}
feedDAO.saveOrUpdate(feeds);
return Response.ok(challenge).build();