TeamPiped-mirror/Piped-Backend
1
0
Fork 0
mirror of https://github.com/TeamPiped/Piped-Backend.git synced 2024-08-14 23:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #238 from TeamPiped/hibernate-update

Browse source 
Update to Hibernate 6
This commit is contained in:
Kavin 2022-06-17 17:06:38 +01:00 committed by GitHub
commit 457a68fa40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 54 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -33,8 +33,8 @@ dependencies {
implementation 'io.activej:activej-launchers-http:5.2' implementation 'io.activej:activej-launchers-http:5.2'
implementation 'org.hsqldb:hsqldb:2.6.1' implementation 'org.hsqldb:hsqldb:2.6.1'
implementation 'org.postgresql:postgresql:42.4.0' implementation 'org.postgresql:postgresql:42.4.0'
implementation 'org.hibernate:hibernate-core:5.6.7.Final' implementation 'org.hibernate:hibernate-core:6.1.0.Final'
implementation 'org.hibernate:hibernate-hikaricp:5.6.7.Final' implementation 'org.hibernate:hibernate-hikaricp:6.1.0.Final'
implementation 'com.zaxxer:HikariCP:5.0.1' implementation 'com.zaxxer:HikariCP:5.0.1'
implementation 'org.springframework.security:spring-security-crypto:5.7.1' implementation 'org.springframework.security:spring-security-crypto:5.7.1'
implementation 'commons-logging:commons-logging:1.2' implementation 'commons-logging:commons-logging:1.2'

40
config.properties
View file

@ -1,37 +1,27 @@
# The port to Listen on. # The port to Listen on.
PORT: 8080 PORT:8080
# The number of workers to use for the server # The number of workers to use for the server
HTTP_WORKERS: 2 HTTP_WORKERS:2
# Proxy # Proxy
PROXY_PART: https://pipedproxy-ams.kavin.rocks PROXY_PART:https://pipedproxy-ams.kavin.rocks
# Outgoing HTTP Proxy - eg: 127.0.0.1:8118 # Outgoing HTTP Proxy - eg: 127.0.0.1:8118
#HTTP_PROXY: 127.0.0.1:8118 #HTTP_PROXY: 127.0.0.1:8118
# Captcha Parameters # Captcha Parameters
CAPTCHA_BASE_URL: https://api.capmonster.cloud/ CAPTCHA_BASE_URL:https://api.capmonster.cloud/
CAPTCHA_API_KEY: INSERT_HERE CAPTCHA_API_KEY:INSERT_HERE
# Public API URL # Public API URL
API_URL: https://pipedapi.kavin.rocks API_URL:https://pipedapi.kavin.rocks
# Public Frontend URL # Public Frontend URL
FRONTEND_URL: https://piped.kavin.rocks FRONTEND_URL:https://piped.kavin.rocks
# Enable haveibeenpwned compromised password API # Enable haveibeenpwned compromised password API
COMPROMISED_PASSWORD_CHECK: true COMPROMISED_PASSWORD_CHECK:true
# Disable Registration # Disable Registration
DISABLE_REGISTRATION: false DISABLE_REGISTRATION:false
# Feed Retention Time in Days # Feed Retention Time in Days
FEED_RETENTION: 30 FEED_RETENTION:30
# Hibernate properties # Hibernate properties
hibernate.connection.url: jdbc:postgresql://postgres:5432/piped hibernate.connection.url:jdbc:postgresql://postgres:5432/piped
hibernate.connection.driver_class: org.postgresql.Driver hibernate.connection.driver_class:org.postgresql.Driver
hibernate.dialect: org.hibernate.dialect.PostgreSQL10Dialect hibernate.dialect:org.hibernate.dialect.PostgreSQLDialect
hibernate.connection.username: piped hibernate.connection.username:piped
hibernate.connection.password: changeme hibernate.connection.password:changeme

4
src/main/java/me/kavin/piped/Main.java
View file

@ -1,6 +1,8 @@
package me.kavin.piped; package me.kavin.piped;
import io.activej.inject.Injector; import io.activej.inject.Injector;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import me.kavin.piped.consts.Constants; import me.kavin.piped.consts.Constants;
import me.kavin.piped.utils.DatabaseSessionFactory; import me.kavin.piped.utils.DatabaseSessionFactory;
import me.kavin.piped.utils.DownloaderImpl; import me.kavin.piped.utils.DownloaderImpl;
@ -16,8 +18,6 @@ import org.schabi.newpipe.extractor.localization.Localization;
import org.schabi.newpipe.extractor.services.youtube.YoutubeThrottlingDecrypter; import org.schabi.newpipe.extractor.services.youtube.YoutubeThrottlingDecrypter;
import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeStreamExtractor; import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeStreamExtractor;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

7
src/main/java/me/kavin/piped/consts/Constants.java
View file

@ -81,6 +81,13 @@ public class Constants {
if (key.startsWith("hibernate")) if (key.startsWith("hibernate"))
hibernateProperties.put(key, value); hibernateProperties.put(key, value);
}); });
// transform hibernate properties for legacy configureations
hibernateProperties.replace("hibernate.dialect",
"org.hibernate.dialect.PostgreSQL10Dialect",
"org.hibernate.dialect.PostgreSQLDialect"
);
OkHttpClient.Builder builder = new OkHttpClient.Builder() OkHttpClient.Builder builder = new OkHttpClient.Builder()
.followRedirects(true) .followRedirects(true)
.addInterceptor(BrotliInterceptor.INSTANCE); .addInterceptor(BrotliInterceptor.INSTANCE);

8
src/main/java/me/kavin/piped/utils/DatabaseHelper.java
View file

@ -1,13 +1,13 @@
package me.kavin.piped.utils; package me.kavin.piped.utils;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.JoinType;
import jakarta.persistence.criteria.Root;
import me.kavin.piped.utils.obj.db.*; import me.kavin.piped.utils.obj.db.*;
import org.hibernate.FlushMode; import org.hibernate.FlushMode;
import org.hibernate.Session; import org.hibernate.Session;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Root;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;

8
src/main/java/me/kavin/piped/utils/ResponseHelper.java
View file

@ -8,6 +8,10 @@ import com.rometools.rome.feed.synd.*;
import com.rometools.rome.io.FeedException; import com.rometools.rome.io.FeedException;
import com.rometools.rome.io.SyndFeedOutput; import com.rometools.rome.io.SyndFeedOutput;
import it.unimi.dsi.fastutil.objects.ObjectArrayList; import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.JoinType;
import jakarta.persistence.criteria.Root;
import me.kavin.piped.consts.Constants; import me.kavin.piped.consts.Constants;
import me.kavin.piped.ipfs.IPFS; import me.kavin.piped.ipfs.IPFS;
import me.kavin.piped.utils.obj.*; import me.kavin.piped.utils.obj.*;
@ -46,10 +50,6 @@ import org.schabi.newpipe.extractor.utils.JsonUtils;
import org.springframework.security.crypto.argon2.Argon2PasswordEncoder; import org.springframework.security.crypto.argon2.Argon2PasswordEncoder;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Root;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

6
src/main/java/me/kavin/piped/utils/obj/db/Channel.java
View file

@ -1,10 +1,6 @@
package me.kavin.piped.utils.obj.db; package me.kavin.piped.utils.obj.db;
import javax.persistence.Column; import jakarta.persistence.*;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Index;
import javax.persistence.Table;
@Entity @Entity
@Table(name = "channels", indexes = {@Index(columnList = "uploader_id", name = "channels_uploader_id_idx")}) @Table(name = "channels", indexes = {@Index(columnList = "uploader_id", name = "channels_uploader_id_idx")})

2
src/main/java/me/kavin/piped/utils/obj/db/Playlist.java
View file

@ -1,8 +1,8 @@
package me.kavin.piped.utils.obj.db; package me.kavin.piped.utils.obj.db;
import it.unimi.dsi.fastutil.objects.ObjectArrayList; import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import jakarta.persistence.*;
import javax.persistence.*;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;

2
src/main/java/me/kavin/piped/utils/obj/db/PlaylistVideo.java
View file

@ -1,6 +1,6 @@
package me.kavin.piped.utils.obj.db; package me.kavin.piped.utils.obj.db;
import javax.persistence.*; import jakarta.persistence.*;
@Entity @Entity
@Table(name = "playlist_videos", indexes = {@Index(columnList = "id", name = "playlist_videos_id_idx"), @Table(name = "playlist_videos", indexes = {@Index(columnList = "id", name = "playlist_videos_id_idx"),

10
src/main/java/me/kavin/piped/utils/obj/db/PubSub.java
View file

@ -1,14 +1,10 @@
package me.kavin.piped.utils.obj.db; package me.kavin.piped.utils.obj.db;
import javax.persistence.Column; import jakarta.persistence.*;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Index;
import javax.persistence.Table;
@Entity @Entity
@Table(name = "pubsub", indexes = { @Index(columnList = "id", name = "pubsub_id_idx"), @Table(name = "pubsub", indexes = {@Index(columnList = "id", name = "pubsub_id_idx"),
@Index(columnList = "subbed_at", name = "pubsub_subbed_at_idx") }) @Index(columnList = "subbed_at", name = "pubsub_subbed_at_idx")})
public class PubSub { public class PubSub {
@Id @Id

3
src/main/java/me/kavin/piped/utils/obj/db/User.java
View file

@ -1,6 +1,7 @@
package me.kavin.piped.utils.obj.db; package me.kavin.piped.utils.obj.db;
import javax.persistence.*; import jakarta.persistence.*;
import java.io.Serializable; import java.io.Serializable;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;

6
src/main/java/me/kavin/piped/utils/obj/db/Video.java
View file

@ -1,11 +1,11 @@
package me.kavin.piped.utils.obj.db; package me.kavin.piped.utils.obj.db;
import javax.persistence.*; import jakarta.persistence.*;
@Entity @Entity
@Table(name = "videos", indexes = { @Index(columnList = "id", name = "videos_id_idx"), @Table(name = "videos", indexes = {@Index(columnList = "id", name = "videos_id_idx"),
@Index(columnList = "uploader_id", name = "video_uploader_id_idx"), @Index(columnList = "uploader_id", name = "video_uploader_id_idx"),
@Index(columnList = "uploaded", name = "video_uploaded_idx") }) @Index(columnList = "uploaded", name = "video_uploaded_idx")})
public class Video { public class Video {
@Id @Id

22
testing/config.cockroachdb.properties
View file

@ -1,18 +1,14 @@
# The port to Listen on. # The port to Listen on.
PORT: 8080 PORT:8080
# Proxy # Proxy
PROXY_PART: https://pipedproxy-ams.kavin.rocks PROXY_PART:https://pipedproxy-ams.kavin.rocks
# Public API URL # Public API URL
API_URL: https://pipedapi.kavin.rocks API_URL:https://pipedapi.kavin.rocks
# Public Frontend URL # Public Frontend URL
FRONTEND_URL: https://piped.kavin.rocks FRONTEND_URL:https://piped.kavin.rocks
# Hibernate properties # Hibernate properties
hibernate.connection.url: jdbc:postgresql://cockroachdb:26257/defaultdb?sslmode=disable hibernate.connection.url:jdbc:postgresql://cockroachdb:26257/defaultdb?sslmode=disable
hibernate.connection.driver_class: org.postgresql.Driver hibernate.connection.driver_class:org.postgresql.Driver
hibernate.dialect: org.hibernate.dialect.CockroachDB201Dialect hibernate.dialect:org.hibernate.dialect.CockroachDialect
hibernate.connection.username: root hibernate.connection.username:root
hibernate.connection.password: root hibernate.connection.password:root