Skip to content
Snippets Groups Projects
Commit 43067218 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-5044 tiny cleanup

parent 55ca5dab
No related branches found
No related tags found
No related merge requests found
Showing with 18 additions and 19 deletions
......@@ -10,11 +10,11 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public class DataRestConfiguration implements RepositoryRestConfigurer {
private SettingValidator settingsValidator;
private final SettingValidator settingValidator;
@Override
public void configureValidatingRepositoryEventListener(ValidatingRepositoryEventListener v) {
v.addValidator("beforeSave", settingsValidator);
v.addValidator("beforeCreate", settingsValidator);
v.addValidator("beforeSave", settingValidator);
v.addValidator("beforeCreate", settingValidator);
}
}
\ No newline at end of file
......@@ -25,7 +25,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class SettingConstant {
public class SettingConstants {
static final String REL = "settings";
......
......@@ -2,11 +2,12 @@ package de.ozgcloud.admin.settings;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.ReportingPolicy;
import de.ozgcloud.admin.settings.postfach.PostfachSettingBody;
@Mapper
public interface SettingMapper {
@Mapper(unmappedTargetPolicy = ReportingPolicy.WARN)
interface SettingMapper {
@Mapping(target = "signatur", source = "signatur")
AlfaKonfiguration mapToAlfaKonfiguration(PostfachSettingBody postfachData);
......
......@@ -25,7 +25,7 @@ import org.springframework.data.mongodb.repository.MongoRepository;
import org.springframework.data.mongodb.repository.Query;
import org.springframework.data.rest.core.annotation.RepositoryRestResource;
@RepositoryRestResource(collectionResourceRel = SettingConstant.REL, path = SettingConstant.PATH)
@RepositoryRestResource(collectionResourceRel = SettingConstants.REL, path = SettingConstants.PATH)
interface SettingRepository extends MongoRepository<Setting, String> {
@Query("{'name' : ?0 }")
......
package de.ozgcloud.admin.settings;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import de.ozgcloud.admin.settings.postfach.PostfachSettingBody;
import lombok.RequiredArgsConstructor;
@Service
@RequiredArgsConstructor
public class SettingService {
class SettingService {
private static final String POSTFACH_DB_OBJEKT_NAME = "Postfach";
private static final String POSTFACH_SETTING_ITEM_NAME = "Postfach";
private final SettingRepository repository;
......@@ -26,6 +26,6 @@ public class SettingService {
}
PostfachSettingBody getPostfachKonfigurationFromDb() {
return (PostfachSettingBody) repository.findByName(POSTFACH_DB_OBJEKT_NAME).getSettingBody();
return (PostfachSettingBody) repository.findByName(POSTFACH_SETTING_ITEM_NAME).getSettingBody();
}
}
......@@ -3,7 +3,6 @@ package de.ozgcloud.admin.settings.postfach;
import static de.ozgcloud.admin.common.errorhandling.ValidationMessageCodes.*;
import jakarta.validation.constraints.NotEmpty;
import lombok.Builder;
import lombok.Getter;
import lombok.extern.jackson.Jacksonized;
......
......@@ -2,9 +2,8 @@ package de.ozgcloud.admin.settings.postfach;
import org.springframework.data.annotation.TypeAlias;
import jakarta.validation.Valid;
import de.ozgcloud.admin.settings.SettingBody;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
......
......@@ -82,7 +82,7 @@ class SettingITCase {
@SneakyThrows
private ResultActions doPerform(String id) {
return mockMvc.perform(get(String.join("/", restProperties.getBasePath(), SettingConstant.PATH, id)));
return mockMvc.perform(get(String.join("/", restProperties.getBasePath(), SettingConstants.PATH, id)));
}
}
......
......@@ -25,7 +25,7 @@ import org.springframework.test.web.servlet.ResultActions;
import com.fasterxml.jackson.databind.ObjectMapper;
import de.ozgcloud.admin.settings.Setting;
import de.ozgcloud.admin.settings.SettingConstant;
import de.ozgcloud.admin.settings.SettingConstants;
import de.ozgcloud.admin.settings.SettingTestFactory;
import de.ozgcloud.common.test.DataITCase;
import lombok.SneakyThrows;
......@@ -176,7 +176,7 @@ class PostfachSettingBodyITCase {
private ResultActions performPost(Setting setting) {
var postBody = convertSettingToString(setting);
return mockMvc.perform(post(String.join("/", restProperties.getBasePath(),
SettingConstant.PATH))
SettingConstants.PATH))
.with(csrf())
.contentType(MediaType.APPLICATION_JSON)
.content(postBody));
......@@ -214,7 +214,7 @@ class PostfachSettingBodyITCase {
@SneakyThrows
private ResultActions performGet() {
return mockMvc.perform(get(String.join("/", restProperties.getBasePath(), SettingConstant.PATH, id)));
return mockMvc.perform(get(String.join("/", restProperties.getBasePath(), SettingConstants.PATH, id)));
}
}
......@@ -267,7 +267,7 @@ class PostfachSettingBodyITCase {
@SneakyThrows
private ResultActions performPut() {
var body = convertSettingToString(updatedSetting);
return mockMvc.perform(put(String.join("/", restProperties.getBasePath(), SettingConstant.PATH, id))
return mockMvc.perform(put(String.join("/", restProperties.getBasePath(), SettingConstants.PATH, id))
.with(csrf())
.contentType(MediaType.APPLICATION_JSON)
.content(body));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment