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

PR for release 1.1.1

Author: ThomasJejkal

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, main ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ master, main ]
   schedule:
     - cron: '45 8 * * 2'
 

README.md

@@ -39,14 +39,14 @@ Instead of using a local build you may also use the most recent version from the
 <dependency>
     <groupId>edu.kit.datamanager</groupId>
     <artifactId>repo-core</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
 </dependency>
 ~~~~
 
 ### Gradle (short)
 
 ~~~~
-    implementation "edu.kit.datamanager:repo-core:1.1.0"
+    implementation "edu.kit.datamanager:repo-core:1.1.1"
 ~~~~
 
 ## License

build.gradle

@@ -91,11 +91,11 @@ dependencies {
     implementation "org.apache.commons:commons-collections4:4.4"
     // includes commons-lang3
     implementation "org.apache.commons:commons-text:1.10.0"
-    implementation 'org.apache.httpcomponents:httpclient:4.5.13'
+    implementation 'org.apache.httpcomponents:httpclient:4.5.14'
     implementation "org.apache.tika:tika-core:2.6.0"
     // javers
     implementation "org.javers:javers-spring-boot-starter-sql:${javersVersion}"
-    implementation "com.google.code.gson:gson:2.10"
+    implementation "com.google.code.gson:gson:2.10.1"
 
     // Database
     implementation "com.h2database:h2:2.1.214"

src/main/java/edu/kit/datamanager/service/impl/FileContentProvider.java

@@ -24,6 +24,7 @@
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -37,8 +38,8 @@
 @Component
 public class FileContentProvider implements IContentProvider{
 
-  @Autowired
-  private Logger logger;
+  private Logger logger = LoggerFactory.getLogger(FileContentProvider.class);
+
   @Autowired(required = false)
   private IRepoVersioningService[] versioningServices;
 

src/main/java/edu/kit/datamanager/service/impl/LogfileMessagingService.java

@@ -19,7 +19,7 @@
 import edu.kit.datamanager.entities.messaging.IAMQPSubmittable;
 import edu.kit.datamanager.service.IMessagingService;
 import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.actuate.health.Health;
 
 /**
@@ -28,8 +28,7 @@
  */
 public class LogfileMessagingService implements IMessagingService {
 
-    @Autowired
-    private Logger logger;
+    private Logger logger = LoggerFactory.getLogger(LogfileMessagingService.class);
 
     @Override
     public void send(IAMQPSubmittable msg) {

src/main/java/edu/kit/datamanager/service/impl/RabbitMQMessagingService.java

@@ -21,7 +21,6 @@
 import edu.kit.datamanager.repo.dao.IAMQPMessageDao;
 import edu.kit.datamanager.repo.dao.DummyAMQPMessageDao;
 import edu.kit.datamanager.repo.domain.AMQPMessage;
-import edu.kit.datamanager.repo.service.impl.DataResourceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import edu.kit.datamanager.service.IMessagingService;
 import java.util.Optional;
@@ -42,15 +41,15 @@
 public class RabbitMQMessagingService implements IMessagingService {
 
     @Autowired
-    private RabbitMQConfiguration configuration;
+    private Optional<RabbitMQConfiguration> configuration;
     @Autowired
     private Optional<IAMQPMessageDao> messageDao;
     private static final Logger logger = LoggerFactory.getLogger(RabbitMQMessagingService.class);
 
     @Override
     public void send(IAMQPSubmittable msg) {
         logger.trace("Processing new AMQPSubmittable via RabbitMQMessagingService.");
-        if (configuration.isMessagingEnabled()) {
+        if (configuration.isPresent() && configuration.get().isMessagingEnabled()) {
             logger.trace("Messaging enabled, serializing and submitting message.");
             boolean messagePreservationRequired = true;
             String msgString = null;
@@ -59,9 +58,9 @@ public void send(IAMQPSubmittable msg) {
             try {
                 msgString = msg.toJson();
                 msgRoute = msg.getRoutingKey();
-                exchangeName = configuration.rabbitMQExchange().getName();
+                exchangeName = configuration.get().rabbitMQExchange().getName();
                 logger.trace("Sending message {} via exchange {} and route {}.", msgString, exchangeName, msgRoute);
-                configuration.rabbitMQTemplate().convertAndSend(configuration.rabbitMQExchange().getName(), msgRoute, msgString);
+                configuration.get().rabbitMQTemplate().convertAndSend(configuration.get().rabbitMQExchange().getName(), msgRoute, msgString);
                 logger.trace("Message sent.");
                 messagePreservationRequired = false;
                 checkAndSendPreservedMessages();
@@ -113,7 +112,11 @@ private void checkAndSendPreservedMessages() {
     @Override
     public Health health() {
         logger.trace("Obtaining health information.");
-        return Health.up().withDetail("RabbitMQMessaging", configuration.rabbitMQExchange()).build();
+        if (!configuration.isPresent() || !configuration.get().isMessagingEnabled()) {
+            return Health.unknown().build();
+        }
+
+        return Health.up().withDetail("RabbitMQMessaging", configuration.get().rabbitMQExchange()).build();
     }
 
 }

src/test/java/edu/kit/datamanager/repo/configuration/WebSecurityConfig.java

@@ -20,6 +20,7 @@
 import edu.kit.datamanager.security.filter.NoAuthenticationFilter;
 import edu.kit.datamanager.security.filter.NoopAuthenticationEventPublisher;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
@@ -48,8 +49,7 @@
 @EnableGlobalMethodSecurity(prePostEnabled = true)
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter{
 
-  @Autowired
-  private Logger logger;
+  private Logger logger = LoggerFactory.getLogger(WebSecurityConfig.class);
 
   @Autowired
   private ApplicationProperties applicationProperties;