This is an automated email from the ASF dual-hosted git repository. martin_s pushed a commit to branch feature/storage_refactoring in repository https://gitbox.apache.org/repos/asf/archiva.git
commit 53c58d457dd881ca517abec1a1d86c168d26de38 Author: Martin Stockhammer <[email protected]> AuthorDate: Sat May 25 10:29:55 2019 +0200 Adding new methods after interface change --- .../repository/mock/RepositoryProviderMock.java | 35 ++++++++++++++-------- .../apache/archiva/proxy/MockConfiguration.java | 5 ++++ .../mock/ManagedRepositoryContentMock.java | 34 +++++++++++++++++++++ .../archiva/configuration/TestConfiguration.java | 5 ++++ .../storage/maven2/conf/MockConfiguration.java | 7 +++++ 5 files changed, 73 insertions(+), 13 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java index 35490d3..36d6a99 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java @@ -21,19 +21,8 @@ package org.apache.archiva.repository.mock; import org.apache.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.archiva.configuration.RemoteRepositoryConfiguration; -import org.apache.archiva.repository.BasicManagedRepository; -import org.apache.archiva.repository.BasicRemoteRepository; -import org.apache.archiva.repository.EditableManagedRepository; -import org.apache.archiva.repository.EditableRemoteRepository; -import org.apache.archiva.repository.ManagedRepository; -import org.apache.archiva.repository.PasswordCredentials; -import org.apache.archiva.repository.ReleaseScheme; -import org.apache.archiva.repository.RemoteRepository; -import org.apache.archiva.repository.RepositoryCredentials; -import org.apache.archiva.repository.RepositoryEvent; -import org.apache.archiva.repository.RepositoryException; -import org.apache.archiva.repository.RepositoryProvider; -import org.apache.archiva.repository.RepositoryType; +import org.apache.archiva.configuration.RepositoryGroupConfiguration; +import org.apache.archiva.repository.*; import org.apache.archiva.repository.features.ArtifactCleanupFeature; import org.apache.archiva.repository.features.IndexCreationFeature; import org.apache.archiva.repository.features.RemoteIndexFeature; @@ -81,6 +70,11 @@ public class RepositoryProviderMock implements RepositoryProvider } @Override + public EditableRepositoryGroup createRepositoryGroup(String id, String name) { + return null; + } + + @Override public ManagedRepository createManagedInstance( ManagedRepositoryConfiguration configuration ) throws RepositoryException { BasicManagedRepository managedRepository = new BasicManagedRepository( configuration.getId( ), configuration.getName( ), Paths.get("target/repositories") ); @@ -177,6 +171,16 @@ public class RepositoryProviderMock implements RepositoryProvider } @Override + public RepositoryGroup createRepositoryGroup(RepositoryGroupConfiguration configuration) throws RepositoryException { + return null; + } + + @Override + public void updateRepositoryGroupInstance(EditableRepositoryGroup repositoryGroup, RepositoryGroupConfiguration configuration) throws RepositoryException { + + } + + @Override public ManagedRepositoryConfiguration getManagedConfiguration( ManagedRepository managedRepository ) throws RepositoryException { ManagedRepositoryConfiguration configuration = new ManagedRepositoryConfiguration( ); @@ -202,6 +206,11 @@ public class RepositoryProviderMock implements RepositoryProvider return configuration; } + @Override + public RepositoryGroupConfiguration getRepositoryGroupConfiguration(RepositoryGroup repositoryGroup) throws RepositoryException { + return null; + } + @Override public RemoteRepositoryConfiguration getRemoteConfiguration( RemoteRepository remoteRepository ) throws RepositoryException diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java index fd6e66e..6a3510e 100644 --- a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java +++ b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java @@ -183,6 +183,11 @@ public class MockConfiguration } @Override + public Path getRepositoryGroupBaseDir() { + return getDataDirectory().resolve("groups"); + } + + @Override public Path getDataDirectory() { if (configuration!=null && StringUtils.isNotEmpty(configuration.getArchivaRuntimeConfiguration().getDataDirectory())) { return Paths.get(configuration.getArchivaRuntimeConfiguration().getDataDirectory()); diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java index e185c3e..376bc00 100644 --- a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java +++ b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java @@ -28,14 +28,18 @@ import org.apache.archiva.model.ProjectReference; import org.apache.archiva.model.VersionedReference; import org.apache.archiva.repository.*; import org.apache.archiva.repository.content.PathParser; +import org.apache.archiva.repository.content.StorageAsset; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; +import java.io.IOException; +import java.io.InputStream; import java.nio.file.Path; import java.nio.file.Paths; import java.util.HashMap; import java.util.Map; import java.util.Set; +import java.util.function.Consumer; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -384,4 +388,34 @@ public class ManagedRepositoryContentMock implements ManagedRepositoryContent { return null; } + + @Override + public StorageAsset getAsset(String path) { + return null; + } + + @Override + public void consumeData(StorageAsset asset, Consumer<InputStream> consumerFunction, boolean readLock) throws IOException { + + } + + @Override + public StorageAsset addAsset(String path, boolean container) { + return null; + } + + @Override + public void removeAsset(StorageAsset asset) throws IOException { + + } + + @Override + public StorageAsset moveAsset(StorageAsset origin, String destination) throws IOException { + return null; + } + + @Override + public StorageAsset copyAsset(StorageAsset origin, String destination) throws IOException { + return null; + } } diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java index ac24a34..9087a61 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java @@ -116,6 +116,11 @@ public class TestConfiguration } @Override + public Path getRepositoryGroupBaseDir() { + return getDataDirectory().resolve("groups"); + } + + @Override public Path getDataDirectory() { if (configuration!=null && configuration.getArchivaRuntimeConfiguration()!=null && StringUtils.isNotEmpty(configuration.getArchivaRuntimeConfiguration().getDataDirectory())) { diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java index 474d3df..46a2490 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java @@ -160,6 +160,11 @@ public class MockConfiguration } @Override + public Path getRepositoryGroupBaseDir() { + return getDataDirectory().resolve("groups"); + } + + @Override public Path getDataDirectory() { if (configuration!=null && StringUtils.isNotEmpty(configuration.getArchivaRuntimeConfiguration().getDataDirectory())) { return Paths.get(configuration.getArchivaRuntimeConfiguration().getDataDirectory()); @@ -167,4 +172,6 @@ public class MockConfiguration return getAppServerBaseDir().resolve("data"); } } + + }
