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

remove lazy loading

Browse Source
This commit is contained in:
Jeremie Panzer
2013-03-26 11:36:31 +01:00
parent 8f1061a8b2
commit e5e40dac23
6 changed files with 53 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/commafeed/backend/model/Feed.java
View File

@@ -5,7 +5,6 @@ import java.util.Set;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Temporal;
@@ -27,7 +26,7 @@ public class Feed extends AbstractModel {
@Column(length = 1024)
private String message;
@OneToMany(mappedBy = "feed", fetch = FetchType.EAGER)
@OneToMany(mappedBy = "feed")
private Set<FeedEntry> entries = Sets.newHashSet();
public Feed() {

8
src/main/java/com/commafeed/backend/model/FeedCategory.java
View File

@@ -4,7 +4,6 @@ import java.util.Set;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.Table;
@@ -25,8 +24,8 @@ public class FeedCategory extends AbstractModel {
@ManyToOne
private FeedCategory parent;
@OneToMany(mappedBy = "category", fetch = FetchType.EAGER)
private Set<FeedSubscription> subscriptions = Sets.newHashSet();
@OneToMany(mappedBy = "category")
private Set<FeedSubscription> subscriptions;
public String getName() {
return name;
@@ -53,6 +52,9 @@ public class FeedCategory extends AbstractModel {
}
public Set<FeedSubscription> getSubscriptions() {
if (subscriptions == null) {
return Sets.newHashSet();
}
return subscriptions;
}

3
src/main/java/com/commafeed/backend/model/FeedEntry.java
View File

@@ -4,6 +4,7 @@ import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
@@ -18,7 +19,7 @@ public class FeedEntry extends AbstractModel {
@Column(length = 2048)
private String guid;
@ManyToOne
@ManyToOne(fetch = FetchType.EAGER)
private Feed feed;
@Column(length = 2048)

5
src/main/java/com/commafeed/backend/model/FeedSubscription.java
View File

@@ -2,6 +2,7 @@ package com.commafeed.backend.model;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
@@ -10,10 +11,10 @@ import javax.persistence.Table;
@SuppressWarnings("serial")
public class FeedSubscription extends AbstractModel {
@ManyToOne
@ManyToOne(fetch = FetchType.EAGER)
private User user;
@ManyToOne
@ManyToOne(fetch = FetchType.EAGER)
private Feed feed;
@Column(length = 128)

14
src/main/java/com/commafeed/frontend/rest/JSONMessageBodyReaderWriter.java
View File

@@ -1,5 +1,7 @@
package com.commafeed.frontend.rest;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -66,7 +68,9 @@ public class JSONMessageBodyReaderWriter implements MessageBodyWriter<Object>,
WebApplicationException {
httpHeaders.putSingle(HttpHeaders.CONTENT_TYPE, mediaType.toString()
+ ";charset=UTF-8");
OutputStreamWriter writer = new OutputStreamWriter(entityStream, UTF_8);
OutputStreamWriter writer = new OutputStreamWriter(
new BufferedOutputStream(entityStream), UTF_8);
try {
Type jsonType;
if (type.equals(genericType)) {
@@ -85,8 +89,8 @@ public class JSONMessageBodyReaderWriter implements MessageBodyWriter<Object>,
Annotation[] annotations, MediaType mediaType,
MultivaluedMap<String, String> httpHeaders, InputStream entityStream)
throws IOException, WebApplicationException {
InputStreamReader streamReader = new InputStreamReader(entityStream,
UTF_8);
InputStreamReader reader = new InputStreamReader(
new BufferedInputStream(entityStream), UTF_8);
try {
Type jsonType;
if (type.equals(genericType)) {
@@ -94,9 +98,9 @@ public class JSONMessageBodyReaderWriter implements MessageBodyWriter<Object>,
} else {
jsonType = genericType;
}
return getGson().fromJson(streamReader, jsonType);
return getGson().fromJson(reader, jsonType);
} finally {
streamReader.close();
reader.close();
}
}

68
src/main/java/com/commafeed/frontend/rest/resources/SubscriptionsREST.java
View File

@@ -80,52 +80,50 @@ public class SubscriptionsREST extends AbstractREST {
@GET
public Category getSubscriptions() {
Category root = new Category();
List<FeedCategory> categories = feedCategoryService.findAll(getUser());
addChildren(categories, root);
List<FeedSubscription> subscriptions = feedSubscriptionService
.findAll(getUser());
Category root = buildCategory(null, categories, subscriptions);
root.setId("all");
root.setName("All");
for (FeedSubscription subscription : feedSubscriptionService
.findWithoutCategories(getUser())) {
Subscription sub = new Subscription();
sub.setId(subscription.getId());
sub.setName(subscription.getTitle());
sub.setMessage(subscription.getFeed().getMessage());
int size = feedEntryService.getEntries(subscription.getFeed(),
getUser(), false).size();
sub.setUnread(size);
root.getFeeds().add(sub);
}
return root;
}
private void addChildren(List<FeedCategory> categories, Category current) {
for (FeedCategory category : categories) {
if ((category.getParent() == null && current.getId() == null)
|| (category.getParent() != null && (ObjectUtils.equals(
String.valueOf(category.getParent().getId()),
current.getId())))) {
Category child = new Category();
child.setId(String.valueOf(category.getId()));
child.setName(category.getName());
addChildren(categories, child);
for (FeedSubscription subscription : category
.getSubscriptions()) {
Subscription sub = new Subscription();
sub.setId(subscription.getId());
sub.setName(subscription.getTitle());
sub.setMessage(subscription.getFeed().getMessage());
int size = feedEntryService.getEntries(
subscription.getFeed(), getUser(), false).size();
sub.setUnread(size);
child.getFeeds().add(sub);
}
current.getChildren().add(child);
Category buildCategory(Long id, List<FeedCategory> categories,
List<FeedSubscription> subscriptions) {
Category category = new Category();
category.setId(String.valueOf(id));
for (FeedCategory c : categories) {
if ((id == null && c.getParent() == null)
|| (c.getParent() != null && ObjectUtils.equals(c
.getParent().getId(), id))) {
Category child = buildCategory(c.getId(), categories,
subscriptions);
child.setId(String.valueOf(c.getId()));
child.setName(c.getName());
category.getChildren().add(child);
}
}
for (FeedSubscription subscription : subscriptions) {
if ((id == null && subscription.getCategory() == null)
|| (subscription.getCategory() != null && ObjectUtils
.equals(subscription.getCategory().getId(), id))) {
Subscription sub = new Subscription();
sub.setId(subscription.getId());
sub.setName(subscription.getTitle());
sub.setMessage(subscription.getFeed().getMessage());
int size = feedEntryService.getEntries(subscription.getFeed(),
getUser(), false).size();
sub.setUnread(size);
category.getFeeds().add(sub);
}
}
return category;
}
}