|
91 | 91 | import io.vertx.mutiny.ext.web.multipart.MultipartForm; |
92 | 92 | import jakarta.enterprise.context.ApplicationScoped; |
93 | 93 | import jakarta.enterprise.event.Observes; |
| 94 | +import jakarta.enterprise.inject.Instance; |
94 | 95 | import jakarta.inject.Inject; |
95 | 96 | import jakarta.persistence.PersistenceException; |
96 | 97 | import jakarta.transaction.Transactional; |
@@ -166,7 +167,7 @@ public class RecordingHelper { |
166 | 167 | @Inject TargetTemplateService.Factory targetTemplateServiceFactory; |
167 | 168 | @Inject S3TemplateService customTemplateService; |
168 | 169 | @Inject PresetTemplateService presetTemplateService; |
169 | | - @Inject ArchivedRecordingMetadataService metadataService; |
| 170 | + @Inject Instance<ArchivedRecordingMetadataService> metadataService; |
170 | 171 | @Inject Scheduler scheduler; |
171 | 172 |
|
172 | 173 | @Inject |
@@ -835,8 +836,12 @@ public ArchivedRecording archiveRecording(ActiveRecording recording, String save |
835 | 836 | if (useObjectTagging()) { |
836 | 837 | builder = builder.tagging(createActiveRecordingTagging(recording)); |
837 | 838 | } else { |
838 | | - metadataService.create( |
839 | | - recording.target.jvmId, filename, createActiveRecordingMetadata(recording)); |
| 839 | + metadataService |
| 840 | + .get() |
| 841 | + .create( |
| 842 | + recording.target.jvmId, |
| 843 | + filename, |
| 844 | + createActiveRecordingMetadata(recording)); |
840 | 845 | } |
841 | 846 | CreateMultipartUploadRequest request = builder.build(); |
842 | 847 | multipartId = storage.createMultipartUpload(request).uploadId(); |
@@ -991,7 +996,7 @@ public Optional<Metadata> getArchivedRecordingMetadata(String storageKey) { |
991 | 996 | .build()) |
992 | 997 | .tagSet())); |
993 | 998 | } |
994 | | - return metadataService.read(storageKey); |
| 999 | + return metadataService.get().read(storageKey); |
995 | 1000 | } catch (NoSuchKeyException nske) { |
996 | 1001 | logger.warn(nske); |
997 | 1002 | return Optional.empty(); |
@@ -1135,7 +1140,7 @@ public void deleteArchivedRecording(String jvmId, String filename) { |
1135 | 1140 | } |
1136 | 1141 |
|
1137 | 1142 | if (!useObjectTagging()) { |
1138 | | - metadataService.delete(jvmId, filename); |
| 1143 | + metadataService.get().delete(jvmId, filename); |
1139 | 1144 | } |
1140 | 1145 |
|
1141 | 1146 | var event = |
@@ -1260,7 +1265,7 @@ public ArchivedRecording uploadArchivedRecording( |
1260 | 1265 | requestBuilder = requestBuilder.tagging(createMetadataTagging(new Metadata(labels))); |
1261 | 1266 | } else { |
1262 | 1267 | try { |
1263 | | - metadataService.create(jvmId, filename, metadata); |
| 1268 | + metadataService.get().create(jvmId, filename, metadata); |
1264 | 1269 | } catch (JsonProcessingException jpe) { |
1265 | 1270 | throw new InternalServerErrorException(jpe); |
1266 | 1271 | } |
@@ -1311,7 +1316,7 @@ public ArchivedRecording updateArchivedRecordingMetadata( |
1311 | 1316 | .build()); |
1312 | 1317 | } else { |
1313 | 1318 | try { |
1314 | | - metadataService.update(jvmId, filename, updatedMetadata); |
| 1319 | + metadataService.get().update(jvmId, filename, updatedMetadata); |
1315 | 1320 | } catch (JsonProcessingException e) { |
1316 | 1321 | throw new InternalServerErrorException(e); |
1317 | 1322 | } |
|
0 commit comments