Merge pull request #188 from kit-data-manager/development

PR for v1.5.3

Author: ThomasJejkal

CHANGELOG.md

@@ -6,12 +6,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+Added
+
 Changed
 
 Fixed
 
 Security
 
+## [1.5.3] - 2023-12-17
+Fixed
+* Added data folder creation to Docker build as workaround
+
 ## [1.5.2] - 2023-12-15
 Fixed
 * Fixed Docker build
@@ -206,7 +212,8 @@ Added
 
 - First public version
 
-[Unreleased]: https://github.com/kit-data-manager/base-repo/compare/v1.5.2...HEAD
+[Unreleased]: https://github.com/kit-data-manager/base-repo/compare/v1.5.3...HEAD
+[1.5.3]: https://github.com/kit-data-manager/base-repo/compare/v1.5.2...v1.5.3
 [1.5.2]: https://github.com/kit-data-manager/base-repo/compare/v1.5.1...v1.5.2
 [1.5.1]: https://github.com/kit-data-manager/base-repo/compare/v1.5.0...v1.5.1
 [1.5.0]: https://github.com/kit-data-manager/base-repo/compare/v1.4.0...v1.5.0

config/application-docker.properties

@@ -51,7 +51,7 @@ repo.search.index:baserepo
 # Workaround for a potential issue with spring cloud 4.1.0 that broke the elastic search proxy
 spring.cloud.gateway.proxy.sensitive=content-length
 
-repo.basepath:  file:///var/repository/ 
+repo.basepath:file:///var/repository/ 
 repo.plugin.storage.date.pathPattern: @{year}/@{month}/@{day}
 repo.plugin.versioning: simple
 repo.plugin.storage: dateBased

src/main/java/edu/kit/datamanager/repo/Application.java

@@ -59,6 +59,7 @@
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
 
@@ -71,6 +72,7 @@
 @ComponentScan({"edu.kit.datamanager"})
 @EnableElasticsearchRepositories(basePackages = "edu.kit.datamanager.repo.elastic")
 @EntityScan("edu.kit.datamanager") // if you have it
+//@EnableConfigurationProperties(ApplicationProperties.class)
 public class Application {
 
     private static final Logger LOG = LoggerFactory.getLogger(Application.class);
@@ -79,29 +81,11 @@ public class Application {
     @Autowired
     private ApplicationEventPublisher eventPublisher;
 
-    //private ApplicationProperties applicationProperties;
     @Autowired
     private IRepoVersioningService[] versioningServices;
     @Autowired
     private IRepoStorageService[] storageServices;
 
-//    @Autowired
-//    private IDataResourceDao dataResourceDao;
-//    @Autowired
-//    private ApplicationProperties applicationProperties;
-
-    /* @Autowired
-    private IDataResourceService dataResourceService;
-    @Autowired
-    private IContentInformationService contentInformationService;*/
-//  @Autowired
-//  private RequestMappingHandlerAdapter requestMappingHandlerAdapter;  
-//    @Bean
-//    @Scope("prototype")
-//    public Logger logger(InjectionPoint injectionPoint) {
-//        Class<?> targetClass = injectionPoint.getMember().getDeclaringClass();
-//        return LoggerFactory.getLogger(targetClass.getCanonicalName());
-//    }
     @Bean
     public IDataResourceService dataResourceService() {
         return new DataResourceService();
@@ -145,9 +129,8 @@ public void onRefresh(RefreshScopeRefreshedEvent event) {
 //  }
 
     @Bean
-    @ConfigurationProperties("repo")
     public ApplicationProperties applicationProperties() {
-        return new ApplicationProperties();
+        return  new ApplicationProperties();
     }
 
     @Bean

src/main/java/edu/kit/datamanager/repo/configuration/ApplicationProperties.java

@@ -16,10 +16,12 @@
 package edu.kit.datamanager.repo.configuration;
 
 import edu.kit.datamanager.configuration.GenericApplicationProperties;
+import jakarta.validation.Valid;
 import java.net.URL;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.annotation.Validated;
@@ -33,6 +35,7 @@
 @Validated
 @RefreshScope
 @EqualsAndHashCode(callSuper = true)
+@ConfigurationProperties("repo")
 public class ApplicationProperties extends GenericApplicationProperties {
 
     @edu.kit.datamanager.annotations.LocalFolderURL
@@ -54,4 +57,4 @@ public class ApplicationProperties extends GenericApplicationProperties {
     private boolean enableCsrf;
     @Value("${repo.security.allowedOriginPattern:http://localhost:*}")
     private String allowedOriginPattern;
-}
+    }

src/main/java/edu/kit/datamanager/repo/web/impl/DataResourceAuditController.java

@@ -57,8 +57,8 @@ public class DataResourceAuditController implements IDataResourceAuditController
     private Logger LOGGER = LoggerFactory.getLogger(DataResourceController.class);
 
     private final IContentInformationService contentInformationService;
-    @Autowired
-    private ApplicationProperties applicationProperties;
+   
+    private final ApplicationProperties applicationProperties;
 
     private final IAuditService<DataResource> auditService;
     private final IAuditService<ContentInformation> contentAuditService;
@@ -70,6 +70,7 @@ public class DataResourceAuditController implements IDataResourceAuditController
      * @param applicationProperties The application properties.
      * @param repositoryConfig The repository config.
      */
+    @Autowired
     public DataResourceAuditController(ApplicationProperties applicationProperties,
             RepoBaseConfiguration repositoryConfig
     ) {