lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Get rid of artifactRepository naming of ArtifactStorage (#2645)

Browse Source 
Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2025-09-03 11:55:14 +03:00
committed by GitHub
parent 0e5f1d6526
commit 59cb320fcc
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hawkbit-artifact/hawkbit-artifact-fs/src/main/java/org/eclipse/hawkbit/autoconfigure/artifact/fs/FileArtifactStorageConfiguration.java
View File

@@ -30,7 +30,7 @@ public class FileArtifactStorageConfiguration {
*/
@Bean
@ConditionalOnMissingBean
public ArtifactStorage artifactRepository(final FileArtifactProperties artifactFilesystemProperties) {
public ArtifactStorage artifactStorage(final FileArtifactProperties artifactFilesystemProperties) {
return new FileArtifactStorage(artifactFilesystemProperties);
}
}

10
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaSystemManagement.java
View File

@@ -104,7 +104,7 @@ public class JpaSystemManagement implements CurrentTenantCacheKeyGenerator, Syst
private final RepositoryProperties repositoryProperties;
@Nullable
private ArtifactStorage artifactRepository;
private ArtifactStorage artifactStorage;
@SuppressWarnings("squid:S00107")
protected JpaSystemManagement(
@@ -147,8 +147,8 @@ public class JpaSystemManagement implements CurrentTenantCacheKeyGenerator, Syst
}
@Autowired(required = false) // it's not required on dmf/ddi only instances
public void setArtifactRepository(ArtifactStorage artifactRepository) {
this.artifactRepository = artifactRepository;
public void setArtifactStorage(final ArtifactStorage artifactStorage) {
this.artifactStorage = artifactStorage;
}
@Override
@@ -161,7 +161,7 @@ public class JpaSystemManagement implements CurrentTenantCacheKeyGenerator, Syst
@Retryable(retryFor = { ConcurrencyFailureException.class }, maxAttempts = Constants.TX_RT_MAX,
backoff = @Backoff(delay = Constants.TX_RT_DELAY))
public void deleteTenant(final String t) {
if (artifactRepository == null) {
if (artifactStorage == null) {
throw new IllegalStateException("Artifact repository is not available. Can't delete tenant.");
}
@@ -180,7 +180,7 @@ public class JpaSystemManagement implements CurrentTenantCacheKeyGenerator, Syst
distributionSetRepository.deleteByTenant(tenant);
distributionSetTypeRepository.deleteByTenant(tenant);
softwareModuleRepository.deleteByTenant(tenant);
artifactRepository.deleteByTenant(tenant);
artifactStorage.deleteByTenant(tenant);
softwareModuleTypeRepository.deleteByTenant(tenant);
return null;
}));