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

upgrade to dropwizard 4.x

Browse Source
This commit is contained in:
Athou
2023-12-17 14:11:15 +01:00
parent b5d99b9661
commit fd0e5426e5
103 changed files with 502 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
commafeed-server/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java
View File

@@ -4,9 +4,6 @@ import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.hibernate.SessionFactory;
import com.commafeed.backend.model.FeedCategory;
@@ -15,6 +12,9 @@ import com.commafeed.backend.model.QUser;
import com.commafeed.backend.model.User;
import com.querydsl.core.types.Predicate;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
@Singleton
public class FeedCategoryDAO extends GenericDAO<FeedCategory> {

6
commafeed-server/src/main/java/com/commafeed/backend/dao/FeedDAO.java
View File

@@ -3,9 +3,6 @@ package com.commafeed.backend.dao;
import java.util.Date;
import java.util.List;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.SessionFactory;
@@ -17,6 +14,9 @@ import com.google.common.collect.Iterables;
import com.querydsl.jpa.JPAExpressions;
import com.querydsl.jpa.impl.JPAQuery;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
@Singleton
public class FeedDAO extends GenericDAO<Feed> {

6
commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryContentDAO.java
View File

@@ -2,9 +2,6 @@ package com.commafeed.backend.dao;
import java.util.List;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.hibernate.SessionFactory;
import com.commafeed.backend.model.FeedEntryContent;
@@ -13,6 +10,9 @@ import com.commafeed.backend.model.QFeedEntryContent;
import com.querydsl.jpa.JPAExpressions;
import com.querydsl.jpa.JPQLQuery;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
@Singleton
public class FeedEntryContentDAO extends GenericDAO<FeedEntryContent> {

5
commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java
View File

@@ -3,9 +3,6 @@ package com.commafeed.backend.dao;
import java.util.List;
import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.apache.commons.codec.digest.DigestUtils;
import org.hibernate.SessionFactory;
@@ -15,6 +12,8 @@ import com.commafeed.backend.model.QFeedEntry;
import com.querydsl.core.Tuple;
import com.querydsl.core.types.dsl.NumberExpression;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import lombok.AllArgsConstructor;
import lombok.Getter;

6
commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
View File

@@ -5,9 +5,6 @@ import java.util.Comparator;
import java.util.Date;
import java.util.List;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.builder.CompareToBuilder;
import org.hibernate.SessionFactory;
@@ -35,6 +32,9 @@ import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.Tuple;
import com.querydsl.jpa.impl.JPAQuery;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
@Singleton
public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {

6
commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryTagDAO.java
View File

@@ -2,9 +2,6 @@ package com.commafeed.backend.dao;
import java.util.List;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.hibernate.SessionFactory;
import com.commafeed.backend.model.FeedEntry;
@@ -12,6 +9,9 @@ import com.commafeed.backend.model.FeedEntryTag;
import com.commafeed.backend.model.QFeedEntryTag;
import com.commafeed.backend.model.User;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
@Singleton
public class FeedEntryTagDAO extends GenericDAO<FeedEntryTag> {

6
commafeed-server/src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java
View File

@@ -4,9 +4,6 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.hibernate.SessionFactory;
import com.commafeed.backend.model.Feed;
@@ -18,6 +15,9 @@ import com.commafeed.backend.model.User;
import com.google.common.collect.Iterables;
import com.querydsl.jpa.JPQLQuery;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
@Singleton
public class FeedSubscriptionDAO extends GenericDAO<FeedSubscription> {

10
commafeed-server/src/main/java/com/commafeed/backend/dao/GenericDAO.java
View File

@@ -3,7 +3,7 @@ package com.commafeed.backend.dao;
import java.util.Collection;
import org.hibernate.SessionFactory;
import org.hibernate.annotations.QueryHints;
import org.hibernate.jpa.SpecHints;
import com.commafeed.backend.model.AbstractModel;
import com.querydsl.core.types.EntityPath;
@@ -20,7 +20,7 @@ public abstract class GenericDAO<T extends AbstractModel> extends AbstractDAO<T>
protected GenericDAO(SessionFactory sessionFactory) {
super(sessionFactory);
this.factory = new JPAQueryFactory(() -> currentSession());
this.factory = new JPAQueryFactory(this::currentSession);
}
protected JPAQueryFactory query() {
@@ -40,7 +40,7 @@ public abstract class GenericDAO<T extends AbstractModel> extends AbstractDAO<T>
}
public void saveOrUpdate(Collection<T> models) {
models.forEach(m -> persist(m));
models.forEach(this::persist);
}
public void update(T model) {
@@ -53,7 +53,7 @@ public abstract class GenericDAO<T extends AbstractModel> extends AbstractDAO<T>
public void delete(T object) {
if (object != null) {
currentSession().delete(object);
currentSession().remove(object);
}
}
@@ -64,7 +64,7 @@ public abstract class GenericDAO<T extends AbstractModel> extends AbstractDAO<T>
protected void setTimeout(JPAQuery<?> query, int timeoutMs) {
if (timeoutMs > 0) {
query.setHint(QueryHints.TIMEOUT_JPA, timeoutMs);
query.setHint(SpecHints.HINT_SPEC_QUERY_TIMEOUT, timeoutMs);
}
}

5
commafeed-server/src/main/java/com/commafeed/backend/dao/UnitOfWork.java
View File

@@ -1,13 +1,12 @@
package com.commafeed.backend.dao;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.Transaction;
import org.hibernate.context.internal.ManagedSessionContext;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor(onConstructor = @__({ @Inject }))

8
commafeed-server/src/main/java/com/commafeed/backend/dao/UserDAO.java
View File

@@ -1,13 +1,13 @@
package com.commafeed.backend.dao;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.hibernate.SessionFactory;
import com.commafeed.backend.model.QUser;
import com.commafeed.backend.model.User;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
@Singleton
public class UserDAO extends GenericDAO<User> {
@@ -31,6 +31,6 @@ public class UserDAO extends GenericDAO<User> {
}
public long count() {
return query().selectFrom(user).fetchCount();
return query().select(user.count()).from(user).fetchOne();
}
}

6
commafeed-server/src/main/java/com/commafeed/backend/dao/UserRoleDAO.java
View File

@@ -4,9 +4,6 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.hibernate.SessionFactory;
import com.commafeed.backend.model.QUserRole;
@@ -14,6 +11,9 @@ import com.commafeed.backend.model.User;
import com.commafeed.backend.model.UserRole;
import com.commafeed.backend.model.UserRole.Role;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
@Singleton
public class UserRoleDAO extends GenericDAO<UserRole> {

6
commafeed-server/src/main/java/com/commafeed/backend/dao/UserSettingsDAO.java
View File

@@ -1,14 +1,14 @@
package com.commafeed.backend.dao;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.hibernate.SessionFactory;
import com.commafeed.backend.model.QUserSettings;
import com.commafeed.backend.model.User;
import com.commafeed.backend.model.UserSettings;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
@Singleton
public class UserSettingsDAO extends GenericDAO<UserSettings> {