fix outdated code (#66)

yiliuTo · web-flow · commit caf2a841ffd0 · 2025-11-04T18:26:30.000+08:00
diff --git a/asset-manager/web/pom.xml b/asset-manager/web/pom.xml
@@ -11,7 +11,6 @@
 
     <properties>
         <aws-sdk.version>2.25.13</aws-sdk.version>
-        <version.spring.cloud.azure>5.19.0</version.spring.cloud.azure>
     </properties>
 
     <artifactId>assets-manager-web</artifactId>
@@ -28,22 +27,12 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.azure.spring</groupId>
-             <artifactId>spring-cloud-azure-starter</artifactId>
-         </dependency>
-         <dependency>
-             <groupId>com.azure.spring</groupId>
-             <artifactId>spring-messaging-azure-servicebus</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-storage-blob</artifactId>
-            <version>12.29.0</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-identity</artifactId>
-            <version>1.14.2</version>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>s3</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -80,17 +69,10 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>com.azure</groupId>
-                <artifactId>azure-storage-blob-batch</artifactId>
-                <version>12.25.0</version>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>s3</artifactId>
+                <version>${aws-sdk.version}</version>
             </dependency>
-            <dependency>
-                 <groupId>com.azure.spring</groupId>
-                 <artifactId>spring-cloud-azure-dependencies</artifactId>
-                 <version>${version.spring.cloud.azure}</version>
-                 <type>pom</type>
-                 <scope>import</scope>
-             </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/asset-manager/web/src/main/java/com/microsoft/migration/assets/AssetsManagerApplication.java b/asset-manager/web/src/main/java/com/microsoft/migration/assets/AssetsManagerApplication.java
@@ -1,12 +1,12 @@
 package com.microsoft.migration.assets;
 
-import com.azure.spring.messaging.implementation.annotation.EnableAzureMessaging;
+import org.springframework.amqp.rabbit.annotation.EnableRabbit;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.ApplicationPidFileWriter;
 
 @SpringBootApplication
-@EnableAzureMessaging
+@EnableRabbit
 public class AssetsManagerApplication {
     public static void main(String[] args) {
         SpringApplication application = new SpringApplication(AssetsManagerApplication.class);
diff --git a/asset-manager/web/src/main/java/com/microsoft/migration/assets/config/AwsS3Config.java b/asset-manager/web/src/main/java/com/microsoft/migration/assets/config/AwsS3Config.java
@@ -1,23 +1,31 @@
 package com.microsoft.migration.assets.config;
 
-import com.azure.identity.DefaultAzureCredentialBuilder;
-import com.azure.storage.blob.BlobServiceClient;
-import com.azure.storage.blob.BlobServiceClientBuilder;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+
 @Configuration
 public class AwsS3Config {
 
-    @Value("${azure.storage.account-name}")
-    private String accountName;
+    @Value("${aws.accessKey}")
+    private String accessKey;
+
+    @Value("${aws.secretKey}")
+    private String secretKey;
+
+    @Value("${aws.region}")
+    private String region;
 
-    @Bean
-    public BlobServiceClient blobServiceClient() {
-        return new BlobServiceClientBuilder()
-                .endpoint("https://" + accountName + ".blob.core.windows.net")
-                .credential(new DefaultAzureCredentialBuilder().build())
-                .buildClient();
+    public S3Client s3Client() {
+        AwsBasicCredentials awsCredentials = AwsBasicCredentials.create(accessKey, secretKey);
+        
+        return S3Client.builder()
+                .region(Region.of(region))
+                .credentialsProvider(StaticCredentialsProvider.create(awsCredentials))
+                .build();
     }
 }
diff --git a/asset-manager/web/src/main/java/com/microsoft/migration/assets/config/RabbitConfig.java b/asset-manager/web/src/main/java/com/microsoft/migration/assets/config/RabbitConfig.java
@@ -11,8 +11,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import java.time.Duration;
-
 @Configuration
 public class RabbitConfig {
     public static final String IMAGE_PROCESSING_QUEUE = "image-processing";
@@ -24,30 +22,8 @@ public Queue imageProcessingQueue() {
     }
 
     @Bean
-    public QueueProperties imageProcessingQueue(ServiceBusAdministrationClient adminClient, QueueProperties retryQueue) {
-        QueueProperties queue;
-        try {
-            queue = adminClient.getQueue(IMAGE_PROCESSING_QUEUE);
-        } catch (ResourceNotFoundException e) {
-            try {
-                CreateQueueOptions options = new CreateQueueOptions()
-                    .setForwardDeadLetteredMessagesTo(RETRY_QUEUE);
-                queue = adminClient.createQueue(IMAGE_PROCESSING_QUEUE, options);
-            } catch (ResourceExistsException ex) {
-                // Queue was created by another instance in the meantime
-                queue = adminClient.getQueue(IMAGE_PROCESSING_QUEUE);
-            }
-        }
-        
-        // Configure retry queue's DLQ forwarding now that image processing queue exists
-        try {
-            retryQueue.setForwardDeadLetteredMessagesTo(IMAGE_PROCESSING_QUEUE);
-            adminClient.updateQueue(retryQueue);
-        } catch (Exception ex) {
-            // Ignore update errors since basic functionality will still work
-        }
-        
-        return queue;
+    public MessageConverter jsonMessageConverter() {
+        return new Jackson2JsonMessageConverter();
     }
 
     @Bean
@@ -60,4 +36,5 @@ public SimpleRabbitListenerContainerFactory rabbitListenerContainerFactory(
         factory.setAcknowledgeMode(AcknowledgeMode.MANUAL);
         return factory;
     }
-}
+
+}
diff --git a/asset-manager/web/src/main/java/com/microsoft/migration/assets/service/AwsS3Service.java b/asset-manager/web/src/main/java/com/microsoft/migration/assets/service/AwsS3Service.java
@@ -1,22 +1,18 @@
 package com.microsoft.migration.assets.service;
 
-import com.azure.identity.DefaultAzureCredentialBuilder;
-import com.azure.storage.blob.BlobServiceClient;
-import com.azure.storage.blob.BlobServiceClientBuilder;
-import com.azure.storage.blob.models.BlobHttpHeaders;
-import com.azure.storage.blob.models.BlobItem;
-import com.azure.storage.blob.options.BlobParallelUploadOptions;
 import com.microsoft.migration.assets.model.ImageMetadata;
 import com.microsoft.migration.assets.model.ImageProcessingMessage;
 import com.microsoft.migration.assets.model.S3StorageItem;
 import com.microsoft.migration.assets.repository.ImageMetadataRepository;
 import lombok.RequiredArgsConstructor;
-import com.azure.spring.messaging.servicebus.core.ServiceBusTemplate;
- import org.springframework.messaging.support.MessageBuilder;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.*;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -32,31 +28,37 @@
 @Profile("!dev") // Active when not in dev profile
 public class AwsS3Service implements StorageService {
 
-    private final BlobServiceClient blobServiceClient;
-    private final ServiceBusTemplate serviceBusTemplate;
+    private final S3Client s3Client;
+    private final RabbitTemplate rabbitTemplate;
     private final ImageMetadataRepository imageMetadataRepository;
 
-    @Value("${azure.storage.blob.container-name}")
-    private String containerName;
+    @Value("${aws.s3.bucket}")
+    private String bucketName;
 
     @Override
     public List<S3StorageItem> listObjects() {
-        return blobServiceClient.getBlobContainerClient(containerName).listBlobs().stream()
-                .map(blobItem -> {
+        ListObjectsV2Request request = ListObjectsV2Request.builder()
+                .bucket(bucketName)
+                .build();
+
+        ListObjectsV2Response response = s3Client.listObjectsV2(request);
+
+        return response.contents().stream()
+                .map(s3Object -> {
                     // Try to get metadata for upload time
                     Instant uploadedAt = imageMetadataRepository.findAll().stream()
-                            .filter(metadata -> metadata.getS3Key().equals(blobItem.getName()))
+                            .filter(metadata -> metadata.getS3Key().equals(s3Object.key()))
                             .map(metadata -> metadata.getUploadedAt().atZone(java.time.ZoneId.systemDefault()).toInstant())
                             .findFirst()
-                            .orElse(blobItem.getProperties().getLastModified().toInstant()); // fallback to lastModified if metadata not found
+                            .orElse(s3Object.lastModified()); // fallback to lastModified if metadata not found
 
                     return new S3StorageItem(
-                            blobItem.getName(),
-                            extractFilename(blobItem.getName()),
-                            blobItem.getProperties().getContentLength(),
-                            blobItem.getProperties().getLastModified().toInstant(),
+                            s3Object.key(),
+                            extractFilename(s3Object.key()),
+                            s3Object.size(),
+                            s3Object.lastModified(),
                             uploadedAt,
-                            generateUrl(blobItem.getName())
+                            generateUrl(s3Object.key())
                     );
                 })
                 .collect(Collectors.toList());
@@ -65,11 +67,13 @@ public List<S3StorageItem> listObjects() {
     @Override
     public void uploadObject(MultipartFile file) throws IOException {
         String key = generateKey(file.getOriginalFilename());
-
-        var blobClient = blobServiceClient.getBlobContainerClient(containerName).getBlobClient(key);
-        BlobHttpHeaders headers = new BlobHttpHeaders().setContentType(file.getContentType());
-        BlobParallelUploadOptions options = new BlobParallelUploadOptions(file.getInputStream()).setHeaders(headers);
-        blobClient.uploadWithResponse(options, null, null);
+        PutObjectRequest request = PutObjectRequest.builder()
+                .bucket(bucketName)
+                .key(key)
+                .contentType(file.getContentType())
+                .build();
+        
+        s3Client.putObject(request, RequestBody.fromInputStream(file.getInputStream(), file.getSize()));
 
         // Send message to queue for thumbnail generation
         ImageProcessingMessage message = new ImageProcessingMessage(
@@ -78,7 +82,7 @@ public void uploadObject(MultipartFile file) throws IOException {
             getStorageType(),
             file.getSize()
         );
-        serviceBusTemplate.send(IMAGE_PROCESSING_QUEUE, MessageBuilder.withPayload(message).build());
+        rabbitTemplate.convertAndSend(IMAGE_PROCESSING_QUEUE, message);
 
         // Create and save metadata to database
         ImageMetadata metadata = new ImageMetadata();
@@ -94,23 +98,31 @@ public void uploadObject(MultipartFile file) throws IOException {
 
     @Override
     public InputStream getObject(String key) throws IOException {
-        return blobServiceClient.getBlobContainerClient(containerName)
-                .getBlobClient(key)
-                .openInputStream();
+        GetObjectRequest request = GetObjectRequest.builder()
+                .bucket(bucketName)
+                .key(key)
+                .build();
+        
+        return s3Client.getObject(request);
     }
 
     @Override
     public void deleteObject(String key) throws IOException {
         // Delete both original and thumbnail if it exists
-        blobServiceClient.getBlobContainerClient(containerName)
-                .getBlobClient(key)
-                .delete();
+        DeleteObjectRequest request = DeleteObjectRequest.builder()
+                .bucket(bucketName)
+                .key(key)
+                .build();
+        
+        s3Client.deleteObject(request);
 
         try {
             // Try to delete thumbnail if it exists
-            blobServiceClient.getBlobContainerClient(containerName)
-                    .getBlobClient(getThumbnailKey(key))
-                    .delete();
+            DeleteObjectRequest thumbnailRequest = DeleteObjectRequest.builder()
+                    .bucket(bucketName)
+                    .key(getThumbnailKey(key))
+                    .build();
+            s3Client.deleteObject(thumbnailRequest);
         } catch (Exception e) {
             // Ignore if thumbnail doesn't exist
         }
@@ -124,7 +136,7 @@ public void deleteObject(String key) throws IOException {
 
     @Override
     public String getStorageType() {
-        return "azure";
+        return "s3";
     }
 
     private String extractFilename(String key) {
@@ -134,9 +146,11 @@ private String extractFilename(String key) {
     }
 
     private String generateUrl(String key) {
-        return blobServiceClient.getBlobContainerClient(containerName)
-                .getBlobClient(key)
-                .getBlobUrl();
+        GetUrlRequest request = GetUrlRequest.builder()
+                .bucket(bucketName)
+                .key(key)
+                .build();
+        return s3Client.utilities().getUrl(request).toString();
     }
 
     private String generateKey(String filename) {
diff --git a/asset-manager/web/src/main/java/com/microsoft/migration/assets/service/BackupMessageProcessor.java b/asset-manager/web/src/main/java/com/microsoft/migration/assets/service/BackupMessageProcessor.java
@@ -1,16 +1,17 @@
 package com.microsoft.migration.assets.service;
 
 import com.microsoft.migration.assets.model.ImageProcessingMessage;
-import com.azure.spring.messaging.servicebus.implementation.core.annotation.ServiceBusListener;
-import com.azure.messaging.servicebus.ServiceBusReceivedMessageContext;
-import com.azure.spring.messaging.servicebus.support.ServiceBusMessageHeaders;
+import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.amqp.support.AmqpHeaders;
 import org.springframework.messaging.handler.annotation.Header;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
 import static com.microsoft.migration.assets.config.RabbitConfig.IMAGE_PROCESSING_QUEUE;
 
+import java.io.IOException;
 
 /**
  * A backup message processor that serves as a monitoring and logging service.
@@ -24,28 +25,28 @@ public class BackupMessageProcessor {
 
     /**
      * Processes image messages from a backup queue for monitoring and resilience purposes.
-     * Uses the same Azure Service Bus API pattern as the worker module.
+     * Uses the same RabbitMQ API pattern as the worker module.
      */
-    @ServiceBusListener(destination = IMAGE_PROCESSING_QUEUE)
+    @RabbitListener(queues = IMAGE_PROCESSING_QUEUE)
     public void processBackupMessage(final ImageProcessingMessage message, 
-                                    @Header(ServiceBusMessageHeaders.RECEIVED_MESSAGE_CONTEXT) ServiceBusReceivedMessageContext context) {
-
+                                    Channel channel, 
+                                    @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) {
         try {
             log.info("[BACKUP] Monitoring message: {}", message.getKey());
             log.info("[BACKUP] Content type: {}, Storage: {}, Size: {}", 
                     message.getContentType(), message.getStorageType(), message.getSize());
             
             // Acknowledge the message
-            context.complete();
+            channel.basicAck(deliveryTag, false);
             log.info("[BACKUP] Successfully processed message: {}", message.getKey());
         } catch (Exception e) {
             log.error("[BACKUP] Failed to process message: " + message.getKey(), e);
             
             try {
-                // Reject the message and dead letter it
-                context.deadLetter();
+                // Reject the message and requeue it
+                channel.basicNack(deliveryTag, false, true);
                 log.warn("[BACKUP] Message requeued: {}", message.getKey());
-            } catch (Exception ackEx) {
+            } catch (IOException  ackEx) {
                 log.error("[BACKUP] Error handling RabbitMQ acknowledgment: {}", message.getKey(), ackEx);
             }
         }
diff --git a/asset-manager/web/src/main/java/com/microsoft/migration/assets/service/LocalFileStorageService.java b/asset-manager/web/src/main/java/com/microsoft/migration/assets/service/LocalFileStorageService.java
diff --git a/asset-manager/web/src/main/resources/application.properties b/asset-manager/web/src/main/resources/application.properties
