Skip to content

Commit d3e10c8

Browse files
sankeerthbakkisankeerthbakki
committed
Commented out all SQS related code
1 parent e7f4307 commit d3e10c8

7 files changed

Lines changed: 1203 additions & 1203 deletions

File tree

‎pom.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -109,17 +109,17 @@
109109
<artifactId>spring-boot-starter-aop</artifactId>
110110
</dependency>
111111

112-
<dependency>
113-
<groupId>software.amazon.awssdk</groupId>
114-
<artifactId>sqs</artifactId>
115-
<version>2.27.5</version>
116-
</dependency>
117-
118-
<dependency>
119-
<groupId>io.awspring.cloud</groupId>
120-
<artifactId>spring-cloud-aws-sqs</artifactId>
121-
<version>3.2.0-M1</version>
122-
</dependency>
112+
<!-- <dependency>-->
113+
<!-- <groupId>software.amazon.awssdk</groupId>-->
114+
<!-- <artifactId>sqs</artifactId>-->
115+
<!-- <version>2.27.5</version>-->
116+
<!-- </dependency>-->
117+
118+
<!-- <dependency>-->
119+
<!-- <groupId>io.awspring.cloud</groupId>-->
120+
<!-- <artifactId>spring-cloud-aws-sqs</artifactId>-->
121+
<!-- <version>3.2.0-M1</version>-->
122+
<!-- </dependency>-->
123123

124124
</dependencies>
125125

‎src/main/java/org/sfa/request/config/SQSConfig.java‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
1-
package org.sfa.request.config;
2-
3-
import org.springframework.beans.factory.annotation.Value;
4-
import org.springframework.context.annotation.Bean;
5-
import org.springframework.context.annotation.Configuration;
6-
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
7-
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
8-
import software.amazon.awssdk.regions.Region;
9-
import software.amazon.awssdk.services.sqs.SqsAsyncClient;
10-
import io.awspring.cloud.sqs.operations.SqsTemplate;
11-
import io.awspring.cloud.sqs.config.SqsMessageListenerContainerFactory;
12-
13-
/**
14-
* ClassName: SQSConfig
15-
* Package: org.sfa.request.config
16-
* Description:
17-
*
18-
* @author Fan Peng
19-
* Create 2024/8/14 23:23
20-
* @version 1.0
21-
*/
22-
@Configuration
23-
public class SQSConfig {
24-
25-
@Value("${cloud.aws.credentials.access-key}")
26-
private String accessKey;
27-
28-
@Value("${cloud.aws.credentials.secret-key}")
29-
private String secretKey;
30-
31-
@Value("${cloud.aws.region.static}")
32-
private String region;
33-
34-
@Bean
35-
public SqsAsyncClient sqsAsyncClient() {
36-
AwsBasicCredentials awsCredentials = AwsBasicCredentials.create(accessKey, secretKey);
37-
return SqsAsyncClient.builder()
38-
.region(Region.of(region))
39-
.credentialsProvider(StaticCredentialsProvider.create(awsCredentials))
40-
.build();
41-
}
42-
43-
@Bean
44-
public SqsTemplate sqsTemplate(SqsAsyncClient sqsAsyncClient) {
45-
return SqsTemplate.builder().sqsAsyncClient(sqsAsyncClient).build();
46-
}
47-
48-
@Bean
49-
public SqsMessageListenerContainerFactory<?> defaultSqsListenerContainerFactory(SqsAsyncClient sqsAsyncClient) {
50-
return SqsMessageListenerContainerFactory
51-
.builder()
52-
.sqsAsyncClient(sqsAsyncClient)
53-
.build();
54-
}
55-
}
1+
//package org.sfa.request.config;
2+
//
3+
//import org.springframework.beans.factory.annotation.Value;
4+
//import org.springframework.context.annotation.Bean;
5+
//import org.springframework.context.annotation.Configuration;
6+
//import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
7+
//import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
8+
//import software.amazon.awssdk.regions.Region;
9+
//import software.amazon.awssdk.services.sqs.SqsAsyncClient;
10+
//import io.awspring.cloud.sqs.operations.SqsTemplate;
11+
//import io.awspring.cloud.sqs.config.SqsMessageListenerContainerFactory;
12+
//
13+
///**
14+
// * ClassName: SQSConfig
15+
// * Package: org.sfa.request.config
16+
// * Description:
17+
// *
18+
// * @author Fan Peng
19+
// * Create 2024/8/14 23:23
20+
// * @version 1.0
21+
// */
22+
//@Configuration
23+
//public class SQSConfig {
24+
//
25+
// @Value("${cloud.aws.credentials.access-key}")
26+
// private String accessKey;
27+
//
28+
// @Value("${cloud.aws.credentials.secret-key}")
29+
// private String secretKey;
30+
//
31+
// @Value("${cloud.aws.region.static}")
32+
// private String region;
33+
//
34+
// @Bean
35+
// public SqsAsyncClient sqsAsyncClient() {
36+
// AwsBasicCredentials awsCredentials = AwsBasicCredentials.create(accessKey, secretKey);
37+
// return SqsAsyncClient.builder()
38+
// .region(Region.of(region))
39+
// .credentialsProvider(StaticCredentialsProvider.create(awsCredentials))
40+
// .build();
41+
// }
42+
//
43+
// @Bean
44+
// public SqsTemplate sqsTemplate(SqsAsyncClient sqsAsyncClient) {
45+
// return SqsTemplate.builder().sqsAsyncClient(sqsAsyncClient).build();
46+
// }
47+
//
48+
// @Bean
49+
// public SqsMessageListenerContainerFactory<?> defaultSqsListenerContainerFactory(SqsAsyncClient sqsAsyncClient) {
50+
// return SqsMessageListenerContainerFactory
51+
// .builder()
52+
// .sqsAsyncClient(sqsAsyncClient)
53+
// .build();
54+
// }
55+
//}

‎src/main/java/org/sfa/request/controller/RequestController.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ public class RequestController {
4949
private final RequestService requestService;
5050
private final LocaleResolver localeResolver;
5151

52-
private final SQSService sqsService;
53-
private final MessageSource messageSource;
52+
// private final SQSService sqsService;
53+
// private final MessageSource messageSource;
5454

5555
@Operation(
5656
summary = "Create a new request",
@@ -223,20 +223,20 @@ public ResponseEntity<SaayamResponse<Request>> resumeRequest(
223223
return ResponseEntity.ok(response);
224224
}
225225

226-
@PostMapping("/{requestId}/sendToQueue")
227-
public ResponseEntity<SaayamResponse<Void>> sendRequestToQueue(
228-
@PathVariable @NotNull String requesterId,
229-
@PathVariable @NotNull String requestId,
230-
HttpServletRequest request
231-
) {
232-
Locale locale = localeResolver.resolveLocale(request);
233-
SaayamResponse<Request> requestResponse = requestService.getRequestById(requesterId, requestId, locale);
234-
Request foundRequest = requestResponse.getData();
235-
236-
String message = JsonConverter.convertRequestToJson(foundRequest);
237-
sqsService.sendMessage(message);
238-
239-
String successMessage = messageSource.getMessage("success.requestSentToQueue", new Object[]{requestId}, locale);
240-
return ResponseEntity.ok(SaayamResponse.success(SaayamStatusCode.REQUEST_SENT_TO_QUEUE, successMessage, null));
241-
}
226+
// @PostMapping("/{requestId}/sendToQueue")
227+
// public ResponseEntity<SaayamResponse<Void>> sendRequestToQueue(
228+
// @PathVariable @NotNull String requesterId,
229+
// @PathVariable @NotNull String requestId,
230+
// HttpServletRequest request
231+
// ) {
232+
// Locale locale = localeResolver.resolveLocale(request);
233+
// SaayamResponse<Request> requestResponse = requestService.getRequestById(requesterId, requestId, locale);
234+
// Request foundRequest = requestResponse.getData();
235+
//
236+
// String message = JsonConverter.convertRequestToJson(foundRequest);
237+
// sqsService.sendMessage(message);
238+
//
239+
// String successMessage = messageSource.getMessage("success.requestSentToQueue", new Object[]{requestId}, locale);
240+
// return ResponseEntity.ok(SaayamResponse.success(SaayamStatusCode.REQUEST_SENT_TO_QUEUE, successMessage, null));
241+
// }
242242
}

‎src/main/java/org/sfa/request/listener/SQSListener.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
package org.sfa.request.listener;
2-
3-
import io.awspring.cloud.sqs.annotation.SqsListener;
4-
import org.springframework.stereotype.Component;
5-
6-
/**
7-
* ClassName: SQSListener
8-
* Package: org.sfa.request.listener
9-
* Description:
10-
*
11-
* @author Fan Peng
12-
* Create 2024/8/14 23:52
13-
* @version 1.0
14-
*/
15-
@Component
16-
public class SQSListener {
17-
18-
@SqsListener("${sqs.url}")
19-
public void receiveMessage(String message) {
20-
System.out.println("Received message: " + message);
21-
}
22-
}
1+
//package org.sfa.request.listener;
2+
//
3+
//import io.awspring.cloud.sqs.annotation.SqsListener;
4+
//import org.springframework.stereotype.Component;
5+
//
6+
///**
7+
// * ClassName: SQSListener
8+
// * Package: org.sfa.request.listener
9+
// * Description:
10+
// *
11+
// * @author Fan Peng
12+
// * Create 2024/8/14 23:52
13+
// * @version 1.0
14+
// */
15+
//@Component
16+
//public class SQSListener {
17+
//
18+
// @SqsListener("${sqs.url}")
19+
// public void receiveMessage(String message) {
20+
// System.out.println("Received message: " + message);
21+
// }
22+
//}

‎src/main/java/org/sfa/request/service/impl/SQSServiceImpl.java‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
package org.sfa.request.service.impl;
2-
3-
import io.awspring.cloud.sqs.operations.SqsTemplate;
4-
import org.sfa.request.service.api.SQSService;
5-
import org.springframework.beans.factory.annotation.Value;
6-
import org.springframework.stereotype.Service;
7-
import org.sfa.request.config.ObjectMapperConfig;
8-
import com.fasterxml.jackson.core.JsonProcessingException;
9-
10-
/**
11-
* ClassName: SQSServiceImpl
12-
* Package: org.sfa.request.service.impl
13-
* Description:
14-
*
15-
* @author Fan Peng
16-
* Create 2024/8/15 23:45
17-
* @version 1.0
18-
*/
19-
@Service
20-
public class SQSServiceImpl implements SQSService {
21-
22-
private final SqsTemplate sqsTemplate;
23-
private final String sqsUrl;
24-
25-
public SQSServiceImpl(SqsTemplate sqsTemplate, @Value("${sqs.url}") String sqsUrl) {
26-
this.sqsTemplate = sqsTemplate;
27-
this.sqsUrl = sqsUrl;
28-
}
29-
30-
@Override
31-
public void sendMessage(Object message) {
32-
try {
33-
String jsonMessage = ObjectMapperConfig.getObjectMapper().writeValueAsString(message);
34-
sqsTemplate.send(sqsUrl, jsonMessage);
35-
} catch (JsonProcessingException e) {
36-
throw new RuntimeException("Error converting message to JSON", e);
37-
}
38-
}
39-
}
1+
//package org.sfa.request.service.impl;
2+
//
3+
//import io.awspring.cloud.sqs.operations.SqsTemplate;
4+
//import org.sfa.request.service.api.SQSService;
5+
//import org.springframework.beans.factory.annotation.Value;
6+
//import org.springframework.stereotype.Service;
7+
//import org.sfa.request.config.ObjectMapperConfig;
8+
//import com.fasterxml.jackson.core.JsonProcessingException;
9+
//
10+
///**
11+
// * ClassName: SQSServiceImpl
12+
// * Package: org.sfa.request.service.impl
13+
// * Description:
14+
// *
15+
// * @author Fan Peng
16+
// * Create 2024/8/15 23:45
17+
// * @version 1.0
18+
// */
19+
//@Service
20+
//public class SQSServiceImpl implements SQSService {
21+
//
22+
// private final SqsTemplate sqsTemplate;
23+
// private final String sqsUrl;
24+
//
25+
// public SQSServiceImpl(SqsTemplate sqsTemplate, @Value("${sqs.url}") String sqsUrl) {
26+
// this.sqsTemplate = sqsTemplate;
27+
// this.sqsUrl = sqsUrl;
28+
// }
29+
//
30+
// @Override
31+
// public void sendMessage(Object message) {
32+
// try {
33+
// String jsonMessage = ObjectMapperConfig.getObjectMapper().writeValueAsString(message);
34+
// sqsTemplate.send(sqsUrl, jsonMessage);
35+
// } catch (JsonProcessingException e) {
36+
// throw new RuntimeException("Error converting message to JSON", e);
37+
// }
38+
// }
39+
//}

0 commit comments

Comments
 (0)