From 5335635d7d677794ed9d78b2711b03f66bcf56e2 Mon Sep 17 00:00:00 2001 From: KKlochko Date: Mon, 6 Nov 2023 21:34:11 +0200 Subject: [PATCH] Migrate the CLI and DB configuration modules. --- .../cli/CLI.java | 43 ++++++++++--------- .../cli/commands/CommandData.java | 2 +- .../cli/commands/CommandEntities.java | 4 +- .../cli/commands/CommandEntity.java | 4 +- .../commands/factories/CommandFactory.java | 14 +++--- .../cli/commands/factories/EntityFactory.java | 10 ++--- .../commands/factories/ReadAllFactory.java | 8 ++-- .../cli/parsers/ArgumentParser.java | 2 +- .../cli/parsers/CommandParser.java | 4 +- .../cli/validators/CommandValidator.java | 2 +- .../InputStringFormatValidator.java | 2 +- .../cli/validators/Validator.java | 2 +- .../config/env/DataBaseEnvConfig.java | 2 +- .../LoadDataBaseConfigFromEnvFile.java | 6 +-- .../config/models/DataBaseConfig.java | 2 +- .../db/factories/DataBaseConnection.java | 4 +- .../factories/DataBaseConnectionFactory.java | 2 +- .../db/repositories/AbstractRepository.java | 12 +++--- 18 files changed, 62 insertions(+), 63 deletions(-) rename src/main/java/space/kklochko/{jdbc_hospital_example => jpa_hospital_example}/cli/CLI.java (76%) rename src/main/java/space/kklochko/{jdbc_hospital_example => jpa_hospital_example}/cli/commands/CommandData.java (79%) rename src/main/java/space/kklochko/{jdbc_hospital_example => jpa_hospital_example}/cli/commands/CommandEntities.java (83%) rename src/main/java/space/kklochko/{jdbc_hospital_example => jpa_hospital_example}/cli/commands/CommandEntity.java (86%) rename src/main/java/space/kklochko/{jdbc_hospital_example => jpa_hospital_example}/cli/commands/factories/CommandFactory.java (85%) rename src/main/java/space/kklochko/{jdbc_hospital_example => jpa_hospital_example}/cli/commands/factories/EntityFactory.java (84%) rename src/main/java/space/kklochko/{jdbc_hospital_example => jpa_hospital_example}/cli/commands/factories/ReadAllFactory.java (61%) rename src/main/java/space/kklochko/{jdbc_hospital_example => jpa_hospital_example}/cli/parsers/ArgumentParser.java (92%) rename src/main/java/space/kklochko/{jdbc_hospital_example => jpa_hospital_example}/cli/parsers/CommandParser.java (79%) rename src/main/java/space/kklochko/{jdbc_hospital_example => jpa_hospital_example}/cli/validators/CommandValidator.java (90%) rename src/main/java/space/kklochko/{jdbc_hospital_example => jpa_hospital_example}/cli/validators/InputStringFormatValidator.java (89%) rename src/main/java/space/kklochko/{jdbc_hospital_example => jpa_hospital_example}/cli/validators/Validator.java (71%) rename src/main/java/space/kklochko/{jdbc_hospital_example => jpa_hospital_example}/config/env/DataBaseEnvConfig.java (94%) rename src/main/java/space/kklochko/{jdbc_hospital_example => jpa_hospital_example}/config/factories/LoadDataBaseConfigFromEnvFile.java (68%) rename src/main/java/space/kklochko/{jdbc_hospital_example => jpa_hospital_example}/config/models/DataBaseConfig.java (81%) rename src/main/java/space/kklochko/{jdbc_hospital_example => jpa_hospital_example}/db/factories/DataBaseConnection.java (78%) rename src/main/java/space/kklochko/{jdbc_hospital_example => jpa_hospital_example}/db/factories/DataBaseConnectionFactory.java (74%) rename src/main/java/space/kklochko/{jdbc_hospital_example => jpa_hospital_example}/db/repositories/AbstractRepository.java (56%) diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/cli/CLI.java b/src/main/java/space/kklochko/jpa_hospital_example/cli/CLI.java similarity index 76% rename from src/main/java/space/kklochko/jdbc_hospital_example/cli/CLI.java rename to src/main/java/space/kklochko/jpa_hospital_example/cli/CLI.java index 3b0f268..59087da 100644 --- a/src/main/java/space/kklochko/jdbc_hospital_example/cli/CLI.java +++ b/src/main/java/space/kklochko/jpa_hospital_example/cli/CLI.java @@ -1,22 +1,23 @@ -package space.kklochko.jdbc_hospital_example.cli; +package space.kklochko.jpa_hospital_example.cli; +import jakarta.persistence.EntityManager; import lombok.Getter; import lombok.NonNull; import lombok.Setter; -import space.kklochko.jdbc_hospital_example.cli.commands.CommandData; -import space.kklochko.jdbc_hospital_example.cli.commands.CommandEntities; -import space.kklochko.jdbc_hospital_example.cli.commands.CommandEntity; -import space.kklochko.jdbc_hospital_example.cli.commands.factories.CommandFactory; -import space.kklochko.jdbc_hospital_example.cli.commands.factories.ReadAllFactory; -import space.kklochko.jdbc_hospital_example.cli.parsers.CommandParser; -import space.kklochko.jdbc_hospital_example.cli.validators.CommandValidator; -import space.kklochko.jdbc_hospital_example.cli.validators.InputStringFormatValidator; -import space.kklochko.jdbc_hospital_example.cli.validators.Validator; -import space.kklochko.jdbc_hospital_example.db.factories.DataBaseConnection; -import space.kklochko.jdbc_hospital_example.db.repositories.AbstractRepository; -import space.kklochko.jdbc_hospital_example.db.repositories.DepartmentRepository; -import space.kklochko.jdbc_hospital_example.db.repositories.IndicatorRepository; -import space.kklochko.jdbc_hospital_example.db.repositories.PatientRepository; +import space.kklochko.jpa_hospital_example.cli.commands.CommandData; +import space.kklochko.jpa_hospital_example.cli.commands.CommandEntities; +import space.kklochko.jpa_hospital_example.cli.commands.CommandEntity; +import space.kklochko.jpa_hospital_example.cli.commands.factories.CommandFactory; +import space.kklochko.jpa_hospital_example.cli.commands.factories.ReadAllFactory; +import space.kklochko.jpa_hospital_example.cli.parsers.CommandParser; +import space.kklochko.jpa_hospital_example.cli.validators.CommandValidator; +import space.kklochko.jpa_hospital_example.cli.validators.InputStringFormatValidator; +import space.kklochko.jpa_hospital_example.cli.validators.Validator; +import space.kklochko.jpa_hospital_example.db.factories.DataBaseConnection; +import space.kklochko.jpa_hospital_example.db.repositories.AbstractRepository; +import space.kklochko.jpa_hospital_example.db.repositories.DepartmentRepository; +import space.kklochko.jpa_hospital_example.db.repositories.IndicatorRepository; +import space.kklochko.jpa_hospital_example.db.repositories.PatientRepository; import java.util.ArrayList; import java.util.Iterator; @@ -58,10 +59,10 @@ public class CLI { "\treadAll indicator()\n" + "\tremove indicator(id='07c6e39e-727a-11ee-8e7b-c0e4349366ab')\n"; - DataBaseConnection dbc; + EntityManager manager; - public CLI(DataBaseConnection dbc) { - this.dbc = dbc; + public CLI(EntityManager manager) { + this.manager = manager; } public void run() { @@ -125,11 +126,11 @@ public class CLI { public AbstractRepository getRepository(@NonNull CommandData commandData) { if(commandData.getDatatype().equals("indicator")) { - return new IndicatorRepository(dbc); + return new IndicatorRepository(manager); }else if(commandData.getDatatype().equals("patient")) { - return new PatientRepository(dbc); + return new PatientRepository(manager); }else { - return new DepartmentRepository(dbc); + return new DepartmentRepository(manager); } } } diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/cli/commands/CommandData.java b/src/main/java/space/kklochko/jpa_hospital_example/cli/commands/CommandData.java similarity index 79% rename from src/main/java/space/kklochko/jdbc_hospital_example/cli/commands/CommandData.java rename to src/main/java/space/kklochko/jpa_hospital_example/cli/commands/CommandData.java index cad524f..9501052 100644 --- a/src/main/java/space/kklochko/jdbc_hospital_example/cli/commands/CommandData.java +++ b/src/main/java/space/kklochko/jpa_hospital_example/cli/commands/CommandData.java @@ -1,4 +1,4 @@ -package space.kklochko.jdbc_hospital_example.cli.commands; +package space.kklochko.jpa_hospital_example.cli.commands; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/cli/commands/CommandEntities.java b/src/main/java/space/kklochko/jpa_hospital_example/cli/commands/CommandEntities.java similarity index 83% rename from src/main/java/space/kklochko/jdbc_hospital_example/cli/commands/CommandEntities.java rename to src/main/java/space/kklochko/jpa_hospital_example/cli/commands/CommandEntities.java index b262f82..ca7055f 100644 --- a/src/main/java/space/kklochko/jdbc_hospital_example/cli/commands/CommandEntities.java +++ b/src/main/java/space/kklochko/jpa_hospital_example/cli/commands/CommandEntities.java @@ -1,8 +1,8 @@ -package space.kklochko.jdbc_hospital_example.cli.commands; +package space.kklochko.jpa_hospital_example.cli.commands; import lombok.AllArgsConstructor; import lombok.Data; -import space.kklochko.jdbc_hospital_example.db.repositories.AbstractRepository; +import space.kklochko.jpa_hospital_example.db.repositories.AbstractRepository; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/cli/commands/CommandEntity.java b/src/main/java/space/kklochko/jpa_hospital_example/cli/commands/CommandEntity.java similarity index 86% rename from src/main/java/space/kklochko/jdbc_hospital_example/cli/commands/CommandEntity.java rename to src/main/java/space/kklochko/jpa_hospital_example/cli/commands/CommandEntity.java index 2689bb7..1fc77ef 100644 --- a/src/main/java/space/kklochko/jdbc_hospital_example/cli/commands/CommandEntity.java +++ b/src/main/java/space/kklochko/jpa_hospital_example/cli/commands/CommandEntity.java @@ -1,7 +1,7 @@ -package space.kklochko.jdbc_hospital_example.cli.commands; +package space.kklochko.jpa_hospital_example.cli.commands; import lombok.Data; -import space.kklochko.jdbc_hospital_example.db.repositories.AbstractRepository; +import space.kklochko.jpa_hospital_example.db.repositories.AbstractRepository; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/cli/commands/factories/CommandFactory.java b/src/main/java/space/kklochko/jpa_hospital_example/cli/commands/factories/CommandFactory.java similarity index 85% rename from src/main/java/space/kklochko/jdbc_hospital_example/cli/commands/factories/CommandFactory.java rename to src/main/java/space/kklochko/jpa_hospital_example/cli/commands/factories/CommandFactory.java index 3a13e55..4a5dbc9 100644 --- a/src/main/java/space/kklochko/jdbc_hospital_example/cli/commands/factories/CommandFactory.java +++ b/src/main/java/space/kklochko/jpa_hospital_example/cli/commands/factories/CommandFactory.java @@ -1,12 +1,12 @@ -package space.kklochko.jdbc_hospital_example.cli.commands.factories; +package space.kklochko.jpa_hospital_example.cli.commands.factories; import lombok.NonNull; -import space.kklochko.jdbc_hospital_example.cli.commands.CommandData; -import space.kklochko.jdbc_hospital_example.cli.commands.CommandEntity; -import space.kklochko.jdbc_hospital_example.db.repositories.AbstractRepository; -import space.kklochko.jdbc_hospital_example.models.Department; -import space.kklochko.jdbc_hospital_example.models.Indicator; -import space.kklochko.jdbc_hospital_example.models.Patient; +import space.kklochko.jpa_hospital_example.cli.commands.CommandData; +import space.kklochko.jpa_hospital_example.cli.commands.CommandEntity; +import space.kklochko.jpa_hospital_example.db.repositories.AbstractRepository; +import space.kklochko.jpa_hospital_example.models.Department; +import space.kklochko.jpa_hospital_example.models.Indicator; +import space.kklochko.jpa_hospital_example.models.Patient; import java.lang.reflect.Method; import java.util.UUID; diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/cli/commands/factories/EntityFactory.java b/src/main/java/space/kklochko/jpa_hospital_example/cli/commands/factories/EntityFactory.java similarity index 84% rename from src/main/java/space/kklochko/jdbc_hospital_example/cli/commands/factories/EntityFactory.java rename to src/main/java/space/kklochko/jpa_hospital_example/cli/commands/factories/EntityFactory.java index 1ca421e..e7b14f3 100644 --- a/src/main/java/space/kklochko/jdbc_hospital_example/cli/commands/factories/EntityFactory.java +++ b/src/main/java/space/kklochko/jpa_hospital_example/cli/commands/factories/EntityFactory.java @@ -1,10 +1,10 @@ -package space.kklochko.jdbc_hospital_example.cli.commands.factories; +package space.kklochko.jpa_hospital_example.cli.commands.factories; import lombok.NonNull; -import space.kklochko.jdbc_hospital_example.cli.commands.CommandData; -import space.kklochko.jdbc_hospital_example.models.Department; -import space.kklochko.jdbc_hospital_example.models.Indicator; -import space.kklochko.jdbc_hospital_example.models.Patient; +import space.kklochko.jpa_hospital_example.cli.commands.CommandData; +import space.kklochko.jpa_hospital_example.models.Department; +import space.kklochko.jpa_hospital_example.models.Indicator; +import space.kklochko.jpa_hospital_example.models.Patient; import java.sql.Timestamp; import java.util.Map; diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/cli/commands/factories/ReadAllFactory.java b/src/main/java/space/kklochko/jpa_hospital_example/cli/commands/factories/ReadAllFactory.java similarity index 61% rename from src/main/java/space/kklochko/jdbc_hospital_example/cli/commands/factories/ReadAllFactory.java rename to src/main/java/space/kklochko/jpa_hospital_example/cli/commands/factories/ReadAllFactory.java index 17cc3ca..4f43ed4 100644 --- a/src/main/java/space/kklochko/jdbc_hospital_example/cli/commands/factories/ReadAllFactory.java +++ b/src/main/java/space/kklochko/jpa_hospital_example/cli/commands/factories/ReadAllFactory.java @@ -1,9 +1,9 @@ -package space.kklochko.jdbc_hospital_example.cli.commands.factories; +package space.kklochko.jpa_hospital_example.cli.commands.factories; import lombok.NonNull; -import space.kklochko.jdbc_hospital_example.cli.commands.CommandData; -import space.kklochko.jdbc_hospital_example.cli.commands.CommandEntities; -import space.kklochko.jdbc_hospital_example.db.repositories.AbstractRepository; +import space.kklochko.jpa_hospital_example.cli.commands.CommandData; +import space.kklochko.jpa_hospital_example.cli.commands.CommandEntities; +import space.kklochko.jpa_hospital_example.db.repositories.AbstractRepository; import java.lang.reflect.Method; diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/cli/parsers/ArgumentParser.java b/src/main/java/space/kklochko/jpa_hospital_example/cli/parsers/ArgumentParser.java similarity index 92% rename from src/main/java/space/kklochko/jdbc_hospital_example/cli/parsers/ArgumentParser.java rename to src/main/java/space/kklochko/jpa_hospital_example/cli/parsers/ArgumentParser.java index 8d3b706..9b03303 100644 --- a/src/main/java/space/kklochko/jdbc_hospital_example/cli/parsers/ArgumentParser.java +++ b/src/main/java/space/kklochko/jpa_hospital_example/cli/parsers/ArgumentParser.java @@ -1,4 +1,4 @@ -package space.kklochko.jdbc_hospital_example.cli.parsers; +package space.kklochko.jpa_hospital_example.cli.parsers; import lombok.NonNull; diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/cli/parsers/CommandParser.java b/src/main/java/space/kklochko/jpa_hospital_example/cli/parsers/CommandParser.java similarity index 79% rename from src/main/java/space/kklochko/jdbc_hospital_example/cli/parsers/CommandParser.java rename to src/main/java/space/kklochko/jpa_hospital_example/cli/parsers/CommandParser.java index 469feb8..8cecf3b 100644 --- a/src/main/java/space/kklochko/jdbc_hospital_example/cli/parsers/CommandParser.java +++ b/src/main/java/space/kklochko/jpa_hospital_example/cli/parsers/CommandParser.java @@ -1,8 +1,8 @@ -package space.kklochko.jdbc_hospital_example.cli.parsers; +package space.kklochko.jpa_hospital_example.cli.parsers; import lombok.NonNull; import lombok.ToString; -import space.kklochko.jdbc_hospital_example.cli.commands.CommandData; +import space.kklochko.jpa_hospital_example.cli.commands.CommandData; @ToString public class CommandParser { diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/cli/validators/CommandValidator.java b/src/main/java/space/kklochko/jpa_hospital_example/cli/validators/CommandValidator.java similarity index 90% rename from src/main/java/space/kklochko/jdbc_hospital_example/cli/validators/CommandValidator.java rename to src/main/java/space/kklochko/jpa_hospital_example/cli/validators/CommandValidator.java index 0e91f4b..ef5fce1 100644 --- a/src/main/java/space/kklochko/jdbc_hospital_example/cli/validators/CommandValidator.java +++ b/src/main/java/space/kklochko/jpa_hospital_example/cli/validators/CommandValidator.java @@ -1,4 +1,4 @@ -package space.kklochko.jdbc_hospital_example.cli.validators; +package space.kklochko.jpa_hospital_example.cli.validators; import java.util.regex.Pattern; diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/cli/validators/InputStringFormatValidator.java b/src/main/java/space/kklochko/jpa_hospital_example/cli/validators/InputStringFormatValidator.java similarity index 89% rename from src/main/java/space/kklochko/jdbc_hospital_example/cli/validators/InputStringFormatValidator.java rename to src/main/java/space/kklochko/jpa_hospital_example/cli/validators/InputStringFormatValidator.java index 75fb052..ca575db 100644 --- a/src/main/java/space/kklochko/jdbc_hospital_example/cli/validators/InputStringFormatValidator.java +++ b/src/main/java/space/kklochko/jpa_hospital_example/cli/validators/InputStringFormatValidator.java @@ -1,4 +1,4 @@ -package space.kklochko.jdbc_hospital_example.cli.validators; +package space.kklochko.jpa_hospital_example.cli.validators; import java.util.regex.Pattern; diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/cli/validators/Validator.java b/src/main/java/space/kklochko/jpa_hospital_example/cli/validators/Validator.java similarity index 71% rename from src/main/java/space/kklochko/jdbc_hospital_example/cli/validators/Validator.java rename to src/main/java/space/kklochko/jpa_hospital_example/cli/validators/Validator.java index 9d01ee2..1577484 100644 --- a/src/main/java/space/kklochko/jdbc_hospital_example/cli/validators/Validator.java +++ b/src/main/java/space/kklochko/jpa_hospital_example/cli/validators/Validator.java @@ -1,4 +1,4 @@ -package space.kklochko.jdbc_hospital_example.cli.validators; +package space.kklochko.jpa_hospital_example.cli.validators; import java.util.regex.Pattern; diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/config/env/DataBaseEnvConfig.java b/src/main/java/space/kklochko/jpa_hospital_example/config/env/DataBaseEnvConfig.java similarity index 94% rename from src/main/java/space/kklochko/jdbc_hospital_example/config/env/DataBaseEnvConfig.java rename to src/main/java/space/kklochko/jpa_hospital_example/config/env/DataBaseEnvConfig.java index b486268..41da7cb 100644 --- a/src/main/java/space/kklochko/jdbc_hospital_example/config/env/DataBaseEnvConfig.java +++ b/src/main/java/space/kklochko/jpa_hospital_example/config/env/DataBaseEnvConfig.java @@ -1,4 +1,4 @@ -package space.kklochko.jdbc_hospital_example.config.env; +package space.kklochko.jpa_hospital_example.config.env; import io.github.cdimascio.dotenv.Dotenv; import lombok.Getter; diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/config/factories/LoadDataBaseConfigFromEnvFile.java b/src/main/java/space/kklochko/jpa_hospital_example/config/factories/LoadDataBaseConfigFromEnvFile.java similarity index 68% rename from src/main/java/space/kklochko/jdbc_hospital_example/config/factories/LoadDataBaseConfigFromEnvFile.java rename to src/main/java/space/kklochko/jpa_hospital_example/config/factories/LoadDataBaseConfigFromEnvFile.java index 3912611..83778b7 100644 --- a/src/main/java/space/kklochko/jdbc_hospital_example/config/factories/LoadDataBaseConfigFromEnvFile.java +++ b/src/main/java/space/kklochko/jpa_hospital_example/config/factories/LoadDataBaseConfigFromEnvFile.java @@ -1,8 +1,8 @@ -package space.kklochko.jdbc_hospital_example.config.factories; +package space.kklochko.jpa_hospital_example.config.factories; import lombok.NonNull; -import space.kklochko.jdbc_hospital_example.config.env.DataBaseEnvConfig; -import space.kklochko.jdbc_hospital_example.config.models.DataBaseConfig; +import space.kklochko.jpa_hospital_example.config.env.DataBaseEnvConfig; +import space.kklochko.jpa_hospital_example.config.models.DataBaseConfig; public class LoadDataBaseConfigFromEnvFile { public DataBaseConfig load(@NonNull String filename) { diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/config/models/DataBaseConfig.java b/src/main/java/space/kklochko/jpa_hospital_example/config/models/DataBaseConfig.java similarity index 81% rename from src/main/java/space/kklochko/jdbc_hospital_example/config/models/DataBaseConfig.java rename to src/main/java/space/kklochko/jpa_hospital_example/config/models/DataBaseConfig.java index 40e889e..a7ae133 100644 --- a/src/main/java/space/kklochko/jdbc_hospital_example/config/models/DataBaseConfig.java +++ b/src/main/java/space/kklochko/jpa_hospital_example/config/models/DataBaseConfig.java @@ -1,4 +1,4 @@ -package space.kklochko.jdbc_hospital_example.config.models; +package space.kklochko.jpa_hospital_example.config.models; import lombok.Data; import java.util.Properties; diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/db/factories/DataBaseConnection.java b/src/main/java/space/kklochko/jpa_hospital_example/db/factories/DataBaseConnection.java similarity index 78% rename from src/main/java/space/kklochko/jdbc_hospital_example/db/factories/DataBaseConnection.java rename to src/main/java/space/kklochko/jpa_hospital_example/db/factories/DataBaseConnection.java index 81bac11..04585d6 100644 --- a/src/main/java/space/kklochko/jdbc_hospital_example/db/factories/DataBaseConnection.java +++ b/src/main/java/space/kklochko/jpa_hospital_example/db/factories/DataBaseConnection.java @@ -1,7 +1,7 @@ -package space.kklochko.jdbc_hospital_example.db.factories; +package space.kklochko.jpa_hospital_example.db.factories; import lombok.Setter; -import space.kklochko.jdbc_hospital_example.config.models.DataBaseConfig; +import space.kklochko.jpa_hospital_example.config.models.DataBaseConfig; import java.sql.Connection; import java.sql.DriverManager; diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/db/factories/DataBaseConnectionFactory.java b/src/main/java/space/kklochko/jpa_hospital_example/db/factories/DataBaseConnectionFactory.java similarity index 74% rename from src/main/java/space/kklochko/jdbc_hospital_example/db/factories/DataBaseConnectionFactory.java rename to src/main/java/space/kklochko/jpa_hospital_example/db/factories/DataBaseConnectionFactory.java index d7013be..1a2f926 100644 --- a/src/main/java/space/kklochko/jdbc_hospital_example/db/factories/DataBaseConnectionFactory.java +++ b/src/main/java/space/kklochko/jpa_hospital_example/db/factories/DataBaseConnectionFactory.java @@ -1,4 +1,4 @@ -package space.kklochko.jdbc_hospital_example.db.factories; +package space.kklochko.jpa_hospital_example.db.factories; import java.sql.Connection; import java.sql.SQLException; diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/db/repositories/AbstractRepository.java b/src/main/java/space/kklochko/jpa_hospital_example/db/repositories/AbstractRepository.java similarity index 56% rename from src/main/java/space/kklochko/jdbc_hospital_example/db/repositories/AbstractRepository.java rename to src/main/java/space/kklochko/jpa_hospital_example/db/repositories/AbstractRepository.java index c4dda4a..f4a4d91 100644 --- a/src/main/java/space/kklochko/jdbc_hospital_example/db/repositories/AbstractRepository.java +++ b/src/main/java/space/kklochko/jpa_hospital_example/db/repositories/AbstractRepository.java @@ -1,21 +1,19 @@ -package space.kklochko.jdbc_hospital_example.db.repositories; +package space.kklochko.jpa_hospital_example.db.repositories; +import jakarta.persistence.EntityManager; import lombok.Setter; -import space.kklochko.jdbc_hospital_example.db.factories.DataBaseConnection; import java.util.ArrayList; import java.util.UUID; @Setter public abstract class AbstractRepository { - DataBaseConnection db; + EntityManager manager; - public AbstractRepository(DataBaseConnection db){ - setDb(db); + public AbstractRepository(EntityManager manager){ + setManager(manager); } - public abstract boolean createTable(); - public abstract boolean create(T object); public abstract T read(UUID id);