From 17e01d4e723ba4a331c7ddf1fcd27061a1eecdf6 Mon Sep 17 00:00:00 2001
From: Cyrus <24922493+cyrus-dev@users.noreply.github.com>
Date: Fri, 16 Jun 2023 13:48:12 -0400
Subject: [PATCH] Removed FileStorageService autowiring
---
.../persist/PersistenceConfiguration.java | 15 ++++++---------
.../ReferenceManifestPageController.java | 6 +-----
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/PersistenceConfiguration.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/PersistenceConfiguration.java
index 384f2bc7..e9974c26 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/PersistenceConfiguration.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/PersistenceConfiguration.java
@@ -1,8 +1,5 @@
package hirs.attestationca.persist;
-import hirs.attestationca.persist.service.FilesStorageService;
-import hirs.attestationca.persist.service.FilesStorageServiceImpl;
-import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
@@ -15,12 +12,12 @@ import org.springframework.context.annotation.Configuration;
@Configuration
public class PersistenceConfiguration {
- @Bean
- public FilesStorageService filesStorageService() {
- FilesStorageServiceImpl filesStorageService = new FilesStorageServiceImpl(new StorageProperties());
- filesStorageService.init();
- return filesStorageService;
- }
+// @Bean
+// public FilesStorageService filesStorageService() {
+// FilesStorageServiceImpl filesStorageService = new FilesStorageServiceImpl(new StorageProperties());
+// filesStorageService.init();
+// return filesStorageService;
+// }
// /**
// * Creates a {@link CertificateServiceImpl} ready to use.
diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java
index ba4674cc..f7a94f9c 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java
@@ -10,7 +10,6 @@ import hirs.attestationca.persist.entity.userdefined.ReferenceManifest;
import hirs.attestationca.persist.entity.userdefined.rim.BaseReferenceManifest;
import hirs.attestationca.persist.entity.userdefined.rim.ReferenceDigestValue;
import hirs.attestationca.persist.entity.userdefined.rim.SupportReferenceManifest;
-import hirs.attestationca.persist.service.FilesStorageService;
import hirs.attestationca.portal.datatables.DataTableInput;
import hirs.attestationca.portal.datatables.DataTableResponse;
import hirs.attestationca.portal.datatables.OrderedListQueryDataTableAdapter;
@@ -72,7 +71,6 @@ public class ReferenceManifestPageController extends PageController<NoPageParams
@Autowired(required = false)
private EntityManager entityManager;
- private final FilesStorageService filesStorageService;
private final ReferenceManifestRepository referenceManifestRepository;
private final ReferenceDigestValueRepository referenceDigestValueRepository;
@@ -84,11 +82,9 @@ public class ReferenceManifestPageController extends PageController<NoPageParams
* @param referenceDigestValueRepository this is the reference event manager
*/
@Autowired
- public ReferenceManifestPageController(final FilesStorageService filesStorageService,
- final ReferenceManifestRepository referenceManifestRepository,
+ public ReferenceManifestPageController(final ReferenceManifestRepository referenceManifestRepository,
final ReferenceDigestValueRepository referenceDigestValueRepository) {
super(Page.REFERENCE_MANIFESTS);
- this.filesStorageService = filesStorageService;
this.referenceManifestRepository = referenceManifestRepository;
this.referenceDigestValueRepository = referenceDigestValueRepository;
}