ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-02-21 10:01:49 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #541 from nsacyber/v3_filestore-bean-removal

Browse Source 
Filestore Service Removal
This commit is contained in:
Cyrus 2023-06-23 07:05:37 -04:00 committed by GitHub
commit 2d5836b8b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/PersistenceConfiguration.java
View File

@ -1,8 +1,5 @@
package hirs.attestationca.persist; 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; import org.springframework.context.annotation.Configuration;
/** /**
@ -15,12 +12,12 @@ import org.springframework.context.annotation.Configuration;
@Configuration @Configuration
public class PersistenceConfiguration { public class PersistenceConfiguration {
@Bean // @Bean
public FilesStorageService filesStorageService() { // public FilesStorageService filesStorageService() {
FilesStorageServiceImpl filesStorageService = new FilesStorageServiceImpl(new StorageProperties()); // FilesStorageServiceImpl filesStorageService = new FilesStorageServiceImpl(new StorageProperties());
filesStorageService.init(); // filesStorageService.init();
return filesStorageService; // return filesStorageService;
} // }
// /** // /**
// * Creates a {@link CertificateServiceImpl} ready to use. // * Creates a {@link CertificateServiceImpl} ready to use.

7
HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java
View File

@ -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.BaseReferenceManifest;
import hirs.attestationca.persist.entity.userdefined.rim.ReferenceDigestValue; import hirs.attestationca.persist.entity.userdefined.rim.ReferenceDigestValue;
import hirs.attestationca.persist.entity.userdefined.rim.SupportReferenceManifest; 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.DataTableInput;
import hirs.attestationca.portal.datatables.DataTableResponse; import hirs.attestationca.portal.datatables.DataTableResponse;
import hirs.attestationca.portal.datatables.OrderedListQueryDataTableAdapter; import hirs.attestationca.portal.datatables.OrderedListQueryDataTableAdapter;
@ -72,23 +71,19 @@ public class ReferenceManifestPageController extends PageController<NoPageParams
@Autowired(required = false) @Autowired(required = false)
private EntityManager entityManager; private EntityManager entityManager;
private final FilesStorageService filesStorageService;
private final ReferenceManifestRepository referenceManifestRepository; private final ReferenceManifestRepository referenceManifestRepository;
private final ReferenceDigestValueRepository referenceDigestValueRepository; private final ReferenceDigestValueRepository referenceDigestValueRepository;
/** /**
* Constructor providing the Page's display and routing specification. * Constructor providing the Page's display and routing specification.
* *
* @param filesStorageService storage services
* @param referenceManifestRepository the reference manifest manager * @param referenceManifestRepository the reference manifest manager
* @param referenceDigestValueRepository this is the reference event manager * @param referenceDigestValueRepository this is the reference event manager
*/ */
@Autowired @Autowired
public ReferenceManifestPageController(final FilesStorageService filesStorageService, public ReferenceManifestPageController(final ReferenceManifestRepository referenceManifestRepository,
final ReferenceManifestRepository referenceManifestRepository,
final ReferenceDigestValueRepository referenceDigestValueRepository) { final ReferenceDigestValueRepository referenceDigestValueRepository) {
super(Page.REFERENCE_MANIFESTS); super(Page.REFERENCE_MANIFESTS);
this.filesStorageService = filesStorageService;
this.referenceManifestRepository = referenceManifestRepository; this.referenceManifestRepository = referenceManifestRepository;
this.referenceDigestValueRepository = referenceDigestValueRepository; this.referenceDigestValueRepository = referenceDigestValueRepository;
} }