Update and modernize code, update dependencies (part 2)

ls1intum · Oct 5, 2024 · 3b3a6d0 · 3b3a6d0
1 parent 1005f93
commit 3b3a6d0
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 58 deletions.
diff --git a/apns/build.gradle b/apns/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id 'io.spring.dependency-management'
 }
 
-group = 'de.tum.cit.aet.artemis.push.artemispushnotificationrelay'
+group = 'de.tum.cit.aet.artemis.push'
 version = '1.0.0'
 
 java {

diff --git a/...tificationrelay/apns/ApnsSendService.java → ...it/artemis/push/apns/ApnsSendService.java b/...tificationrelay/apns/ApnsSendService.java → ...it/artemis/push/apns/ApnsSendService.java
@@ -1,11 +1,11 @@
-package de.tum.cit.artemis.push.artemispushnotificationrelay.apns;
+package de.tum.cit.artemis.push.apns;
 
 import com.eatthepath.pushy.apns.*;
 import com.eatthepath.pushy.apns.util.SimpleApnsPayloadBuilder;
 import com.eatthepath.pushy.apns.util.SimpleApnsPushNotification;
 import com.eatthepath.pushy.apns.util.concurrent.PushNotificationFuture;
-import de.tum.cit.artemis.push.artemispushnotificationrelay.common.NotificationRequest;
-import de.tum.cit.artemis.push.artemispushnotificationrelay.common.SendService;
+import de.tum.cit.artemis.push.common.NotificationRequest;
+import de.tum.cit.artemis.push.common.SendService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -86,9 +86,7 @@ private ResponseEntity<Void> sendApnsRequest(NotificationRequest request) {
             } else {
                 log.error("Notification rejected by the APNs gateway: {}", pushNotificationResponse.getRejectionReason());
 
-                pushNotificationResponse.getTokenInvalidationTimestamp().ifPresent(timestamp -> {
-                    log.error("\t…and the token is invalid as of {}", timestamp);
-                });
+                pushNotificationResponse.getTokenInvalidationTimestamp().ifPresent(timestamp -> log.error("\t... and the token is invalid as of {}", timestamp));
                 return ResponseEntity.status(HttpStatus.EXPECTATION_FAILED).build();
             }
         } catch (ExecutionException | InterruptedException e) {

diff --git a/common/build.gradle b/common/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id 'io.spring.dependency-management'
 }
 
-group = 'de.tum.cit.aet.artemis.push.artemispushnotificationrelay'
+group = 'de.tum.cit.aet.artemis.push'
 version = '1.0.0'
 
 java {

diff --git a/...tionrelay/common/NotificationRequest.java → ...emis/push/common/NotificationRequest.java b/...tionrelay/common/NotificationRequest.java → ...emis/push/common/NotificationRequest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.artemis.push.artemispushnotificationrelay.common;
+package de.tum.cit.artemis.push.common;
 
 public record NotificationRequest(String initializationVector, String payloadCipherText, String token) {
 }
diff --git a/...notificationrelay/common/SendService.java → .../cit/artemis/push/common/SendService.java b/...notificationrelay/common/SendService.java → .../cit/artemis/push/common/SendService.java
@@ -1,4 +1,4 @@
-package de.tum.cit.artemis.push.artemispushnotificationrelay.common;
+package de.tum.cit.artemis.push.common;
 
 import org.springframework.http.ResponseEntity;
 

diff --git a/firebase/build.gradle b/firebase/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id 'io.spring.dependency-management'
 }
 
-group = 'de.tum.cit.aet.artemis.push.artemispushnotificationrelay'
+group = 'de.tum.cit.aet.artemis.push'
 version = '1.0.0'
 
 java {
@@ -20,7 +20,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter'
     implementation 'org.springframework.boot:spring-boot-starter-web'
 
-    implementation "com.google.firebase:firebase-admin:9.1.1"
+    implementation "com.google.firebase:firebase-admin:9.3.0"
     implementation(project(":common"))
 }
 

diff --git a/...emis/push/artemispushnotificationrelay/firebase/FirebaseSendPushNotificationsRequest.java b/...emis/push/artemispushnotificationrelay/firebase/FirebaseSendPushNotificationsRequest.java
diff --git a/.../src/main/java/de/tum/cit/artemis/push/firebase/FirebaseSendPushNotificationsRequest.java b/.../src/main/java/de/tum/cit/artemis/push/firebase/FirebaseSendPushNotificationsRequest.java
@@ -0,0 +1,8 @@
+package de.tum.cit.artemis.push.firebase;
+
+import de.tum.cit.artemis.push.common.NotificationRequest;
+
+import java.util.List;
+
+public record FirebaseSendPushNotificationsRequest(List<NotificationRequest> notificationRequest) {
+}
diff --git a/...onrelay/firebase/FirebaseSendService.java → ...is/push/firebase/FirebaseSendService.java b/...onrelay/firebase/FirebaseSendService.java → ...is/push/firebase/FirebaseSendService.java
@@ -1,13 +1,13 @@
-package de.tum.cit.artemis.push.artemispushnotificationrelay.firebase;
+package de.tum.cit.artemis.push.firebase;
 
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
 import com.google.firebase.messaging.FirebaseMessaging;
 import com.google.firebase.messaging.FirebaseMessagingException;
 import com.google.firebase.messaging.Message;
-import de.tum.cit.artemis.push.artemispushnotificationrelay.common.NotificationRequest;
-import de.tum.cit.artemis.push.artemispushnotificationrelay.common.SendService;
+import de.tum.cit.artemis.push.common.NotificationRequest;
+import de.tum.cit.artemis.push.common.SendService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;

diff --git a/...emisPushNotificationRelayApplication.java → ...emisPushNotificationRelayApplication.java b/...emisPushNotificationRelayApplication.java → ...emisPushNotificationRelayApplication.java
@@ -1,4 +1,4 @@
-package de.tum.cit.artemis.push.artemispushnotificationrelay;
+package de.tum.cit.artemis.push;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/hermes/src/main/java/de/tum/cit/artemis/push/RelayRestController.java b/hermes/src/main/java/de/tum/cit/artemis/push/RelayRestController.java
@@ -0,0 +1,38 @@
+package de.tum.cit.artemis.push;
+
+import de.tum.cit.artemis.push.apns.ApnsSendService;
+import de.tum.cit.artemis.push.common.NotificationRequest;
+import de.tum.cit.artemis.push.firebase.FirebaseSendPushNotificationsRequest;
+import de.tum.cit.artemis.push.firebase.FirebaseSendService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/push_notification")
+public class RelayRestController {
+
+    private final FirebaseSendService firebaseSendService;
+
+    private final ApnsSendService apnsSendService;
+
+    public RelayRestController(FirebaseSendService firebaseSendService, ApnsSendService apnsSendService) {
+        this.firebaseSendService = firebaseSendService;
+        this.apnsSendService = apnsSendService;
+    }
+
+    @PostMapping("send_firebase")
+    public ResponseEntity<Void> send(@RequestBody FirebaseSendPushNotificationsRequest notificationRequests) {
+        return firebaseSendService.send(notificationRequests.notificationRequest());
+    }
+
+    @PostMapping("send_apns")
+    public ResponseEntity<Void> send(@RequestBody NotificationRequest notificationRequest) {
+        return apnsSendService.send(notificationRequest);
+    }
+
+    @GetMapping("alive")
+    public ResponseEntity<Void> alive() {
+        return ResponseEntity.ok().build();
+    }
+}
diff --git a/...c/main/java/de/tum/cit/artemis/push/artemispushnotificationrelay/RelayRestController.java b/...c/main/java/de/tum/cit/artemis/push/artemispushnotificationrelay/RelayRestController.java