kirillius-home
/
x-control-panel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Переименовал package, порефакторил юзеров

This commit is contained in:
kirillius 2025-12-26 06:12:03 +03:00
parent e29286cce3
commit 8e2412f36a
46 changed files with 212 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/ru/kirillius/XCP/api/Commons/Config.java → api/src/main/java/ru/kirillius/XCP/Commons/Config.java
View File

@ -1,4 +1,4 @@
package ru.kirillius.XCP.api.Commons;
package ru.kirillius.XCP.Commons;
import java.io.File;

2
api/src/main/java/ru/kirillius/XCP/api/Commons/ConfigManager.java → api/src/main/java/ru/kirillius/XCP/Commons/ConfigManager.java
View File

@ -1,4 +1,4 @@
package ru.kirillius.XCP.api.Commons;
package ru.kirillius.XCP.Commons;
import java.io.IOException;

6
api/src/main/java/ru/kirillius/XCP/api/Commons/Context.java → api/src/main/java/ru/kirillius/XCP/Commons/Context.java
View File

@ -1,4 +1,6 @@
package ru.kirillius.XCP.api.Commons;
package ru.kirillius.XCP.Commons;
import ru.kirillius.XCP.Security.HashUtility;
public interface Context {
Config getConfig();
@ -8,4 +10,6 @@ public interface Context {
<S extends Service> S getService(Class<S> serviceClass);
void shutdown();
HashUtility getHashUtility();
}

2
api/src/main/java/ru/kirillius/XCP/api/Commons/ResourceHandler.java → api/src/main/java/ru/kirillius/XCP/Commons/ResourceHandler.java
View File

@ -1,4 +1,4 @@
package ru.kirillius.XCP.api.Commons;
package ru.kirillius.XCP.Commons;
import java.io.Closeable;

2
api/src/main/java/ru/kirillius/XCP/api/Commons/Service.java → api/src/main/java/ru/kirillius/XCP/Commons/Service.java
View File

@ -1,4 +1,4 @@
package ru.kirillius.XCP.api.Commons;
package ru.kirillius.XCP.Commons;
import java.io.Closeable;

2
api/src/main/java/ru/kirillius/XCP/api/Commons/StreamHandler.java → api/src/main/java/ru/kirillius/XCP/Commons/StreamHandler.java
View File

@ -1,4 +1,4 @@
package ru.kirillius.XCP.api.Commons;
package ru.kirillius.XCP.Commons;
import java.util.stream.Stream;

2
api/src/main/java/ru/kirillius/XCP/api/Data/DataTransferProtocol.java → api/src/main/java/ru/kirillius/XCP/Data/DataTransferProtocol.java
View File

@ -1,4 +1,4 @@
package ru.kirillius.XCP.api.Data;
package ru.kirillius.XCP.Data;
@Deprecated
public interface DataTransferProtocol {

2
api/src/main/java/ru/kirillius/XCP/api/Data/PollSettings.java → api/src/main/java/ru/kirillius/XCP/Data/PollSettings.java
View File

@ -1,4 +1,4 @@
package ru.kirillius.XCP.api.Data;
package ru.kirillius.XCP.Data;
public interface PollSettings {
int getMaxValueCount();

2
api/src/main/java/ru/kirillius/XCP/api/Data/ValueModifier.java → api/src/main/java/ru/kirillius/XCP/Data/ValueModifier.java
View File

@ -1,4 +1,4 @@
package ru.kirillius.XCP.api.Data;
package ru.kirillius.XCP.Data;
@Deprecated
public interface ValueModifier {

2
api/src/main/java/ru/kirillius/XCP/api/Data/ValueModifierSettings.java → api/src/main/java/ru/kirillius/XCP/Data/ValueModifierSettings.java
View File

@ -1,4 +1,4 @@
package ru.kirillius.XCP.api.Data;
package ru.kirillius.XCP.Data;
import tools.jackson.databind.node.ObjectNode;

8
api/src/main/java/ru/kirillius/XCP/Persistence/Entities/Group.java Normal file
View File

@ -0,0 +1,8 @@
package ru.kirillius.XCP.Persistence.Entities;
import ru.kirillius.XCP.Persistence.NodeEntity;
public interface Group extends NodeEntity {
String getIcon();
void setIcon(String icon);
}

13
api/src/main/java/ru/kirillius/XCP/Persistence/Entities/Input.java Normal file
View File

@ -0,0 +1,13 @@
package ru.kirillius.XCP.Persistence.Entities;
import ru.kirillius.XCP.Data.PollSettings;
import ru.kirillius.XCP.Persistence.IOEntity;
import ru.kirillius.XCP.Persistence.NodeEntity;
public interface Input extends IOEntity, NodeEntity {
PollSettings getPollSettings();
void setPollSettings(PollSettings pollSettings);
}

7
api/src/main/java/ru/kirillius/XCP/Persistence/Entities/Output.java Normal file
View File

@ -0,0 +1,7 @@
package ru.kirillius.XCP.Persistence.Entities;
import ru.kirillius.XCP.Persistence.IOEntity;
import ru.kirillius.XCP.Persistence.NodeEntity;
public interface Output extends IOEntity, NodeEntity {
}

10
api/src/main/java/ru/kirillius/XCP/api/Persistence/Entities/User.java → api/src/main/java/ru/kirillius/XCP/Persistence/Entities/User.java
View File

@ -1,11 +1,13 @@
package ru.kirillius.XCP.api.Persistence.Entities;
package ru.kirillius.XCP.Persistence.Entities;
import ru.kirillius.XCP.api.Persistence.PersistenceEntity;
import ru.kirillius.XCP.api.Security.UserRole;
import ru.kirillius.XCP.Persistence.PersistenceEntity;
import ru.kirillius.XCP.Security.UserRole;
import tools.jackson.databind.node.ObjectNode;
public interface User extends PersistenceEntity {
void changePassword(String newPass);
void setPassword(String password);
boolean verifyPassword(String password);
String getLogin();

6
api/src/main/java/ru/kirillius/XCP/api/Persistence/IOEntity.java → api/src/main/java/ru/kirillius/XCP/Persistence/IOEntity.java
View File

@ -1,7 +1,7 @@
package ru.kirillius.XCP.api.Persistence;
package ru.kirillius.XCP.Persistence;
import ru.kirillius.XCP.api.Data.DataTransferProtocol;
import ru.kirillius.XCP.api.Data.ValueModifierSettings;
import ru.kirillius.XCP.Data.DataTransferProtocol;
import ru.kirillius.XCP.Data.ValueModifierSettings;
import java.util.List;

4
api/src/main/java/ru/kirillius/XCP/api/Persistence/NodeEntity.java → api/src/main/java/ru/kirillius/XCP/Persistence/NodeEntity.java
View File

@ -1,6 +1,6 @@
package ru.kirillius.XCP.api.Persistence;
package ru.kirillius.XCP.Persistence;
import ru.kirillius.XCP.api.Persistence.Entities.Group;
import ru.kirillius.XCP.Persistence.Entities.Group;
import tools.jackson.databind.node.ObjectNode;
import java.util.Set;

6
api/src/main/java/ru/kirillius/XCP/api/Persistence/NodeRepository.java → api/src/main/java/ru/kirillius/XCP/Persistence/NodeRepository.java
View File

@ -1,7 +1,7 @@
package ru.kirillius.XCP.api.Persistence;
package ru.kirillius.XCP.Persistence;
import ru.kirillius.XCP.api.Commons.StreamHandler;
import ru.kirillius.XCP.api.Persistence.Entities.Group;
import ru.kirillius.XCP.Commons.StreamHandler;
import ru.kirillius.XCP.Persistence.Entities.Group;
import java.util.Collection;

2
api/src/main/java/ru/kirillius/XCP/api/Persistence/PersistenceEntity.java → api/src/main/java/ru/kirillius/XCP/Persistence/PersistenceEntity.java
View File

@ -1,4 +1,4 @@
package ru.kirillius.XCP.api.Persistence;
package ru.kirillius.XCP.Persistence;
import java.util.UUID;

14
api/src/main/java/ru/kirillius/XCP/Persistence/Repositories/GroupRepository.java Normal file
View File

@ -0,0 +1,14 @@
package ru.kirillius.XCP.Persistence.Repositories;
import ru.kirillius.XCP.Commons.StreamHandler;
import ru.kirillius.XCP.Persistence.Entities.Group;
import ru.kirillius.XCP.Persistence.Entities.Input;
import ru.kirillius.XCP.Persistence.NodeRepository;
public interface GroupRepository extends NodeRepository<Input> {
StreamHandler<Group> getChildrenOf(Group dataGroup);
StreamHandler<Group> getChildrenRecursiveOf(Group dataGroup);
Group getRoot();
}

8
api/src/main/java/ru/kirillius/XCP/Persistence/Repositories/InputRepository.java Normal file
View File

@ -0,0 +1,8 @@
package ru.kirillius.XCP.Persistence.Repositories;
import ru.kirillius.XCP.Persistence.Entities.Input;
import ru.kirillius.XCP.Persistence.NodeRepository;
public interface InputRepository extends NodeRepository<Input> {
}

8
api/src/main/java/ru/kirillius/XCP/Persistence/Repositories/OutputRepository.java Normal file
View File

@ -0,0 +1,8 @@
package ru.kirillius.XCP.Persistence.Repositories;
import ru.kirillius.XCP.Persistence.Entities.Input;
import ru.kirillius.XCP.Persistence.NodeRepository;
public interface OutputRepository extends NodeRepository<Input> {
}

9
api/src/main/java/ru/kirillius/XCP/Persistence/Repositories/UserRepository.java Normal file
View File

@ -0,0 +1,9 @@
package ru.kirillius.XCP.Persistence.Repositories;
import ru.kirillius.XCP.Persistence.Entities.User;
import ru.kirillius.XCP.Persistence.Repository;
public interface UserRepository extends Repository<User> {
User getByLogin(String login);
}

4
api/src/main/java/ru/kirillius/XCP/api/Persistence/Repository.java → api/src/main/java/ru/kirillius/XCP/Persistence/Repository.java
View File

@ -1,6 +1,6 @@
package ru.kirillius.XCP.api.Persistence;
package ru.kirillius.XCP.Persistence;
import ru.kirillius.XCP.api.Commons.StreamHandler;
import ru.kirillius.XCP.Commons.StreamHandler;
import ru.kirillius.java.utils.events.EventHandler;
import tools.jackson.databind.node.ArrayNode;
import tools.jackson.databind.node.ObjectNode;

4
api/src/main/java/ru/kirillius/XCP/api/Persistence/RepositoryService.java → api/src/main/java/ru/kirillius/XCP/Persistence/RepositoryService.java
View File

@ -1,6 +1,6 @@
package ru.kirillius.XCP.api.Persistence;
package ru.kirillius.XCP.Persistence;
import ru.kirillius.XCP.api.Commons.Service;
import ru.kirillius.XCP.Commons.Service;
public interface RepositoryService extends Service {
<E extends PersistenceEntity> Repository<E> getRepositoryForEntity(Class<E> entityType);

9
api/src/main/java/ru/kirillius/XCP/Security/HashUtility.java Normal file
View File

@ -0,0 +1,9 @@
package ru.kirillius.XCP.Security;
public interface HashUtility {
String hash(String password);
default boolean validate(String password, String hash) {
return hash(password).equals(hash);
}
}

2
api/src/main/java/ru/kirillius/XCP/api/Security/UserRole.java → api/src/main/java/ru/kirillius/XCP/Security/UserRole.java
View File

@ -1,4 +1,4 @@
package ru.kirillius.XCP.api.Security;
package ru.kirillius.XCP.Security;
import lombok.Getter;

8
api/src/main/java/ru/kirillius/XCP/api/Persistence/Entities/Group.java
View File

@ -1,8 +0,0 @@
package ru.kirillius.XCP.api.Persistence.Entities;
import ru.kirillius.XCP.api.Persistence.NodeEntity;
public interface Group extends NodeEntity {
String getIcon();
void setIcon(String icon);
}

13
api/src/main/java/ru/kirillius/XCP/api/Persistence/Entities/Input.java
View File

@ -1,13 +0,0 @@
package ru.kirillius.XCP.api.Persistence.Entities;
import ru.kirillius.XCP.api.Data.PollSettings;
import ru.kirillius.XCP.api.Persistence.IOEntity;
import ru.kirillius.XCP.api.Persistence.NodeEntity;
public interface Input extends IOEntity, NodeEntity {
PollSettings getPollSettings();
void setPollSettings(PollSettings pollSettings);
}

7
api/src/main/java/ru/kirillius/XCP/api/Persistence/Entities/Output.java
View File

@ -1,7 +0,0 @@
package ru.kirillius.XCP.api.Persistence.Entities;
import ru.kirillius.XCP.api.Persistence.IOEntity;
import ru.kirillius.XCP.api.Persistence.NodeEntity;
public interface Output extends IOEntity, NodeEntity {
}

14
api/src/main/java/ru/kirillius/XCP/api/Persistence/Repositories/GroupRepository.java
View File

@ -1,14 +0,0 @@
package ru.kirillius.XCP.api.Persistence.Repositories;
import ru.kirillius.XCP.api.Commons.StreamHandler;
import ru.kirillius.XCP.api.Persistence.Entities.Group;
import ru.kirillius.XCP.api.Persistence.Entities.Input;
import ru.kirillius.XCP.api.Persistence.NodeRepository;
public interface GroupRepository extends NodeRepository<Input> {
StreamHandler<Group> getChildrenOf(Group dataGroup);
StreamHandler<Group> getChildrenRecursiveOf(Group dataGroup);
Group getRoot();
}

8
api/src/main/java/ru/kirillius/XCP/api/Persistence/Repositories/InputRepository.java
View File

@ -1,8 +0,0 @@
package ru.kirillius.XCP.api.Persistence.Repositories;
import ru.kirillius.XCP.api.Persistence.Entities.Input;
import ru.kirillius.XCP.api.Persistence.NodeRepository;
public interface InputRepository extends NodeRepository<Input> {
}

8
api/src/main/java/ru/kirillius/XCP/api/Persistence/Repositories/OutputRepository.java
View File

@ -1,8 +0,0 @@
package ru.kirillius.XCP.api.Persistence.Repositories;
import ru.kirillius.XCP.api.Persistence.Entities.Input;
import ru.kirillius.XCP.api.Persistence.NodeRepository;
public interface OutputRepository extends NodeRepository<Input> {
}

10
api/src/main/java/ru/kirillius/XCP/api/Persistence/Repositories/UserRepository.java
View File

@ -1,10 +0,0 @@
package ru.kirillius.XCP.api.Persistence.Repositories;
import ru.kirillius.XCP.api.Persistence.Entities.User;
import ru.kirillius.XCP.api.Persistence.Repository;
public interface UserRepository extends Repository<User> {
User getByLoginAndPassword(String login, String password);
User getByLogin(String login);
}

28
core/pom.xml Normal file
View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ru.kirillius</groupId>
<artifactId>XCP</artifactId>
<version>1.0.0.0</version>
</parent>
<artifactId>core</artifactId>
<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>ru.kirillius</groupId>
<artifactId>api</artifactId>
<version>1.0.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

35
core/src/main/java/ru/kirillius/XCP/Security/Argon2HashUtility.java Normal file
View File

@ -0,0 +1,35 @@
package ru.kirillius.XCP.Security;
import de.mkammerer.argon2.Argon2;
import de.mkammerer.argon2.Argon2Factory;
import lombok.Getter;
public class Argon2HashUtility implements HashUtility {
@Getter
private final static HashUtility instance = new Argon2HashUtility();
private final Argon2 argon2;
public Argon2HashUtility() {
this.argon2 = Argon2Factory.create(
Argon2Factory.Argon2Types.ARGON2id,
16,
32
);
}
@Override
public String hash(String password) {
try {
return argon2.hash(3, 65536, 1, password.toCharArray());
} finally {
argon2.wipeArray(password.toCharArray());
}
}
@Override
public boolean validate(String password, String hash) {
return argon2.verify(hash, password.toCharArray());
}
}

6
database/pom.xml
View File

@ -41,6 +41,12 @@
<version>1.0.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ru.kirillius</groupId>
<artifactId>core</artifactId>
<version>1.0.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

4
database/src/main/java/ru/kirillius/XCP/Persistence/AbstractRepository.java
View File

@ -5,9 +5,7 @@ import lombok.Getter;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.query.Query;
import ru.kirillius.XCP.api.Commons.StreamHandler;
import ru.kirillius.XCP.api.Persistence.PersistenceEntity;
import ru.kirillius.XCP.api.Persistence.Repository;
import ru.kirillius.XCP.Commons.StreamHandler;
import ru.kirillius.java.utils.events.ConcurrentEventHandler;
import ru.kirillius.java.utils.events.EventHandler;
import tools.jackson.databind.node.ArrayNode;

2
database/src/main/java/ru/kirillius/XCP/Persistence/EntityImplementation.java
View File

@ -1,7 +1,5 @@
package ru.kirillius.XCP.Persistence;
import ru.kirillius.XCP.api.Persistence.PersistenceEntity;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;

1
database/src/main/java/ru/kirillius/XCP/Persistence/EntityReferenceDeserializer.java
View File

@ -1,6 +1,5 @@
package ru.kirillius.XCP.Persistence;
import ru.kirillius.XCP.api.Persistence.PersistenceEntity;
import tools.jackson.core.JacksonException;
import tools.jackson.core.JsonParser;
import tools.jackson.databind.DeserializationContext;

1
database/src/main/java/ru/kirillius/XCP/Persistence/EntityReferenceSerializer.java
View File

@ -1,6 +1,5 @@
package ru.kirillius.XCP.Persistence;
import ru.kirillius.XCP.api.Persistence.PersistenceEntity;
import tools.jackson.core.JacksonException;
import tools.jackson.core.JsonGenerator;
import tools.jackson.databind.SerializationContext;

1
database/src/main/java/ru/kirillius/XCP/Persistence/PersistenceSerializationModule.java
View File

@ -1,7 +1,6 @@
package ru.kirillius.XCP.Persistence;
import lombok.Getter;
import ru.kirillius.XCP.api.Persistence.PersistenceEntity;
import tools.jackson.core.Version;
import tools.jackson.databind.JacksonModule;
import tools.jackson.databind.module.SimpleDeserializers;

68
database/src/main/java/ru/kirillius/XCP/Persistence/Services/UserRepositoryImpl.java → database/src/main/java/ru/kirillius/XCP/Persistence/Repositories/UserRepositoryImpl.java
View File

@ -1,24 +1,17 @@
package ru.kirillius.XCP.Persistence.Services;
package ru.kirillius.XCP.Persistence.Repositories;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.persistence.*;
import lombok.*;
import org.hibernate.annotations.UuidGenerator;
import ru.kirillius.XCP.Persistence.AbstractRepository;
import ru.kirillius.XCP.Persistence.EntityImplementation;
import ru.kirillius.XCP.Persistence.RepositoryServiceImpl;
import ru.kirillius.XCP.Persistence.*;
import ru.kirillius.XCP.Persistence.Entities.User;
import ru.kirillius.XCP.Security.Argon2HashUtility;
import ru.kirillius.XCP.Security.UserRole;
import ru.kirillius.XCP.Serialization.SerializationUtils;
import ru.kirillius.XCP.api.Persistence.Entities.User;
import ru.kirillius.XCP.api.Persistence.PersistenceEntity;
import ru.kirillius.XCP.api.Persistence.Repositories.UserRepository;
import ru.kirillius.XCP.api.Persistence.Repository;
import ru.kirillius.XCP.api.Security.UserRole;
import tools.jackson.databind.node.ObjectNode;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.UUID;
@EntityImplementation(UserRepositoryImpl.UserEntity.class)
@ -33,18 +26,6 @@ public class UserRepositoryImpl extends AbstractRepository<User> implements User
return UserRepository.class;
}
@Override
public User getByLoginAndPassword(String login, String password) {
var user = (UserEntity) getByLogin(login);
if (user == null) {
return null;
}
if (user.getPasswordHash().equals(UserEntity.hash(password, user.getPasswordHashSalt()))) {
return user;
}
return null;
}
@Override
public User getByLogin(String login) {
try (var request = buildQueryParametrized("WHERE login = ?1", login)) {
@ -55,7 +36,7 @@ public class UserRepositoryImpl extends AbstractRepository<User> implements User
}
@Entity
@Table(name = "UserEntity")
@Table(name = "Users")
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ -84,10 +65,6 @@ public class UserRepositoryImpl extends AbstractRepository<User> implements User
@JsonProperty
private String passwordHash;
@Column(nullable = false)
@JsonProperty
private String passwordHashSalt;
@Column(nullable = false)
@JsonProperty
@Enumerated(EnumType.STRING)
@ -99,32 +76,19 @@ public class UserRepositoryImpl extends AbstractRepository<User> implements User
@JsonProperty
private ObjectNode values = SerializationUtils.EmptyObject();
public static String hash(String data, String salt) {
String generatedPassword;
MessageDigest md;
try {
md = MessageDigest.getInstance("SHA-512");
} catch (NoSuchAlgorithmException e) {
throw new RuntimeException(e);
}
md.update(salt.getBytes(StandardCharsets.UTF_8));
var bytes = md.digest(data.getBytes(StandardCharsets.UTF_8));
var sb = new StringBuilder();
for (byte aByte : bytes) {
sb.append(Integer.toString((aByte & 0xff) + 0x100, 16).substring(1));
}
generatedPassword = sb.toString();
return generatedPassword;
}
public void changePassword(String newPass) {
passwordHashSalt = java.util.UUID.randomUUID().toString();
passwordHash = hash(newPass, passwordHashSalt);
}
@Override
public Class<? extends PersistenceEntity> getBaseType() {
return User.class;
}
@Override
public void setPassword(String password) {
passwordHash = Argon2HashUtility.getInstance().hash(password);
}
@Override
public boolean verifyPassword(String password) {
return Argon2HashUtility.getInstance().validate(password, passwordHash);
}
}
}

8
database/src/main/java/ru/kirillius/XCP/Persistence/RepositoryServiceImpl.java
View File

@ -4,10 +4,7 @@ import lombok.Getter;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.Configuration;
import ru.kirillius.XCP.api.Commons.Context;
import ru.kirillius.XCP.api.Persistence.PersistenceEntity;
import ru.kirillius.XCP.api.Persistence.Repository;
import ru.kirillius.XCP.api.Persistence.RepositoryService;
import ru.kirillius.XCP.Commons.Context;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.json.JsonMapper;
@ -24,8 +21,8 @@ public final class RepositoryServiceImpl implements RepositoryService {
private DatabaseConfiguration databaseConfiguration;
private final Map<Class<? extends Repository<?>>, Repository<?>> repositoryBindings = new ConcurrentHashMap<>();
private final Map<Class<? extends PersistenceEntity>, Class<? extends Repository<?>>> entityBindings = new ConcurrentHashMap<>();
private final Collection<Class<? extends AbstractRepository<?>>> managedRepositoryClasses;
private Context context;
public RepositoryServiceImpl(DatabaseConfiguration databaseConfiguration, Collection<Class<? extends AbstractRepository<?>>> repositoryImplClasses) {
managedRepositoryClasses = repositoryImplClasses;
@ -88,6 +85,7 @@ public final class RepositoryServiceImpl implements RepositoryService {
throw new IllegalStateException("Initialized already");
}
initialized = true;
this.context = context;
if (databaseConfiguration == null) {
loadDatabaseConfig(new H2DatabaseInFileConfiguration(context.getConfig().getDatabaseFile()));
}

8
database/src/test/java/TestContext.java
View File

@ -1,7 +1,7 @@
import ru.kirillius.XCP.api.Commons.Config;
import ru.kirillius.XCP.api.Commons.ConfigManager;
import ru.kirillius.XCP.api.Commons.Context;
import ru.kirillius.XCP.api.Commons.Service;
import ru.kirillius.XCP.Commons.Config;
import ru.kirillius.XCP.Commons.ConfigManager;
import ru.kirillius.XCP.Commons.Context;
import ru.kirillius.XCP.Commons.Service;
public class TestContext implements Context {
@Override

4
database/src/test/java/ru/kirillius/XCP/Persistence/RepositoryServiceImplTest.java
View File

@ -6,9 +6,7 @@ import lombok.Getter;
import lombok.Setter;
import org.hibernate.annotations.UuidGenerator;
import org.junit.jupiter.api.Test;
import ru.kirillius.XCP.api.Commons.Context;
import ru.kirillius.XCP.api.Persistence.PersistenceEntity;
import ru.kirillius.XCP.api.Persistence.Repository;
import ru.kirillius.XCP.Commons.Context;
import java.io.IOException;
import java.util.*;

8
pom.xml
View File

@ -11,6 +11,7 @@
<modules>
<module>api</module>
<module>database</module>
<module>core</module>
</modules>
<properties>
@ -79,6 +80,13 @@
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/de.mkammerer/argon2-jvm -->
<dependency>
<groupId>de.mkammerer</groupId>
<artifactId>argon2-jvm</artifactId>
<version>2.12</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.assertj/assertj-core -->
<dependency>
<groupId>org.assertj</groupId>