Merge pull request #434 from RADAR-base/release-2.4.0

Release 2.4.0
RADAR-base · Oct 10, 2023 · ae21553 · ae21553
2 parents 25d53a8 + 7249224
commit ae21553
Show file tree

Hide file tree

Showing 26 changed files with 413 additions and 202 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,16 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
 
-    # Initializes the CodeQL tools for scanning.
+    - uses: actions/setup-java@v3
+      if: matrix.language == 'java'
+      with:
+        java-version: 17
+        distribution: temurin
+
+    - uses: gradle/gradle-build-action@v2
+      if: matrix.language == 'java'
+
+      # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
       with:

diff --git a/.gitignore b/.gitignore
@@ -45,4 +45,5 @@ bin/
 
 docker/prod
 
-*__pycache__
+*__pycache__
+google-credentials.json
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ apply plugin: 'io.spring.dependency-management'
 apply plugin: 'scala'
 
 group = 'org.radarbase'
-version = '2.3.0'
+version = '2.4.0'
 
 java {
     toolchain {
@@ -36,7 +36,7 @@ ext {
     springBootVersion = '2.6.6'
     springVersion = '6.0.6'
     springOauth2Version = "2.5.1.RELEASE"
-    springDocVersion = '1.6.14'
+    springDocVersion = '2.2.0'
     lombokVersion = '1.18.26'
     junit5Version = '5.9.2'
     radarSpringAuthVersion = '1.2.0'
@@ -57,7 +57,6 @@ sourceSets {
 
 dependencies {
     implementation('org.springframework.boot:spring-boot-starter-data-jpa')
-    implementation('org.springframework.boot:spring-boot-starter-data-rest')
     implementation('org.springframework.boot:spring-boot-starter-web')
     implementation('org.springframework.boot:spring-boot-starter-quartz')
     implementation('org.springframework.boot:spring-boot-starter-security')
@@ -68,7 +67,7 @@ dependencies {
     runtimeOnly("org.hibernate.validator:hibernate-validator:$hibernateValidatorVersion")
 
     // Open API spec
-    implementation(group: 'org.springdoc', name: 'springdoc-openapi-ui', version: springDocVersion)
+    implementation(group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-ui', version: springDocVersion)
 
 
     //runtimeOnly('org.springframework.boot:spring-boot-devtools')

diff --git a/src/integrationTest/resources/application.properties b/src/integrationTest/resources/application.properties
@@ -96,3 +96,9 @@ security.radar.managementportal.url=http://localhost:8081
 
 # Github Authentication
 security.github.client.token=
+security.github.client.timeout=10
+# max content size 1 MB
+security.github.client.maxContentLength=1000000
+security.github.cache.size=10000
+security.github.cache.duration=3600
+security.github.cache.retryDuration=60
diff --git a/src/integrationTest/resources/docker/docker-compose.yml b/src/integrationTest/resources/docker/docker-compose.yml
@@ -64,7 +64,7 @@ services:
   # Management Portal                                                         #
   #---------------------------------------------------------------------------#
   managementportal:
-    image: radarbase/management-portal:0.5.6
+    image: radarbase/management-portal:2.0.0
     ports:
       - "8081:8081"
     environment:

diff --git a/src/main/java/org/radarbase/appserver/controller/GithubEndpoint.java b/src/main/java/org/radarbase/appserver/controller/GithubEndpoint.java
@@ -22,7 +22,7 @@
 package org.radarbase.appserver.controller;
 
 import org.radarbase.appserver.config.AuthConfig;
-import org.radarbase.appserver.service.GithubClient;
+import org.radarbase.appserver.service.GithubService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -32,18 +32,17 @@
 import org.springframework.web.bind.annotation.RestController;
 import radar.spring.auth.common.Authorized;
 
-import java.io.IOException;
 import java.net.MalformedURLException;
 
 @CrossOrigin
 @RestController
 public class GithubEndpoint {
 
-    private transient GithubClient githubClient;
+    private final transient GithubService githubService;
 
     @Autowired
-    public GithubEndpoint(GithubClient githubClient) {
-        this.githubClient = githubClient;
+    public GithubEndpoint(GithubService githubService) {
+        this.githubService = githubService;
     }
 
     @Authorized(
@@ -53,13 +52,13 @@ public GithubEndpoint(GithubClient githubClient) {
             PathsUtil.GITHUB_PATH
             + "/" +
             PathsUtil.GITHUB_CONTENT_PATH)
-    public ResponseEntity getGithubContent(@RequestParam() String url
+    public ResponseEntity<String> getGithubContent(@RequestParam() String url
     ) {
         try {
-            return ResponseEntity.ok().body(this.githubClient.getGithubContent(url));
+            return ResponseEntity.ok().body(this.githubService.getGithubContent(url));
         } catch (MalformedURLException e) {
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(e.getMessage());
-        } catch (IOException | InterruptedException e) {
+        } catch (Exception e) {
             return ResponseEntity.status(HttpStatus.BAD_GATEWAY).body("Error getting content from Github.");
         }
     }

diff --git a/src/main/java/org/radarbase/appserver/entity/User.java b/src/main/java/org/radarbase/appserver/entity/User.java
@@ -22,23 +22,36 @@
 package org.radarbase.appserver.entity;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-
-import java.io.Serializable;
-import java.time.Instant;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import jakarta.persistence.*;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
-
 import lombok.Getter;
 import lombok.ToString;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 import org.radarbase.appserver.dto.fcm.FcmUserDto;
 import org.springframework.lang.Nullable;
 
+import java.io.Serializable;
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
 /**
  * {@link Entity} for persisting users. The corresponding DTO is {@link FcmUserDto}. A {@link
  * Project} can have multiple {@link User} (Many-to-One).
@@ -97,7 +110,7 @@ public class User extends AuditModel implements Serializable {
     @CollectionTable(name = "attributes_map")
     @MapKeyColumn(name = "key", nullable = true)
     @Column(name = "value")
-    private Map<String, String> attributes = new HashMap<String, String>();
+    private Map<String, String> attributes = new HashMap<>();
 
     public User setSubjectId(String subjectId) {
         this.subjectId = subjectId;

diff --git a/src/main/java/org/radarbase/appserver/event/state/MessageStateEventListener.java b/src/main/java/org/radarbase/appserver/event/state/MessageStateEventListener.java
@@ -23,14 +23,18 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
 import org.radarbase.appserver.event.state.dto.DataMessageStateEventDto;
 import org.radarbase.appserver.event.state.dto.NotificationStateEventDto;
 import org.radarbase.appserver.service.DataMessageStateEventService;
 import org.radarbase.appserver.service.NotificationStateEventService;
-import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.event.TransactionalEventListener;
+
+import java.util.Map;
 
 @Slf4j
 @Component
@@ -55,7 +59,9 @@ public MessageStateEventListener(ObjectMapper objectMapper,
      *
      * @param event the event to respond to
      */
-    @EventListener(value = NotificationStateEventDto.class)
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    @TransactionalEventListener(classes = NotificationStateEventDto.class)
+    @Async
     public void onNotificationStateChange(NotificationStateEventDto event) {
         String info = convertMapToString(event.getAdditionalInfo());
         log.debug("ID: {}, STATE: {}", event.getNotification().getId(), event.getState());
@@ -65,7 +71,9 @@ public void onNotificationStateChange(NotificationStateEventDto event) {
         notificationStateEventService.addNotificationStateEvent(eventEntity);
     }
 
-    @EventListener(value = DataMessageStateEventDto.class)
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    @TransactionalEventListener(value = DataMessageStateEventDto.class)
+    @Async
     public void onDataMessageStateChange(DataMessageStateEventDto event) {
         String info = convertMapToString(event.getAdditionalInfo());
         log.debug("ID: {}, STATE: {}", event.getDataMessage().getId(), event.getState());

diff --git a/src/main/java/org/radarbase/appserver/event/state/TaskStateEventListener.java b/src/main/java/org/radarbase/appserver/event/state/TaskStateEventListener.java
@@ -24,10 +24,15 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.radarbase.appserver.event.state.dto.NotificationStateEventDto;
 import org.radarbase.appserver.event.state.dto.TaskStateEventDto;
 import org.radarbase.appserver.service.TaskStateEventService;
 import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.event.TransactionalEventListener;
 
 import java.util.Map;
 
@@ -51,7 +56,9 @@ public TaskStateEventListener(ObjectMapper objectMapper,
      *
      * @param event the event to respond to
      */
-    @EventListener(value = TaskStateEventDto.class)
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    @TransactionalEventListener(classes = TaskStateEventDto.class)
+    @Async
     public void onTaskStateChange(TaskStateEventDto event) {
         String info = convertMapToString(event.getAdditionalInfo());
         log.debug("ID: {}, STATE: {}", event.getTask().getId(), event.getState());

diff --git a/src/main/java/org/radarbase/appserver/exception/NotificationAlreadyExistsException.java b/src/main/java/org/radarbase/appserver/exception/NotificationAlreadyExistsException.java
@@ -23,7 +23,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.NoArgsConstructor;
-import net.minidev.json.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.radarbase.appserver.dto.fcm.FcmNotificationDto;
 
 /**

diff --git a/src/main/java/org/radarbase/appserver/repository/DataMessageRepository.java b/src/main/java/org/radarbase/appserver/repository/DataMessageRepository.java
@@ -26,14 +26,12 @@
 import java.util.Optional;
 import org.radarbase.appserver.entity.DataMessage;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 import org.springframework.stereotype.Repository;
 
 /**
  * @author yatharthranjan
  */
 @Repository
-@RepositoryRestResource(exported = false)
 public interface DataMessageRepository extends JpaRepository<DataMessage, Long> {
 
     List<DataMessage> findByUserId(Long userId);

diff --git a/src/main/java/org/radarbase/appserver/repository/DataMessageStateEventRepository.java b/src/main/java/org/radarbase/appserver/repository/DataMessageStateEventRepository.java
@@ -24,11 +24,9 @@
 import java.util.List;
 import org.radarbase.appserver.entity.DataMessageStateEvent;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 import org.springframework.stereotype.Repository;
 
 @Repository
-@RepositoryRestResource(exported = false)
 public interface DataMessageStateEventRepository extends
         JpaRepository<DataMessageStateEvent, Long> {
 

diff --git a/src/main/java/org/radarbase/appserver/repository/NotificationRepository.java b/src/main/java/org/radarbase/appserver/repository/NotificationRepository.java
@@ -27,12 +27,10 @@
 import jakarta.validation.constraints.NotNull;
 import org.radarbase.appserver.entity.Notification;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 import org.springframework.stereotype.Repository;
 
 /** @author yatharthranjan */
 @Repository
-@RepositoryRestResource(exported = false)
 public interface NotificationRepository extends JpaRepository<Notification, Long> {
 
     List<Notification> findByUserId(Long userId);

diff --git a/src/main/java/org/radarbase/appserver/repository/NotificationStateEventRepository.java b/src/main/java/org/radarbase/appserver/repository/NotificationStateEventRepository.java
@@ -24,11 +24,9 @@
 import java.util.List;
 import org.radarbase.appserver.entity.NotificationStateEvent;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 import org.springframework.stereotype.Repository;
 
 @Repository
-@RepositoryRestResource(exported = false)
 public interface NotificationStateEventRepository extends
     JpaRepository<NotificationStateEvent, Long> {
 

diff --git a/src/main/java/org/radarbase/appserver/repository/ProjectRepository.java b/src/main/java/org/radarbase/appserver/repository/ProjectRepository.java
@@ -24,12 +24,10 @@
 import java.util.Optional;
 import org.radarbase.appserver.entity.Project;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 import org.springframework.stereotype.Repository;
 
 /** @author yatharthranjan */
 @Repository
-@RepositoryRestResource(exported = false)
 public interface ProjectRepository extends JpaRepository<Project, Long> {
 
   Optional<Project> findByProjectId(String projectId);

diff --git a/src/main/java/org/radarbase/appserver/repository/TaskStateEventRepository.java b/src/main/java/org/radarbase/appserver/repository/TaskStateEventRepository.java
@@ -23,13 +23,11 @@
 
 import org.radarbase.appserver.entity.TaskStateEvent;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
 @Repository
-@RepositoryRestResource(exported = false)
 public interface TaskStateEventRepository extends
         JpaRepository<TaskStateEvent, Long> {
 

diff --git a/src/main/java/org/radarbase/appserver/repository/UserRepository.java b/src/main/java/org/radarbase/appserver/repository/UserRepository.java
@@ -26,12 +26,10 @@
 import jakarta.validation.constraints.NotNull;
 import org.radarbase.appserver.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 import org.springframework.stereotype.Repository;
 
 /** @author yatharthranjan */
 @Repository
-@RepositoryRestResource(exported = false)
 public interface UserRepository extends JpaRepository<User, Long> {
 
   Optional<User> findBySubjectId(String subjectId);