Merge branch 'main' into rest-api/search-versions

Author: EricWittmann

app/src/main/java/io/apicurio/registry/storage/decorator/RegistryStorageDecoratorReadOnlyBase.java

@@ -6,22 +6,7 @@
 import io.apicurio.registry.model.GA;
 import io.apicurio.registry.model.GAV;
 import io.apicurio.registry.storage.RegistryStorage;
-import io.apicurio.registry.storage.dto.ArtifactMetaDataDto;
-import io.apicurio.registry.storage.dto.ArtifactReferenceDto;
-import io.apicurio.registry.storage.dto.ArtifactSearchResultsDto;
-import io.apicurio.registry.storage.dto.ArtifactVersionMetaDataDto;
-import io.apicurio.registry.storage.dto.CommentDto;
-import io.apicurio.registry.storage.dto.ContentWrapperDto;
-import io.apicurio.registry.storage.dto.GroupMetaDataDto;
-import io.apicurio.registry.storage.dto.GroupSearchResultsDto;
-import io.apicurio.registry.storage.dto.OrderBy;
-import io.apicurio.registry.storage.dto.OrderDirection;
-import io.apicurio.registry.storage.dto.RoleMappingDto;
-import io.apicurio.registry.storage.dto.RoleMappingSearchResultsDto;
-import io.apicurio.registry.storage.dto.RuleConfigurationDto;
-import io.apicurio.registry.storage.dto.SearchFilter;
-import io.apicurio.registry.storage.dto.StoredArtifactVersionDto;
-import io.apicurio.registry.storage.dto.VersionSearchResultsDto;
+import io.apicurio.registry.storage.dto.*;
 import io.apicurio.registry.storage.error.ArtifactNotFoundException;
 import io.apicurio.registry.storage.error.ContentNotFoundException;
 import io.apicurio.registry.storage.error.GroupNotFoundException;
@@ -47,11 +32,9 @@ public abstract class RegistryStorageDecoratorReadOnlyBase implements RegistrySt
 
     protected RegistryStorage delegate;
 
-
     protected RegistryStorageDecoratorReadOnlyBase() {
     }
 
-
     public void setDelegate(RegistryStorage delegate) {
         this.delegate = delegate;
     }
@@ -71,89 +54,76 @@ public boolean isReady() {
         return delegate.isReady();
     }
 
-
     @Override
     public boolean isAlive() {
         return delegate.isAlive();
     }
 
-
     @Override
     public boolean isReadOnly() {
         return delegate.isReadOnly();
     }
 
-
     @Override
     public ContentWrapperDto getContentById(long contentId)
             throws ContentNotFoundException, RegistryStorageException {
         return delegate.getContentById(contentId);
     }
 
-
     @Override
     public ContentWrapperDto getContentByHash(String contentHash)
             throws ContentNotFoundException, RegistryStorageException {
         return delegate.getContentByHash(contentHash);
     }
 
-
     @Override
     public List<ArtifactVersionMetaDataDto> getArtifactVersionsByContentId(long contentId) {
         return delegate.getArtifactVersionsByContentId(contentId);
     }
 
-
     @Override
     public Set<String> getArtifactIds(Integer limit) {
         return delegate.getArtifactIds(limit);
     }
 
-
     @Override
     public ArtifactSearchResultsDto searchArtifacts(Set<SearchFilter> filters, OrderBy orderBy,
                                                     OrderDirection orderDirection, int offset, int limit) {
         return delegate.searchArtifacts(filters, orderBy, orderDirection, offset, limit);
     }
 
-
     @Override
     public ArtifactMetaDataDto getArtifactMetaData(String groupId, String artifactId)
             throws ArtifactNotFoundException, RegistryStorageException {
         return delegate.getArtifactMetaData(groupId, artifactId);
     }
 
-
     @Override
     public ArtifactVersionMetaDataDto getArtifactVersionMetaDataByContent(String groupId, String artifactId,
-                                                                 boolean canonical, ContentHandle content, List<ArtifactReferenceDto> artifactReferences)
+                                                                          boolean canonical, ContentHandle content, List<ArtifactReferenceDto> artifactReferences)
             throws ArtifactNotFoundException, RegistryStorageException {
         return delegate.getArtifactVersionMetaDataByContent(groupId, artifactId, canonical, content, artifactReferences);
     }
 
-
     @Override
     public List<RuleType> getArtifactRules(String groupId, String artifactId)
             throws ArtifactNotFoundException, RegistryStorageException {
         return delegate.getArtifactRules(groupId, artifactId);
     }
 
-
     @Override
     public void createArtifactRule(String groupId, String artifactId, RuleType rule,
                                    RuleConfigurationDto config)
             throws ArtifactNotFoundException, RuleAlreadyExistsException, RegistryStorageException {
         delegate.createArtifactRule(groupId, artifactId, rule, config);
     }
 
-
     @Override
     public RuleConfigurationDto getArtifactRule(String groupId, String artifactId, RuleType rule)
             throws ArtifactNotFoundException, RuleNotFoundException, RegistryStorageException {
         return delegate.getArtifactRule(groupId, artifactId, rule);
     }
 
-
     @Override
     public List<String> getArtifactVersions(String groupId, String artifactId)
             throws ArtifactNotFoundException, RegistryStorageException {
@@ -166,145 +136,123 @@ public VersionSearchResultsDto searchVersions(Set<SearchFilter> filters, OrderBy
         return delegate.searchVersions(filters, orderBy, orderDirection, offset, limit);
     }
 
-
     @Override
     public StoredArtifactVersionDto getArtifactVersionContent(long globalId)
             throws ArtifactNotFoundException, RegistryStorageException {
         return delegate.getArtifactVersionContent(globalId);
     }
 
-
     @Override
     public StoredArtifactVersionDto getArtifactVersionContent(String groupId, String artifactId, String version)
             throws ArtifactNotFoundException, VersionNotFoundException, RegistryStorageException {
         return delegate.getArtifactVersionContent(groupId, artifactId, version);
     }
 
-
     @Override
     public ArtifactVersionMetaDataDto getArtifactVersionMetaData(String groupId, String artifactId,
                                                                  String version)
             throws ArtifactNotFoundException, VersionNotFoundException, RegistryStorageException {
         return delegate.getArtifactVersionMetaData(groupId, artifactId, version);
     }
-    
-    
+
     @Override
     public ArtifactVersionMetaDataDto getArtifactVersionMetaData(Long globalId)
             throws VersionNotFoundException, RegistryStorageException {
         return delegate.getArtifactVersionMetaData(globalId);
     }
 
-
     @Override
     public List<RuleType> getGlobalRules() throws RegistryStorageException {
         return delegate.getGlobalRules();
     }
 
-
     @Override
     public RuleConfigurationDto getGlobalRule(RuleType rule)
             throws RuleNotFoundException, RegistryStorageException {
         return delegate.getGlobalRule(rule);
     }
 
-
     @Override
     public List<String> getGroupIds(Integer limit) throws RegistryStorageException {
         return delegate.getGroupIds(limit);
     }
 
-
     @Override
     public GroupMetaDataDto getGroupMetaData(String groupId)
             throws GroupNotFoundException, RegistryStorageException {
         return delegate.getGroupMetaData(groupId);
     }
 
-
     @Override
     public void exportData(Function<Entity, Void> handler) throws RegistryStorageException {
         delegate.exportData(handler);
     }
 
-
     @Override
     public long countArtifacts() throws RegistryStorageException {
         return delegate.countArtifacts();
     }
 
-
     @Override
     public long countArtifactVersions(String groupId, String artifactId) throws RegistryStorageException {
         return delegate.countArtifactVersions(groupId, artifactId);
     }
-    
-    
+
     @Override
     public long countActiveArtifactVersions(String groupId, String artifactId) throws RegistryStorageException {
         return delegate.countActiveArtifactVersions(groupId, artifactId);
     }
 
-
     @Override
     public long countTotalArtifactVersions() throws RegistryStorageException {
         return delegate.countTotalArtifactVersions();
     }
 
-
     @Override
     public RoleMappingDto getRoleMapping(String principalId) throws RegistryStorageException {
         return delegate.getRoleMapping(principalId);
     }
 
-
     @Override
     public String getRoleForPrincipal(String principalId) throws RegistryStorageException {
         return delegate.getRoleForPrincipal(principalId);
     }
 
-
     @Override
     public List<RoleMappingDto> getRoleMappings() throws RegistryStorageException {
         return delegate.getRoleMappings();
     }
-    
+
     @Override
     public RoleMappingSearchResultsDto searchRoleMappings(int offset, int limit) throws RegistryStorageException {
         return delegate.searchRoleMappings(offset, limit);
     }
 
-
     @Override
     public List<DynamicConfigPropertyDto> getConfigProperties() throws RegistryStorageException {
         return delegate.getConfigProperties();
     }
 
-
     @Override
     public DynamicConfigPropertyDto getConfigProperty(String propertyName) {
         return delegate.getConfigProperty(propertyName);
     }
 
-
     @Override
     public List<DynamicConfigPropertyDto> getStaleConfigProperties(Instant since) {
         return delegate.getStaleConfigProperties(since);
     }
 
-
     @Override
     public DynamicConfigPropertyDto getRawConfigProperty(String propertyName) {
         return delegate.getRawConfigProperty(propertyName);
     }
 
-
     @Override
     public Map<String, ContentHandle> resolveReferences(List<ArtifactReferenceDto> references) {
         return delegate.resolveReferences(references);
     }
 
-
     @Override
     public boolean isArtifactExists(String groupId, String artifactId) throws RegistryStorageException {
         return delegate.isArtifactExists(groupId, artifactId);
@@ -315,98 +263,85 @@ public boolean isGroupExists(String groupId) throws RegistryStorageException {
         return delegate.isGroupExists(groupId);
     }
 
-
     @Override
     public boolean isArtifactVersionExists(String groupId, String artifactId, String version) throws RegistryStorageException {
         return delegate.isArtifactVersionExists(groupId, artifactId, version);
     }
 
-
     @Override
     public List<Long> getContentIdsReferencingArtifactVersion(String groupId, String artifactId, String version) {
         return delegate.getContentIdsReferencingArtifactVersion(groupId, artifactId, version);
     }
 
-
     @Override
     public List<Long> getGlobalIdsReferencingArtifactVersion(String groupId, String artifactId, String version) {
         return delegate.getGlobalIdsReferencingArtifactVersion(groupId, artifactId, version);
     }
 
-
     @Override
     public List<ArtifactReferenceDto> getInboundArtifactReferences(String groupId, String artifactId, String version) {
         return delegate.getInboundArtifactReferences(groupId, artifactId, version);
     }
 
-
     @Override
     public GroupSearchResultsDto searchGroups(Set<SearchFilter> filters, OrderBy orderBy, OrderDirection orderDirection, Integer offset, Integer limit) {
         return delegate.searchGroups(filters, orderBy, orderDirection, offset, limit);
     }
 
-
     @Override
     public List<CommentDto> getArtifactVersionComments(String groupId, String artifactId, String version) {
         return delegate.getArtifactVersionComments(groupId, artifactId, version);
     }
 
-
     @Override
     public boolean isContentExists(String contentHash) throws RegistryStorageException {
         return delegate.isContentExists(contentHash);
     }
 
-
     @Override
     public boolean isArtifactRuleExists(String groupId, String artifactId, RuleType rule) throws RegistryStorageException {
         return delegate.isArtifactRuleExists(groupId, artifactId, rule);
     }
 
-
     @Override
     public boolean isGlobalRuleExists(RuleType rule) throws RegistryStorageException {
         return delegate.isGlobalRuleExists(rule);
     }
 
-
     @Override
     public boolean isRoleMappingExists(String principalId) {
         return delegate.isRoleMappingExists(principalId);
     }
 
-
     @Override
     public Optional<Long> contentIdFromHash(String contentHash) {
         return delegate.contentIdFromHash(contentHash);
     }
 
-
     @Override
     public List<Long> getEnabledArtifactContentIds(String groupId, String artifactId) {
         return delegate.getEnabledArtifactContentIds(groupId, artifactId);
     }
 
     @Override
-    public List<String> getArtifactVersions(String groupId, String artifactId, ArtifactRetrievalBehavior behavior) throws ArtifactNotFoundException, RegistryStorageException {
+    public List<String> getArtifactVersions(String groupId, String artifactId, ArtifactRetrievalBehavior behavior)
+            throws ArtifactNotFoundException, RegistryStorageException {
         return delegate.getArtifactVersions(groupId, artifactId, behavior);
     }
 
-
     @Override
     public GAV getArtifactBranchTip(GA ga, BranchId branchId, ArtifactRetrievalBehavior behavior) {
         return delegate.getArtifactBranchTip(ga, branchId, behavior);
     }
 
-
     @Override
     public Map<BranchId, List<GAV>> getArtifactBranches(GA ga) {
         return delegate.getArtifactBranches(ga);
     }
 
-
     @Override
     public List<GAV> getArtifactBranch(GA ga, BranchId branchId, ArtifactRetrievalBehavior behavior) {
         return delegate.getArtifactBranch(ga, branchId, behavior);
     }
+
 }