MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

move configuration

This commit is contained in:
Efstratios Giannopoulos 2024-04-01 11:16:19 +03:00
parent eba8bc9cb6
commit 20f6ae27ed
39 changed files with 56 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-backend/core/src/main/java/eu/eudat/configurations/locale/LocaleConfiguration.java → dmp-backend/core/src/main/java/eu/eudat/commons/locale/LocaleConfiguration.java
View File

@ -1,4 +1,4 @@
package eu.eudat.configurations.locale;
package eu.eudat.commons.locale;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;

2
dmp-backend/core/src/main/java/eu/eudat/configurations/locale/LocaleProperties.java → dmp-backend/core/src/main/java/eu/eudat/commons/locale/LocaleProperties.java
View File

@ -1,4 +1,4 @@
package eu.eudat.configurations.locale;
package eu.eudat.commons.locale;
import org.springframework.boot.context.properties.ConfigurationProperties;

2
dmp-backend/core/src/main/java/eu/eudat/configurations/notification/NotificationConfiguration.java → dmp-backend/core/src/main/java/eu/eudat/commons/notification/NotificationConfiguration.java
View File

@ -1,4 +1,4 @@
package eu.eudat.configurations.notification;
package eu.eudat.commons.notification;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;

2
dmp-backend/core/src/main/java/eu/eudat/configurations/notification/NotificationProperties.java → dmp-backend/core/src/main/java/eu/eudat/commons/notification/NotificationProperties.java
View File

@ -1,4 +1,4 @@
package eu.eudat.configurations.notification;
package eu.eudat.commons.notification;
import org.springframework.boot.context.properties.ConfigurationProperties;

9
dmp-backend/core/src/main/java/eu/eudat/configurations/transformer/TransformerConfiguration.java
View File

@ -1,9 +0,0 @@
package eu.eudat.configurations.transformer;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@Configuration
@EnableConfigurationProperties({TransformerProperties.class, TransformerCacheOptions.class})
public class TransformerConfiguration {
}

2
dmp-backend/core/src/main/java/eu/eudat/configurations/db/NamingStrategyProperties.java → dmp-backend/core/src/main/java/eu/eudat/data/namingstrategy/NamingStrategyProperties.java
View File

@ -1,4 +1,4 @@
package eu.eudat.configurations.db;
package eu.eudat.data.namingstrategy;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.bind.ConstructorBinding;

2
dmp-backend/core/src/main/java/eu/eudat/configurations/db/PrefixPhysicalNamingStrategy.java → dmp-backend/core/src/main/java/eu/eudat/data/namingstrategy/PrefixPhysicalNamingStrategy.java
View File

@ -1,4 +1,4 @@
package eu.eudat.configurations.db;
package eu.eudat.data.namingstrategy;
import eu.eudat.convention.ConventionService;
import org.hibernate.boot.model.naming.Identifier;

9
dmp-backend/core/src/main/java/eu/eudat/elastic/query/DescriptionElasticQuery.java
View File

@ -2,20 +2,14 @@ package eu.eudat.elastic.query;
import co.elastic.clients.elasticsearch._types.query_dsl.Query;
import co.elastic.clients.elasticsearch._types.query_dsl.QueryBuilders;
import eu.eudat.authorization.AuthorizationFlags;
import eu.eudat.authorization.Permission;
import eu.eudat.commons.enums.DescriptionStatus;
import eu.eudat.commons.enums.DmpAccessType;
import eu.eudat.commons.enums.DmpStatus;
import eu.eudat.commons.enums.IsActive;
import eu.eudat.commons.scope.user.UserScope;
import eu.eudat.configurations.elastic.AppElasticProperties;
import eu.eudat.data.DescriptionEntity;
import eu.eudat.service.elastic.AppElasticProperties;
import eu.eudat.elastic.data.DescriptionElasticEntity;
import eu.eudat.elastic.data.DmpElasticEntity;
import eu.eudat.elastic.data.nested.NestedDmpElasticEntity;
import eu.eudat.query.DescriptionQuery;
import eu.eudat.query.DmpDescriptionTemplateQuery;
import eu.eudat.query.DmpQuery;
import eu.eudat.service.elastic.ElasticService;
import gr.cite.commons.web.authz.service.AuthorizationService;
import gr.cite.tools.data.query.FieldResolver;
@ -35,7 +29,6 @@ import org.springframework.stereotype.Component;
import java.io.IOException;
import java.time.Instant;
import java.util.*;
import java.util.stream.Collectors;
@Component
//Like in C# make it Transient

9
dmp-backend/core/src/main/java/eu/eudat/elastic/query/DmpElasticQuery.java
View File

@ -6,15 +6,10 @@ import eu.eudat.authorization.Permission;
import eu.eudat.commons.enums.DmpAccessType;
import eu.eudat.commons.enums.DmpStatus;
import eu.eudat.commons.enums.DmpVersionStatus;
import eu.eudat.commons.enums.IsActive;
import eu.eudat.commons.scope.user.UserScope;
import eu.eudat.configurations.elastic.AppElasticProperties;
import eu.eudat.data.DmpEntity;
import eu.eudat.elastic.data.DescriptionElasticEntity;
import eu.eudat.service.elastic.AppElasticProperties;
import eu.eudat.elastic.data.DmpElasticEntity;
import eu.eudat.elastic.data.nested.NestedDescriptionElasticEntity;
import eu.eudat.query.DmpQuery;
import eu.eudat.query.utils.QueryUtilsService;
import eu.eudat.service.elastic.ElasticService;
import gr.cite.commons.web.authz.service.AuthorizationService;
import gr.cite.tools.data.query.FieldResolver;
@ -22,8 +17,6 @@ import gr.cite.tools.data.query.QueryFactory;
import gr.cite.tools.elastic.configuration.ElasticProperties;
import gr.cite.tools.elastic.mapper.FieldBasedMapper;
import gr.cite.tools.elastic.query.*;
import jakarta.persistence.criteria.Predicate;
import org.elasticsearch.index.query.QueryBuilder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;

2
dmp-backend/core/src/main/java/eu/eudat/service/contactsupport/ContactSupportServiceImpl.java
View File

@ -6,7 +6,7 @@ import eu.eudat.commons.enums.ContactInfoType;
import eu.eudat.commons.enums.notification.NotificationContactType;
import eu.eudat.commons.scope.user.UserScope;
import eu.eudat.commons.types.notification.*;
import eu.eudat.configurations.notification.NotificationProperties;
import eu.eudat.commons.notification.NotificationProperties;
import eu.eudat.data.UserContactInfoEntity;
import eu.eudat.integrationevent.outbox.notification.NotifyIntegrationEvent;
import eu.eudat.integrationevent.outbox.notification.NotifyIntegrationEventHandler;

2
dmp-backend/core/src/main/java/eu/eudat/configurations/deposit/DepositCacheOptions.java → dmp-backend/core/src/main/java/eu/eudat/service/deposit/DepositCacheOptions.java
View File

@ -1,4 +1,4 @@
package eu.eudat.configurations.deposit;
package eu.eudat.service.deposit;
import gr.cite.tools.cache.CacheOptions;
import org.springframework.boot.context.properties.ConfigurationProperties;

2
dmp-backend/core/src/main/java/eu/eudat/configurations/deposit/DepositConfiguration.java → dmp-backend/core/src/main/java/eu/eudat/service/deposit/DepositConfiguration.java
View File

@ -1,4 +1,4 @@
package eu.eudat.configurations.deposit;
package eu.eudat.service.deposit;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Configuration;

2
dmp-backend/core/src/main/java/eu/eudat/configurations/deposit/DepositProperties.java → dmp-backend/core/src/main/java/eu/eudat/service/deposit/DepositProperties.java
View File

@ -1,4 +1,4 @@
package eu.eudat.configurations.deposit;
package eu.eudat.service.deposit;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.bind.ConstructorBinding;

2
dmp-backend/core/src/main/java/eu/eudat/service/deposit/DepositServiceImpl.java
View File

@ -7,8 +7,6 @@ import eu.eudat.commonmodels.models.FileEnvelopeModel;
import eu.eudat.commonmodels.models.dmp.DmpModel;
import eu.eudat.commons.enums.StorageType;
import eu.eudat.commons.scope.user.UserScope;
import eu.eudat.configurations.deposit.DepositProperties;
import eu.eudat.convention.ConventionService;
import eu.eudat.data.DmpEntity;
import eu.eudat.depositinterface.repository.DepositClient;
import eu.eudat.depositinterface.repository.DepositConfiguration;

2
dmp-backend/core/src/main/java/eu/eudat/service/description/DescriptionServiceImpl.java
View File

@ -16,7 +16,7 @@ import eu.eudat.commons.types.descriptiontemplate.fielddata.ReferenceTypeDataEnt
import eu.eudat.commons.types.descriptiontemplate.fielddata.UploadDataEntity;
import eu.eudat.commons.types.notification.*;
import eu.eudat.commons.types.reference.DefinitionEntity;
import eu.eudat.configurations.notification.NotificationProperties;
import eu.eudat.commons.notification.NotificationProperties;
import eu.eudat.convention.ConventionService;
import eu.eudat.data.*;
import eu.eudat.errorcode.ErrorThesaurusProperties;

6
dmp-backend/core/src/main/java/eu/eudat/service/descriptiontemplate/DescriptionTemplateServiceImpl.java
View File

@ -14,7 +14,7 @@ import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
import eu.eudat.commons.types.descriptiontemplate.fielddata.ReferenceTypeDataEntity;
import eu.eudat.commons.types.descriptiontemplate.importexport.*;
import eu.eudat.commons.types.notification.*;
import eu.eudat.configurations.notification.NotificationProperties;
import eu.eudat.commons.notification.NotificationProperties;
import eu.eudat.convention.ConventionService;
import eu.eudat.data.*;
import eu.eudat.errorcode.ErrorThesaurusProperties;
@ -51,6 +51,7 @@ import gr.cite.tools.logging.MapLogEntry;
import gr.cite.tools.validation.ValidatorFactory;
import jakarta.persistence.EntityManager;
import jakarta.xml.bind.JAXBException;
import org.apache.commons.lang3.NotImplementedException;
import org.jetbrains.annotations.NotNull;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -61,7 +62,6 @@ import org.springframework.stereotype.Service;
import org.xml.sax.SAXException;
import javax.management.InvalidApplicationException;
import javax.ws.rs.NotSupportedException;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
import java.io.IOException;
@ -405,7 +405,7 @@ public class DescriptionTemplateServiceImpl implements DescriptionTemplateServic
if (FieldType.isTextType(fieldType)) {
if (FieldType.UPLOAD.equals(fieldType) && !this.conventionService.isNullOrEmpty(persist.getTextValue())){
throw new NotSupportedException("Upload not supported");
throw new NotImplementedException("Upload not supported");
} else {
data.setTextValue(persist.getTextValue());
}

2
dmp-backend/core/src/main/java/eu/eudat/service/dmp/DmpServiceImpl.java
View File

@ -18,7 +18,7 @@ import eu.eudat.commons.types.dmpreference.DmpReferenceDataEntity;
import eu.eudat.commons.types.notification.*;
import eu.eudat.commons.types.reference.DefinitionEntity;
import eu.eudat.commons.types.reference.FieldEntity;
import eu.eudat.configurations.notification.NotificationProperties;
import eu.eudat.commons.notification.NotificationProperties;
import eu.eudat.convention.ConventionService;
import eu.eudat.data.*;
import eu.eudat.errorcode.ErrorThesaurusProperties;

2
dmp-backend/core/src/main/java/eu/eudat/configurations/elastic/AppElasticConfiguration.java → dmp-backend/core/src/main/java/eu/eudat/service/elastic/AppElasticConfiguration.java
View File

@ -1,4 +1,4 @@
package eu.eudat.configurations.elastic;
package eu.eudat.service.elastic;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;

2
dmp-backend/core/src/main/java/eu/eudat/configurations/elastic/AppElasticProperties.java → dmp-backend/core/src/main/java/eu/eudat/service/elastic/AppElasticProperties.java
View File

@ -1,4 +1,4 @@
package eu.eudat.configurations.elastic;
package eu.eudat.service.elastic;
import org.springframework.boot.context.properties.ConfigurationProperties;

1
dmp-backend/core/src/main/java/eu/eudat/service/elastic/ElasticServiceImpl.java
View File

@ -6,7 +6,6 @@ import co.elastic.clients.elasticsearch._types.mapping.TypeMapping;
import co.elastic.clients.elasticsearch.indices.*;
import eu.eudat.authorization.Permission;
import eu.eudat.commons.enums.IsActive;
import eu.eudat.configurations.elastic.AppElasticProperties;
import eu.eudat.data.DescriptionEntity;
import eu.eudat.data.DmpEntity;
import eu.eudat.elastic.data.DescriptionElasticEntity;

2
dmp-backend/core/src/main/java/eu/eudat/configurations/keycloak/KeycloakAuthorityProperties.java → dmp-backend/core/src/main/java/eu/eudat/service/keycloak/KeycloakAuthorityProperties.java
View File

@ -1,4 +1,4 @@
package eu.eudat.configurations.keycloak;
package eu.eudat.service.keycloak;
import org.springframework.boot.context.properties.bind.ConstructorBinding;

5
dmp-backend/core/src/main/java/eu/eudat/configurations/keycloak/KeycloakResourcesConfiguration.java → dmp-backend/core/src/main/java/eu/eudat/service/keycloak/KeycloakResourcesConfiguration.java
View File

@ -1,12 +1,9 @@
package eu.eudat.configurations.keycloak;
package eu.eudat.service.keycloak;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import java.util.ArrayList;
import java.util.List;
@Configuration
@EnableConfigurationProperties(KeycloakResourcesProperties.class)
public class KeycloakResourcesConfiguration {

2
dmp-backend/core/src/main/java/eu/eudat/configurations/keycloak/KeycloakResourcesProperties.java → dmp-backend/core/src/main/java/eu/eudat/service/keycloak/KeycloakResourcesProperties.java
View File

@ -1,4 +1,4 @@
package eu.eudat.configurations.keycloak;
package eu.eudat.service.keycloak;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.ConfigurationProperties;

12
dmp-backend/core/src/main/java/eu/eudat/service/keycloak/KeycloakServiceImpl.java
View File

@ -1,8 +1,5 @@
package eu.eudat.service.keycloak;
import com.google.common.collect.Lists;
import eu.eudat.configurations.keycloak.KeycloakAuthorityProperties;
import eu.eudat.configurations.keycloak.KeycloakResourcesConfiguration;
import gr.cite.commons.web.keycloak.api.configuration.KeycloakClientConfiguration;
import gr.cite.tools.logging.LoggerService;
import org.jetbrains.annotations.NotNull;
@ -12,10 +9,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.*;
@Service
public class KeycloakServiceImpl implements KeycloakService {
@ -61,7 +55,7 @@ public class KeycloakServiceImpl implements KeycloakService {
if (clientId == null)
clientId = clientConfiguration.getProperties().getClientId();
UserRepresentation user = api.users().findUserById(subjectId.toString());
user.getClientRoles().computeIfAbsent(clientId, k -> Lists.newArrayList());
user.getClientRoles().computeIfAbsent(clientId, k -> new ArrayList<>());
Set<String> clientRoles = new HashSet<>(Set.copyOf(user.getClientRoles().get(clientId)));
clientRoles.add(role.name());
user.getClientRoles().get(clientId).clear();
@ -73,7 +67,7 @@ public class KeycloakServiceImpl implements KeycloakService {
public void removeClientRoleFromUser(UUID subjectId, String clientId, KeycloakRole role) {
if (clientId == null) clientId = clientConfiguration.getProperties().getClientId();
UserRepresentation user = api.users().findUserById(subjectId.toString());
user.getClientRoles().computeIfAbsent(clientId, k -> Lists.newArrayList());
user.getClientRoles().computeIfAbsent(clientId, k -> new ArrayList<>());
Set<String> clientRoles = new HashSet<>(Set.copyOf(user.getClientRoles().get(clientId)));
clientRoles.remove(role.name());
user.getClientRoles().get(clientId).clear();

2
dmp-backend/core/src/main/java/eu/eudat/configurations/lock/LockConfiguration.java → dmp-backend/core/src/main/java/eu/eudat/service/lock/LockConfiguration.java
View File

@ -1,4 +1,4 @@
package eu.eudat.configurations.lock;
package eu.eudat.service.lock;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;

2
dmp-backend/core/src/main/java/eu/eudat/configurations/lock/LockProperties.java → dmp-backend/core/src/main/java/eu/eudat/service/lock/LockProperties.java
View File

@ -1,4 +1,4 @@
package eu.eudat.configurations.lock;
package eu.eudat.service.lock;
import org.springframework.boot.context.properties.ConfigurationProperties;

1
dmp-backend/core/src/main/java/eu/eudat/service/lock/LockServiceImpl.java
View File

@ -6,7 +6,6 @@ import eu.eudat.authorization.Permission;
import eu.eudat.authorization.authorizationcontentresolver.AuthorizationContentResolver;
import eu.eudat.commons.enums.LockTargetType;
import eu.eudat.commons.scope.user.UserScope;
import eu.eudat.configurations.lock.LockProperties;
import eu.eudat.convention.ConventionService;
import eu.eudat.data.LockEntity;
import eu.eudat.errorcode.ErrorThesaurusProperties;

2
dmp-backend/core/src/main/java/eu/eudat/configurations/tenant/TenantConfiguration.java → dmp-backend/core/src/main/java/eu/eudat/service/tenant/TenantConfiguration.java
View File

@ -1,4 +1,4 @@
package eu.eudat.configurations.tenant;
package eu.eudat.service.tenant;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;

2
dmp-backend/core/src/main/java/eu/eudat/configurations/tenant/TenantProperties.java → dmp-backend/core/src/main/java/eu/eudat/service/tenant/TenantProperties.java
View File

@ -1,4 +1,4 @@
package eu.eudat.configurations.tenant;
package eu.eudat.service.tenant;
import org.springframework.boot.context.properties.ConfigurationProperties;

1
dmp-backend/core/src/main/java/eu/eudat/service/tenant/TenantServiceImpl.java
View File

@ -5,7 +5,6 @@ import eu.eudat.authorization.Permission;
import eu.eudat.commons.XmlHandlingService;
import eu.eudat.commons.enums.IsActive;
import eu.eudat.commons.types.tenant.*;
import eu.eudat.configurations.tenant.TenantProperties;
import eu.eudat.convention.ConventionService;
import eu.eudat.data.TenantEntity;
import eu.eudat.errorcode.ErrorThesaurusProperties;

4
dmp-backend/core/src/main/java/eu/eudat/configurations/transformer/TransformerCacheOptions.java → dmp-backend/core/src/main/java/eu/eudat/service/transformer/FileTransformerCacheOptions.java
View File

@ -1,8 +1,8 @@
package eu.eudat.configurations.transformer;
package eu.eudat.service.transformer;
import gr.cite.tools.cache.CacheOptions;
import org.springframework.boot.context.properties.ConfigurationProperties;
@ConfigurationProperties(prefix = "cache.transformer")
public class TransformerCacheOptions extends CacheOptions {
public class FileTransformerCacheOptions extends CacheOptions {
}

9
dmp-backend/core/src/main/java/eu/eudat/service/transformer/FileTransformerConfiguration.java Normal file
View File

@ -0,0 +1,9 @@
package eu.eudat.service.transformer;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@Configuration
@EnableConfigurationProperties({FileTransformerProperties.class, FileTransformerCacheOptions.class})
public class FileTransformerConfiguration {
}

6
dmp-backend/core/src/main/java/eu/eudat/service/transformer/FileTransformerConfigurationCache.java
View File

@ -1,19 +1,15 @@
package eu.eudat.service.transformer;
import eu.eudat.configurations.deposit.DepositCacheOptions;
import eu.eudat.configurations.transformer.TransformerCacheOptions;
import eu.eudat.model.file.TransformerCacheModel;
import gr.cite.tools.cache.CacheService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
public class FileTransformerConfigurationCache extends CacheService<TransformerCacheModel> {
@Autowired
public FileTransformerConfigurationCache(TransformerCacheOptions options) {
public FileTransformerConfigurationCache(FileTransformerCacheOptions options) {
super(options);
}

6
dmp-backend/core/src/main/java/eu/eudat/configurations/transformer/TransformerProperties.java → dmp-backend/core/src/main/java/eu/eudat/service/transformer/FileTransformerProperties.java
View File

@ -1,4 +1,4 @@
package eu.eudat.configurations.transformer;
package eu.eudat.service.transformer;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.bind.ConstructorBinding;
@ -6,12 +6,12 @@ import org.springframework.boot.context.properties.bind.ConstructorBinding;
import java.util.List;
@ConfigurationProperties(prefix = "transformer")
public class TransformerProperties {
public class FileTransformerProperties {
private final List<TransformerSource> sources;
@ConstructorBinding
public TransformerProperties(List<TransformerSource> sources) {
public FileTransformerProperties(List<TransformerSource> sources) {
this.sources = sources;
}

14
dmp-backend/core/src/main/java/eu/eudat/service/transformer/FileTransformerServiceImpl.java
View File

@ -6,9 +6,7 @@ import eu.eudat.commonmodels.models.FileEnvelopeModel;
import eu.eudat.commonmodels.models.description.DescriptionModel;
import eu.eudat.commonmodels.models.dmp.DmpModel;
import eu.eudat.commons.enums.StorageType;
import eu.eudat.configurations.transformer.TransformerProperties;
import eu.eudat.file.transformer.interfaces.FileTransformerConfiguration;
import eu.eudat.file.transformer.models.misc.FileFormat;
import eu.eudat.model.Description;
import eu.eudat.model.Dmp;
import eu.eudat.model.builder.commonmodels.description.DescriptionCommonModelBuilder;
@ -43,7 +41,7 @@ import java.util.*;
public class FileTransformerServiceImpl implements FileTransformerService {
private static final Logger logger = LoggerFactory.getLogger(FileTransformerServiceImpl.class);
private final TransformerProperties transformerProperties;
private final FileTransformerProperties fileTransformerProperties;
private final Map<String, TransformerRepository> clients;
private final TokenExchangeCacheService tokenExchangeCacheService;
private final FileTransformerConfigurationCache fileTransformerConfigurationCache;
@ -54,9 +52,9 @@ public class FileTransformerServiceImpl implements FileTransformerService {
private final MessageSource messageSource;
@Autowired
public FileTransformerServiceImpl(TransformerProperties transformerProperties, TokenExchangeCacheService tokenExchangeCacheService, FileTransformerConfigurationCache fileTransformerConfigurationCache, AuthorizationService authorizationService,
QueryFactory queryFactory, BuilderFactory builderFactory, StorageFileService storageFileService, MessageSource messageSource) {
this.transformerProperties = transformerProperties;
public FileTransformerServiceImpl(FileTransformerProperties fileTransformerProperties, TokenExchangeCacheService tokenExchangeCacheService, FileTransformerConfigurationCache fileTransformerConfigurationCache, AuthorizationService authorizationService,
QueryFactory queryFactory, BuilderFactory builderFactory, StorageFileService storageFileService, MessageSource messageSource) {
this.fileTransformerProperties = fileTransformerProperties;
this.tokenExchangeCacheService = tokenExchangeCacheService;
this.fileTransformerConfigurationCache = fileTransformerConfigurationCache;
this.authorizationService = authorizationService;
@ -71,7 +69,7 @@ public class FileTransformerServiceImpl implements FileTransformerService {
if (this.clients.containsKey(repoId)) return this.clients.get(repoId);
//GK: It's register time
TransformerProperties.TransformerSource source = transformerProperties.getSources().stream().filter(depositSource -> depositSource.getTransformerId().equals(repoId)).findFirst().orElse(null);
FileTransformerProperties.TransformerSource source = fileTransformerProperties.getSources().stream().filter(depositSource -> depositSource.getTransformerId().equals(repoId)).findFirst().orElse(null);
if (source != null) {
String host = URI.create(source.getUrl()).getHost();
TokenExchangeModel tokenExchangeModel = new TokenExchangeModel(host + "_" + source.getClientId(), source.getIssuerUrl(), source.getClientId(), source.getClientSecret(), source.getScope());
@ -105,7 +103,7 @@ public class FileTransformerServiceImpl implements FileTransformerService {
if (configs == null) {
List<FileTransformerConfiguration> configurations = new ArrayList<>();
//GK: So much for lazy loading
List<TransformerRepository> repositories = transformerProperties.getSources().stream().map(depositSource -> getRepository(depositSource.getTransformerId())).toList();
List<TransformerRepository> repositories = fileTransformerProperties.getSources().stream().map(depositSource -> getRepository(depositSource.getTransformerId())).toList();
repositories = new ArrayList<>(repositories);
repositories.forEach((client) -> {

2
dmp-backend/core/src/main/java/eu/eudat/service/user/UserServiceImpl.java
View File

@ -17,7 +17,7 @@ import eu.eudat.commons.types.actionconfirmation.RemoveCredentialRequestEntity;
import eu.eudat.commons.types.notification.*;
import eu.eudat.commons.types.user.AdditionalInfoEntity;
import eu.eudat.commons.types.usercredential.UserCredentialDataEntity;
import eu.eudat.configurations.notification.NotificationProperties;
import eu.eudat.commons.notification.NotificationProperties;
import eu.eudat.convention.ConventionService;
import eu.eudat.data.*;
import eu.eudat.errorcode.ErrorThesaurusProperties;

6
dmp-backend/core/src/main/java/eu/eudat/service/visibility/VisibilityServiceImpl.java
View File

@ -3,8 +3,8 @@ package eu.eudat.service.visibility;
import eu.eudat.commons.types.description.PropertyDefinitionEntity;
import eu.eudat.commons.types.descriptiontemplate.*;
import eu.eudat.model.persist.descriptionproperties.PropertyDefinitionPersist;
import org.apache.commons.lang3.NotImplementedException;
import javax.ws.rs.NotSupportedException;
import java.util.*;
public class VisibilityServiceImpl implements VisibilityService {
@ -349,7 +349,7 @@ public class VisibilityServiceImpl implements VisibilityService {
eu.eudat.commons.enums.FieldType fieldType = rule.getFieldEntity() != null && rule.getFieldEntity().getData() != null ? rule.getFieldEntity().getData().getFieldType() : eu.eudat.commons.enums.FieldType.FREE_TEXT;
if (eu.eudat.commons.enums.FieldType.isTextType(fieldType) && field.getTextValue() != null && !field.getTextValue().isBlank()) {
if (eu.eudat.commons.enums.FieldType.UPLOAD.equals(fieldType)){
throw new NotSupportedException("Upload file rule not supported");
throw new NotImplementedException("Upload file rule not supported");
} else {
return field.getTextValue().equals(rule.getTextValue());
}
@ -364,7 +364,7 @@ public class VisibilityServiceImpl implements VisibilityService {
}
else if (eu.eudat.commons.enums.FieldType.isDateType(fieldType) && field.getDateValue() != null) return field.getDateValue().equals(rule.getDateValue());
else if (eu.eudat.commons.enums.FieldType.isExternalIdentifierType(fieldType) && field.getExternalIdentifier() != null) {
throw new NotSupportedException("External identifier rule not supported");
throw new NotImplementedException("External identifier rule not supported");
}
}
return false;

2
dmp-backend/web/src/main/java/eu/eudat/interceptors/UserInterceptor.java
View File

@ -9,7 +9,7 @@ import eu.eudat.commons.lock.LockByKeyManager;
import eu.eudat.commons.scope.user.UserScope;
import eu.eudat.commons.types.user.AdditionalInfoEntity;
import eu.eudat.commons.types.usercredential.UserCredentialDataEntity;
import eu.eudat.configurations.locale.LocaleProperties;
import eu.eudat.commons.locale.LocaleProperties;
import eu.eudat.data.UserContactInfoEntity;
import eu.eudat.data.UserCredentialEntity;
import eu.eudat.data.UserEntity;

2
dmp-backend/web/src/main/resources/config/db.yml
View File

@ -16,7 +16,7 @@ spring:
dialect: org.hibernate.dialect.PostgreSQLDialect
hibernate:
naming:
physical-strategy: eu.eudat.configurations.db.PrefixPhysicalNamingStrategy
physical-strategy: eu.eudat.data.namingstrategy.PrefixPhysicalNamingStrategy
implicit-strategy: org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
datasource:
url: ${DB_URL:}