tpeetz/kontor
1
0
Fork 0
Code Issues 6 Pull Requests 2 Actions Packages Projects Releases 2 Wiki Activity

remove SessionFactory and prepare for creating an EntityManagerFactory

Browse Source
This commit is contained in:
Thomas Peetz
2025-12-31 00:11:40 +01:00
parent 15a0c8701c
commit 0accddaad9
15 changed files with 76 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kontor-javalin/build.gradle
+6 -1
View File
@@ -19,13 +19,18 @@ dependencies {
implementation libs.hypersistence
implementation libs.validation.api
annotationProcessor libs.hibernate.jpamodelgen
implementation libs.el
annotationProcessor libs.openapi.annotation
implementation libs.javalin.openapi
implementation libs.javalin.swagger
implementation libs.javalin.redoc
testImplementation(platform(libs.junit.bom))
testImplementation "org.junit.jupiter:junit-jupiter"
}
task fatJar(type: Jar) {
manifest {
attributes 'Main-Class': 'de.thpeetz.kontor.api.Main'
attributes 'Main-Class': 'de.thpeetz.kontor.Main'
}
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
kontor-javalin/gradle/libs.versions.toml
+7
View File
@@ -14,6 +14,8 @@ postgresql = "42.7.3"
hibernate = "7.0.5.Final"
validation = "2.0.1.Final"
hypersistence = "3.14.1"
el = "4.0.1"
openapi = "6.7.0-3"
[libraries]
junit = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
@@ -30,4 +32,9 @@ hibernate = { module = "org.hibernate.orm:hibernate-core", version.ref = "hibern
hibernate-jpamodelgen = { module = "org.hibernate.orm:hibernate-jpamodelgen", version.ref = "hibernate" }
hibernate-validator = { module = "org.hibernate:hibernate-validator", version.ref = "hibernate" }
validation-api = { module = "javax.validation:validation-api", version.ref = "validation" }
el = { module = "org.glassfish:jakarta.el", version.ref = "el" }
hypersistence = { module = "io.hypersistence:hypersistence-utils-hibernate-70", version.ref = "hypersistence" }
javalin-openapi = { module = "io.javalin.community.openapi:javalin-openapi-plugin", version.ref = "openapi" }
javalin-swagger = { module = "io.javalin.community.openapi:javalin-swagger-plugin", version.ref = "openapi" }
javalin-redoc = { module = "io.javalin.community.openapi:javalin-redoc-plugin", version.ref = "openapi" }
openapi-annotation = { module = "io.javalin.community.openapi:openapi-annotation-processor", version.ref = "openapi" }
kontor-javalin/src/main/java/de/thpeetz/kontor/JavalinApp.java
-33
View File
@@ -1,33 +0,0 @@
package de.thpeetz.kontor;
import io.javalin.Javalin;
import static io.javalin.apibuilder.ApiBuilder.get;
import static io.javalin.apibuilder.ApiBuilder.path;
import static io.javalin.apibuilder.ApiBuilder.post;
import java.util.HashMap;
import de.thpeetz.kontor.web.ComicHandler;
import de.thpeetz.kontor.web.MediaFileHandler;
public class JavalinApp {
public static Javalin create() {
return Javalin.create((var config) -> config.router.apiBuilder(() -> {
path("/", () -> get(ctx -> ctx.json("Ok")));
path("health", () -> get(ctx -> {
HashMap<String, String> status = new HashMap<>();
status.put("status", "ok");
ctx.json(status);
}));
path("/api/v1/comics", () -> {
get(ComicHandler.listAll);
});
path("/api/v1/media/files", () -> {
get(MediaFileHandler.listAll);
post(MediaFileHandler.save);
});
}));
}
}
kontor-javalin/src/main/java/de/thpeetz/kontor/Main.java
+39 -1
View File
@@ -1,14 +1,52 @@
package de.thpeetz.kontor;
import java.util.HashMap;
import java.util.LinkedList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import de.thpeetz.kontor.infrastructure.AppHibernateConfig;
import io.javalin.Javalin;
import jakarta.persistence.EntityManager;
public class Main {
private static Logger logger = LoggerFactory.getLogger(Main.class);
private static short port = 8400;
public static void main(String[] args) {
JavalinApp.create().start(port);
Javalin app = Javalin.create(config -> {
config.requestLogger.http((ctx, ms) -> {
var path = ctx.path();
if (!path.equals("/health")) {
logger.info(ctx.path());
}
});
});
app.get("/", ctx -> ctx.json("Ok"));
app.get("/health", ctx -> {
HashMap<String, String> status = new HashMap<>();
status.put("status", "ok");
ctx.json(status);
});
app.get("/api/v1/comics", ctx -> {
var result = new LinkedList<>();
ctx.json(result);
});
app.get("/api/v1/media/files", ctx -> {
var result = new LinkedList<>();
ctx.json(result);
});
app.before(ctx -> {
ctx.attribute("configuration", AppHibernateConfig.configuration());
});
app.after(ctx -> {
EntityManager entityManager = ctx.attribute("entityManager");
if (entityManager != null) {
entityManager.close();
}
});
app.start(port);
logger.info("API's alive for real :-)");
}
kontor-javalin/src/main/java/de/thpeetz/kontor/infrastructure/AppHibernateConfig.java
+2 -2
View File
@@ -22,8 +22,8 @@ import de.thpeetz.kontor.models.media.MediaArticle;
import de.thpeetz.kontor.models.media.MediaFile;
import de.thpeetz.kontor.models.media.MediaVideo;
class AppHibernateConfig {
static Configuration configuration() {
public class AppHibernateConfig {
public static Configuration configuration() {
var configuration = new Configuration();
var settings = new Properties();
settings.put(AvailableSettings.JAKARTA_JDBC_DRIVER, "org.postgresql.Driver");
kontor-javalin/src/main/java/de/thpeetz/kontor/infrastructure/AppHibernateSessionFactory.java
+2 -2
View File
@@ -7,13 +7,13 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
class AppHibernateSessionFactory {
public class AppHibernateSessionFactory {
private static final Logger logger = LoggerFactory.getLogger(AppHibernateSessionFactory.class);
private static SessionFactory sessionFactory;
static SessionFactory getSessionFactory() {
public static SessionFactory getSessionFactory() {
if (Objects.isNull(sessionFactory)) {
try {
var configuration = AppHibernateConfig.configuration();
kontor-javalin/src/main/java/de/thpeetz/kontor/models/comics/Comic.java
+1 -4
View File
@@ -43,16 +43,13 @@ public class Comic {
@Column(unique = true, nullable = false)
private String title;
@Column(nullable = false)
@ManyToOne
@JoinColumn(name = "publisher_id")
@JoinColumn(name = "publisher_id", nullable = false)
@JsonIgnoreProperties({ "comics" })
private Publisher publisher;
@Column
private Boolean currentOrder = false;
@Column
private Boolean completed = false;
@Column(nullable = true)
kontor-javalin/src/main/java/de/thpeetz/kontor/models/comics/ComicWork.java
+3 -6
View File
@@ -29,19 +29,16 @@ public class ComicWork {
@Column(name = "last_modified_date")
private Date lastModifiedDate;
@Column(nullable = false)
@ManyToOne
@JoinColumn(name = "comic_id")
@JoinColumn(name = "comic_id", nullable = false)
private Comic comic;
@Column(nullable = false)
@ManyToOne
@JoinColumn(name = "artist_id")
@JoinColumn(name = "artist_id", nullable = false)
private Artist artist;
@Column(nullable = false)
@ManyToOne
@JoinColumn(name = "workType_id")
@JoinColumn(name = "workType_id", nullable = false)
private Worktype workType;
@Override
kontor-javalin/src/main/java/de/thpeetz/kontor/models/comics/Issue.java
+3 -6
View File
@@ -42,21 +42,18 @@ public class Issue {
@Column(name = "last_modified_date")
private Date lastModifiedDate;
@Column(nullable = false)
@ManyToOne
@JoinColumn(name = "comic_id")
@JoinColumn(name = "comic_id", nullable = false)
@JsonIgnoreProperties({ "issues" })
private Comic comic;
@Column(nullable = true)
@ManyToOne
@JoinColumn(name = "volume_id")
@JoinColumn(name = "volume_id", nullable = true)
@JsonIgnoreProperties({ "issues" })
private Volume volume;
@Column(nullable = true)
@ManyToOne
@JoinColumn(name = "storyArc_id")
@JoinColumn(name = "storyArc_id", nullable = true)
@JsonIgnoreProperties({ "issues" })
private StoryArc storyArc;
kontor-javalin/src/main/java/de/thpeetz/kontor/models/comics/IssueWork.java
+3 -6
View File
@@ -33,19 +33,16 @@ public class IssueWork {
@Column(name = "last_modified_date")
private Date lastModifiedDate;
@Column(nullable = false)
@ManyToOne
@JoinColumn(name = "issue_id")
@JoinColumn(name = "issue_id", nullable = false)
private Issue issue;
@Column(nullable = false)
@ManyToOne
@JoinColumn(name = "artist_id")
@JoinColumn(name = "artist_id", nullable = false)
private Artist artist;
@Column(nullable = false)
@ManyToOne
@JoinColumn(name = "workType_id")
@JoinColumn(name = "workType_id", nullable = false)
private Worktype workType;
@Override
kontor-javalin/src/main/java/de/thpeetz/kontor/models/comics/Publisher.java
+1 -3
View File
@@ -44,13 +44,11 @@ public class Publisher {
@Column(unique = true, nullable = false)
private String name;
@Column
private String weblink;
@Column(nullable = true)
@JsonBackReference
@ManyToOne
@JoinColumn(name = "parent_publisher_id")
@JoinColumn(name = "parent_publisher_id", nullable = true)
@JsonIgnoreProperties({ "comics" })
private Publisher parentCompany;
kontor-javalin/src/main/java/de/thpeetz/kontor/models/comics/StoryArc.java
+2 -4
View File
@@ -43,15 +43,13 @@ public class StoryArc {
@Column(nullable = false)
private String name;
@Column(nullable = false)
@ManyToOne
@JoinColumn(name = "comic_id")
@JoinColumn(name = "comic_id", nullable = false)
@JsonIgnoreProperties({ "storyArcs" })
private Comic comic;
@Column(nullable = true)
@ManyToOne
@JoinColumn(name = "volume_id")
@JoinColumn(name = "volume_id", nullable = true)
@JsonIgnoreProperties({ "storyArcs" })
private Volume volume;
kontor-javalin/src/main/java/de/thpeetz/kontor/models/comics/TradePaperback.java
+3 -3
View File
@@ -36,13 +36,13 @@ public class TradePaperback {
@Column(nullable = false)
private String name;
@Column(nullable = false)
@ManyToOne
@JoinColumn(name = "comic_id")
@JoinColumn(name = "comic_id", nullable = false)
private Comic comic;
@Column
private Integer issueStart;
@Column
private Integer issueEnd;}
private Integer issueEnd;
}
kontor-javalin/src/main/java/de/thpeetz/kontor/models/comics/Volume.java
+2 -3
View File
@@ -43,15 +43,14 @@ public class Volume {
@Column(nullable = false)
private String name;
@Column(nullable = false)
@ManyToOne
@JoinColumn(name = "comic_id")
@JoinColumn(name = "comic_id", nullable = false)
@JsonIgnoreProperties({ "volumes" })
private Comic comic;
@Column(nullable = true)
@OneToMany(fetch = FetchType.EAGER, mappedBy = "volume", cascade = CascadeType.REMOVE, orphanRemoval = true)
private List<StoryArc> storyArcs = new LinkedList<>();
private List<StoryArc> storyArcs = new LinkedList<>();
@Column(nullable = true)
@OneToMany(fetch = FetchType.EAGER, mappedBy = "volume", cascade = CascadeType.REMOVE, orphanRemoval = true)
kontor-javalin/src/main/java/de/thpeetz/kontor/web/MediaFileHandler.java
+2 -3
View File
@@ -1,20 +1,19 @@
package de.thpeetz.kontor.web;
import java.util.LinkedList;
import java.util.List;
import de.thpeetz.kontor.infrastructure.AppHibernate;
import io.javalin.http.Handler;
import io.javalin.http.HttpStatus;
import de.thpeetz.kontor.models.media.MediaFile;
import de.thpeetz.kontor.models.media.MediaFileQueries;
import de.thpeetz.kontor.models.media.MediaFileQueries_;
import de.thpeetz.kontor.web.model.NewMediaFile;
import de.thpeetz.kontor.web.model.ResultMediaFile;
public class MediaFileHandler {
public static Handler listAll = (context) -> {
List<MediaFile> result = AppHibernate.fromTransaction(MediaFileQueries_::getAllMediaFiles);
List<MediaFile> result = new LinkedList<>();
context.json(new ResultMediaFile(result));
};