Skip to content

Commit 7e79da1

Browse files
Update spring boot te latest version and fix breaking annotations (#128) (#129)
* 124: Update spring boot to latest version * 124: Fix breaking Autowired annotations in ShapeshifterConfiguration --------- Signed-off-by: MartenMeijboom98 <marten1998@hotmail.com>
1 parent 6707dac commit 7e79da1

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

spring/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<url>https://www.lfenergy.org/projects/shapeshifter/</url>
1717

1818
<properties>
19-
<spring-boot.version>3.2.5</spring-boot.version>
19+
<spring-boot.version>3.4.1</spring-boot.version>
2020
<swagger-annotations.version>2.2.21</swagger-annotations.version>
2121
</properties>
2222

spring/src/main/java/org/lfenergy/shapeshifter/spring/config/ShapeshifterConfiguration.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ public ShapeshifterConfiguration(ShapeshifterProperties properties) {
6161

6262
@ConditionalOnMissingBean
6363
@Bean
64-
@Autowired
6564
public UftpSendMessageService uftpSendMessageService(UftpSerializer serializer,
6665
UftpCryptoService cryptoService,
6766
ParticipantResolutionService participantService,
@@ -72,7 +71,6 @@ public UftpSendMessageService uftpSendMessageService(UftpSerializer serializer,
7271

7372
@ConditionalOnMissingBean
7473
@Bean
75-
@Autowired
7674
public UftpCryptoService uftpCryptoService(ParticipantResolutionService participantService,
7775
LazySodiumFactory factory,
7876
LazySodiumBase64Pool lazySodiumInstancePool) {
@@ -87,7 +85,6 @@ public LazySodiumFactory lazySodiumFactory() {
8785

8886
@ConditionalOnMissingBean
8987
@Bean
90-
@Autowired
9188
public ReceivedMessageProcessor receivedMessageProcessor(UftpPayloadHandler payloadHandler,
9289
DuplicateMessageDetection duplicateDetection,
9390
UftpErrorProcessor errorProcessor) {
@@ -96,14 +93,12 @@ public ReceivedMessageProcessor receivedMessageProcessor(UftpPayloadHandler payl
9693

9794
@ConditionalOnMissingBean
9895
@Bean
99-
@Autowired
10096
public UftpSerializer uftpSerializer(XsdValidator xsdValidator) {
10197
return new UftpSerializer(new XmlSerializer(), xsdValidator);
10298
}
10399

104100
@ConditionalOnMissingBean
105101
@Bean
106-
@Autowired
107102
public ParticipantResolutionService participantResolutionService(UftpParticipantService uftpParticipantService) {
108103
return new ParticipantResolutionService(uftpParticipantService);
109104
}
@@ -121,7 +116,6 @@ public String getAuthorizationHeader(UftpParticipant participant) {
121116

122117
@ConditionalOnMissingBean
123118
@Bean
124-
@Autowired
125119
public UftpValidationService uftpValidationService(ParticipantSupport participantSupport,
126120
CongestionPointSupport congestionPointSupport,
127121
DuplicateMessageDetection duplicateMessageDetection,
@@ -173,14 +167,12 @@ public UftpValidationService uftpValidationService(ParticipantSupport participan
173167

174168
@ConditionalOnMissingBean
175169
@Bean
176-
@Autowired
177170
public DuplicateMessageDetection duplicateMessageDetection(UftpMessageSupport uftpMessageSupport) {
178171
return new DuplicateMessageDetection(uftpMessageSupport, new XmlSerializer());
179172
}
180173

181174
@ConditionalOnMissingBean
182175
@Bean
183-
@Autowired
184176
public UftpReceivedMessageService uftpReceivedMessageService(UftpValidationService uftpValidationService,
185177
UftpPayloadHandler uftpPayloadHandler) {
186178
var uftpReceivedMessageService = new UftpReceivedMessageService(uftpValidationService, uftpPayloadHandler);
@@ -206,14 +198,12 @@ public LazySodiumBase64Pool lazySodiumBase64Pool() {
206198

207199
@ConditionalOnMissingBean
208200
@Bean
209-
@Autowired
210201
public XsdValidator xsdValidator(XsdSchemaProvider xsdSchemaProvider) {
211202
return new XsdValidator(xsdSchemaProvider);
212203
}
213204

214205
@ConditionalOnMissingBean
215206
@Bean
216-
@Autowired
217207
public XsdSchemaProvider xsdSchemaProvider(XsdFactory xsdFactory) {
218208
return new XsdSchemaProvider(xsdFactory);
219209
}

0 commit comments

Comments
 (0)