Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-04 11:20:53 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'develop' into feature/rebase

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Konstantin Schaper
2020-09-16 19:00:54 +02:00
parent 5298c855ac 32d500cc44
commit d2f10b1eec
9 changed files with 290 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Add support for pr merge with prior rebase ([#1332](https://github.com/scm-manager/scm-manager/pull/1332))
### Fixed
- Missing synchronization during repository creation ([#1328](https://github.com/scm-manager/scm-manager/pull/1328))
## [2.5.0] - 2020-09-10
### Added
- Tags now have date information attached ([#1305](https://github.com/scm-manager/scm-manager/pull/1305))

2
pom.xml
View File

@@ -464,7 +464,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.16.1</version>
<version>3.17.0</version>
<scope>test</scope>
</dependency>

188
scm-core/src/main/java/sonia/scm/plugin/SmpArchive.java
View File

@@ -21,53 +21,57 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.plugin;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.Charsets;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Strings;
import com.google.common.io.ByteSource;
import com.google.common.io.ByteStreams;
import com.google.common.io.Files;
import com.google.common.io.Resources;
import sonia.scm.util.IOUtil;
//~--- JDK imports ------------------------------------------------------------
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
//~--- JDK imports ------------------------------------------------------------
/**
* Smp plugin archive.
*
* @author Sebastian Sdorra
* @since 2.0.0
*/
public final class SmpArchive
{
public final class SmpArchive {
private final ByteSource archive;
private final ZipInputStreamFactory zipInputStreamFactory;
private InstalledPluginDescriptor plugin;
/**
* Constructs ...
*
*
* @param archive
*/
public SmpArchive(ByteSource archive)
{
public SmpArchive(ByteSource archive) {
this(archive, source -> new ZipInputStream(archive.openStream(), StandardCharsets.UTF_8));
}
@VisibleForTesting
SmpArchive(ByteSource archive, ZipInputStreamFactory zipInputStreamFactory) {
this.archive = archive;
this.zipInputStreamFactory = zipInputStreamFactory;
}
//~--- methods --------------------------------------------------------------
@@ -75,52 +79,40 @@ public final class SmpArchive
/**
* Method description
*
*
* @param archive
*
* @return
*/
public static SmpArchive create(ByteSource archive)
{
public static SmpArchive create(ByteSource archive) {
return new SmpArchive(archive);
}
/**
* Method description
*
*
* @param archive
*
* @return
*/
public static SmpArchive create(URL archive)
{
public static SmpArchive create(URL archive) {
return create(Resources.asByteSource(archive));
}
/**
* Method description
*
*
* @param archive
*
* @return
*/
public static SmpArchive create(Path archive)
{
public static SmpArchive create(Path archive) {
return create(archive.toFile());
}
/**
* Method description
*
*
* @param archive
*
* @return
*/
public static SmpArchive create(File archive)
{
public static SmpArchive create(File archive) {
return create(Files.asByteSource(archive));
}
@@ -129,17 +121,13 @@ public final class SmpArchive
/**
* Method description
*
*
* @param entry
*
* @return
*/
private static String getPath(ZipEntry entry)
{
private static String getPath(ZipEntry entry) {
String path = entry.getName().replace("\\", "/");
if (!path.startsWith("/"))
{
if (!path.startsWith("/")) {
path = "/".concat(path);
}
@@ -151,33 +139,27 @@ public final class SmpArchive
/**
* Method description
*
*
* @param target
*
* @throws IOException
*/
public void extract(File target) throws IOException
{
try (ZipInputStream zis = open())
{
public void extract(File target) throws IOException {
try (ZipInputStream zis = open()) {
ZipEntry ze = zis.getNextEntry();
while (ze != null)
{
while (ze != null) {
String fileName = ze.getName();
File file = new File(target, fileName);
if (!IOUtil.isChild(target, file)) {
throw new PluginException("smp contains illegal path, which tries to escape from the plugin directory: " + fileName);
}
IOUtil.mkdirs(file.getParentFile());
if (ze.isDirectory())
{
if (ze.isDirectory()) {
IOUtil.mkdirs(file);
}
else
{
try (FileOutputStream fos = new FileOutputStream(file))
{
} else {
try (FileOutputStream fos = new FileOutputStream(file)) {
ByteStreams.copy(zis, fos);
}
}
@@ -194,32 +176,25 @@ public final class SmpArchive
/**
* Method description
*
*
* @return
*
* @throws IOException
*/
public InstalledPluginDescriptor getPlugin() throws IOException
{
if (plugin == null)
{
public InstalledPluginDescriptor getPlugin() throws IOException {
if (plugin == null) {
plugin = createPlugin();
PluginInformation info = plugin.getInformation();
if (info == null)
{
if (info == null) {
throw new PluginException("could not find information section");
}
if (Strings.isNullOrEmpty(info.getName()))
{
if (Strings.isNullOrEmpty(info.getName())) {
throw new PluginException(
"could not find name in plugin descriptor");
}
if (Strings.isNullOrEmpty(info.getVersion()))
{
if (Strings.isNullOrEmpty(info.getVersion())) {
throw new PluginException(
"could not find version in plugin descriptor");
}
@@ -233,26 +208,20 @@ public final class SmpArchive
/**
* Method description
*
*
* @return
*
* @throws IOException
*/
private InstalledPluginDescriptor createPlugin() throws IOException
{
private InstalledPluginDescriptor createPlugin() throws IOException {
InstalledPluginDescriptor p = null;
NonClosingZipInputStream zis = null;
try
{
try {
zis = openNonClosing();
ZipEntry entry = zis.getNextEntry();
while (entry != null)
{
if (PluginConstants.PATH_DESCRIPTOR.equals(getPath(entry)))
{
while (entry != null) {
if (PluginConstants.PATH_DESCRIPTOR.equals(getPath(entry))) {
p = Plugins.parsePluginDescriptor(new InputStreamByteSource(zis));
}
@@ -260,17 +229,13 @@ public final class SmpArchive
}
zis.closeEntry();
}
finally
{
if (zis != null)
{
} finally {
if (zis != null) {
zis.reallyClose();
}
}
if (p == null)
{
if (p == null) {
throw new PluginLoadException("could not find plugin descriptor");
}
@@ -280,27 +245,21 @@ public final class SmpArchive
/**
* Method description
*
*
* @return
*
* @throws IOException
*/
private ZipInputStream open() throws IOException
{
return new ZipInputStream(archive.openStream(), Charsets.UTF_8);
private ZipInputStream open() throws IOException {
return zipInputStreamFactory.open(archive);
}
/**
* Method description
*
*
* @return
*
* @throws IOException
*/
private NonClosingZipInputStream openNonClosing() throws IOException
{
return new NonClosingZipInputStream(archive.openStream(), Charsets.UTF_8);
private NonClosingZipInputStream openNonClosing() throws IOException {
return new NonClosingZipInputStream(archive.openStream(), StandardCharsets.UTF_8);
}
//~--- inner classes --------------------------------------------------------
@@ -308,21 +267,17 @@ public final class SmpArchive
/**
* Class description
*
*
* @version Enter version here..., 14/07/13
* @author Enter your name here...
* @author Enter your name here...
* @version Enter version here..., 14/07/13
*/
private static class InputStreamByteSource extends ByteSource
{
private static class InputStreamByteSource extends ByteSource {
/**
* Constructs ...
*
*
* @param input
*/
public InputStreamByteSource(InputStream input)
{
public InputStreamByteSource(InputStream input) {
this.input = input;
}
@@ -331,20 +286,19 @@ public final class SmpArchive
/**
* Method description
*
*
* @return
*
* @throws IOException
*/
@Override
public InputStream openStream() throws IOException
{
public InputStream openStream() throws IOException {
return input;
}
//~--- fields -------------------------------------------------------------
/** Field description */
/**
* Field description
*/
private final InputStream input;
}
@@ -352,22 +306,18 @@ public final class SmpArchive
/**
* Class description
*
*
* @version Enter version here..., 14/07/12
* @author Enter your name here...
* @author Enter your name here...
* @version Enter version here..., 14/07/12
*/
private static class NonClosingZipInputStream extends ZipInputStream
{
private static class NonClosingZipInputStream extends ZipInputStream {
/**
* Constructs ...
*
*
* @param in
* @param charset
*/
public NonClosingZipInputStream(InputStream in, Charset charset)
{
public NonClosingZipInputStream(InputStream in, Charset charset) {
super(in, charset);
}
@@ -376,12 +326,10 @@ public final class SmpArchive
/**
* Method description
*
*
* @throws IOException
*/
@Override
public void close() throws IOException
{
public void close() throws IOException {
// do nothing
}
@@ -389,21 +337,17 @@ public final class SmpArchive
/**
* Method description
*
*
* @throws IOException
*/
public void reallyClose() throws IOException
{
public void reallyClose() throws IOException {
super.close();
}
}
@FunctionalInterface
interface ZipInputStreamFactory {
//~--- fields ---------------------------------------------------------------
ZipInputStream open(ByteSource source) throws IOException;
/** Field description */
private final ByteSource archive;
/** Field description */
private InstalledPluginDescriptor plugin;
}
}

271
scm-core/src/test/java/sonia/scm/plugin/SmpArchiveTest.java
View File

@@ -21,259 +21,154 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.plugin;
//~--- non-JDK imports --------------------------------------------------------
package sonia.scm.plugin;
import com.google.common.base.Charsets;
import com.google.common.base.Strings;
import com.google.common.base.Throwables;
import com.google.common.io.ByteSource;
import com.google.common.io.Files;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
import sonia.scm.util.IOUtil;
import sonia.scm.util.XmlUtil;
import static org.junit.Assert.*;
//~--- JDK imports ------------------------------------------------------------
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.file.Path;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
*
* @author Sebastian Sdorra
*/
public class SmpArchiveTest
{
class SmpArchiveTest {
/**
* Method description
*
*
* @throws IOException
* @throws ParserConfigurationException
* @throws SAXException
*/
@Test
public void testExtract()
throws IOException, ParserConfigurationException, SAXException
{
File archive = createArchive("sonia.sample", "1.0");
File target = tempFolder.newFolder();
void shouldExtractArchive(@TempDir Path tempDir) throws IOException, ParserConfigurationException, SAXException, XMLStreamException {
File archive = createArchive(tempDir, "sonia.sample", "1.0");
File target = tempDir.toFile();
IOUtil.mkdirs(target);
SmpArchive.create(archive).extract(target);
File descriptor = new File(target, PluginConstants.FILE_DESCRIPTOR);
assertTrue(descriptor.exists());
assertThat(descriptor).exists();
try (FileInputStream fis = new FileInputStream(descriptor))
{
try (FileInputStream fis = new FileInputStream(descriptor)) {
Document doc = XmlUtil.createDocument(fis);
assertEquals("plugin", doc.getDocumentElement().getNodeName());
assertThat(doc.getDocumentElement().getNodeName()).isEqualTo("plugin");
}
}
/**
* Method description
*
*
* @throws IOException
*/
@Test
public void testGetPlugin() throws IOException
{
File archive = createArchive("sonia.sample", "1.0");
void shouldReturnPluginDescriptor(@TempDir Path tempDir) throws IOException, XMLStreamException {
File archive = createArchive(tempDir, "sonia.sample", "1.0");
InstalledPluginDescriptor plugin = SmpArchive.create(archive).getPlugin();
assertNotNull(plugin);
assertThat(plugin).isNotNull();
PluginInformation info = plugin.getInformation();
assertNotNull(info);
assertThat(info).isNotNull();
assertEquals("sonia.sample", info.getName());
assertEquals("1.0", info.getVersion());
assertThat(info.getName()).isEqualTo("sonia.sample");
assertThat(info.getVersion()).isEqualTo("1.0");
}
/**
* Method description
*
* @throws IOException
*/
@Test(expected = PluginException.class)
public void testWithMissingName() throws IOException
{
File archive = createArchive( null, "1.0");
@Test
void shouldFailOnMissingName(@TempDir Path tempDir) throws IOException, XMLStreamException {
File archive = createArchive(tempDir, null, "1.0");
SmpArchive.create(archive).getPlugin();
SmpArchive smp = SmpArchive.create(archive);
assertThrows(PluginException.class, smp::getPlugin);
}
/**
* Method description
*
* @throws IOException
*/
@Test(expected = PluginException.class)
public void testWithMissingVersion() throws IOException
{
File archive = createArchive("sonia.sample", null);
SmpArchive.create(archive).getPlugin();
@Test
void shouldFailOnMissingVersion(@TempDir Path tempDir) throws IOException, XMLStreamException {
File archive = createArchive(tempDir, "sonia.sample", null);
SmpArchive smp = SmpArchive.create(archive);
assertThrows(PluginException.class, smp::getPlugin);
}
/**
* Method description
*
*
* @param name
* @param version
*
* @return
*/
private File createArchive(String name, String version)
{
File archiveFile;
@Test
void shouldFailOnZipEntriesWhichCreateFilesOutsideOfThePluginFolder(@TempDir Path tempDir) throws IOException {
ZipInputStream zis = mock(ZipInputStream.class);
ZipEntry entry = mock(ZipEntry.class);
when(zis.getNextEntry()).thenReturn(entry);
when(entry.getName()).thenReturn("../../plugin.xml");
SmpArchive smp = new SmpArchive(ByteSource.empty(), source -> zis);
File directory = tempDir.resolve("one").resolve("two").resolve("three").toFile();
assertThat(directory.mkdirs()).isTrue();
assertThrows(PluginException.class, () -> smp.extract(directory));
}
try
{
File descriptor = tempFolder.newFile();
private File createArchive(Path tempDir, String name, String version) throws IOException, XMLStreamException {
File descriptor = tempDir.resolve("descriptor.xml").toFile();
writeDescriptor(descriptor, name, version);
archiveFile = tempFolder.newFile();
writeDescriptor(descriptor, name, version);
File archiveFile = tempDir.resolve("archive.smp").toFile();
try (ZipOutputStream zos =
new ZipOutputStream(new FileOutputStream(archiveFile), Charsets.UTF_8))
{
zos.putNextEntry(new ZipEntry(PluginConstants.PATH_DESCRIPTOR));
Files.copy(descriptor, zos);
zos.closeEntry();
zos.putNextEntry(new ZipEntry("/META-INF/"));
zos.putNextEntry(new ZipEntry("/META-INF/somefile.txt"));
zos.write("some text".getBytes(Charsets.UTF_8));
zos.closeEntry();
}
}
catch (IOException ex)
{
throw Throwables.propagate(ex);
try (ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(archiveFile), Charsets.UTF_8)) {
zos.putNextEntry(new ZipEntry(PluginConstants.PATH_DESCRIPTOR));
Files.copy(descriptor, zos);
zos.closeEntry();
zos.putNextEntry(new ZipEntry("/META-INF/"));
zos.putNextEntry(new ZipEntry("/META-INF/somefile.txt"));
zos.write("some text".getBytes(Charsets.UTF_8));
zos.closeEntry();
}
return archiveFile;
}
/**
* Method description
*
*
* @param file
*
* @return
*
* @throws IOException
* @throws XMLStreamException
*/
private XMLStreamWriter createStreamWriter(File file)
throws IOException, XMLStreamException
{
return XMLOutputFactory.newFactory().createXMLStreamWriter(
new FileOutputStream(file));
private XMLStreamWriter createStreamWriter(File file) throws IOException, XMLStreamException {
return XMLOutputFactory.newFactory().createXMLStreamWriter(new FileOutputStream(file));
}
/**
* Method description
*
*
* @param descriptor
* @param name
* @param version
*
* @throws IOException
*/
private void writeDescriptor(File descriptor, String name,
String version)
throws IOException
{
try
{
private void writeDescriptor(File descriptor, String name, String version) throws IOException, XMLStreamException {
IOUtil.mkdirs(descriptor.getParentFile());
IOUtil.mkdirs(descriptor.getParentFile());
XMLStreamWriter writer = null;
XMLStreamWriter writer = null;
try {
writer = createStreamWriter(descriptor);
writer.writeStartDocument();
writer.writeStartElement("plugin");
writer.writeStartElement("information");
writeElement(writer, "name", name);
writeElement(writer, "version", version);
try
{
writer = createStreamWriter(descriptor);
writer.writeStartDocument();
writer.writeStartElement("plugin");
writer.writeStartElement("information");
writeElement(writer, "name", name);
writeElement(writer, "version", version);
writer.writeEndElement();
writer.writeEndElement();
writer.writeEndDocument();
writer.writeEndElement();
writer.writeEndElement();
writer.writeEndDocument();
} finally {
if (writer != null) {
writer.close();
}
finally
{
if (writer != null)
{
writer.close();
}
}
}
catch (XMLStreamException ex)
{
throw Throwables.propagate(ex);
}
}
/**
* Method description
*
*
* @param writer
* @param name
* @param value
*
* @throws XMLStreamException
*/
private void writeElement(XMLStreamWriter writer, String name, String value)
throws XMLStreamException
{
if (!Strings.isNullOrEmpty(value))
{
private void writeElement(XMLStreamWriter writer, String name, String value) throws XMLStreamException {
if (!Strings.isNullOrEmpty(value)) {
writer.writeStartElement(name);
writer.writeCharacters(value);
writer.writeEndElement();
}
}
//~--- fields ---------------------------------------------------------------
/** Field description */
@Rule
public TemporaryFolder tempFolder = new TemporaryFolder();
}

28
scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryDAO.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.repository.xml;
//~--- non-JDK imports --------------------------------------------------------
@@ -83,29 +83,27 @@ public class XmlRepositoryDAO implements RepositoryDAO {
}
@Override
public void add(Repository repository) {
public synchronized void add(Repository repository) {
add(repository, repositoryLocationResolver.create(repository.getId()));
}
public void add(Repository repository, Object location) {
public synchronized void add(Repository repository, Object location) {
if (!(location instanceof Path)) {
throw new IllegalArgumentException("can only handle locations of type " + Path.class.getName() + ", not of type " + location.getClass().getName());
}
Path repositoryPath = (Path) location;
Repository clone = repository.clone();
synchronized (this) {
Path repositoryPath = (Path) location;
try {
metadataStore.write(repositoryPath, repository);
} catch (Exception e) {
repositoryLocationResolver.remove(repository.getId());
throw new InternalRepositoryException(repository, "failed to create filesystem", e);
}
byId.put(repository.getId(), clone);
byNamespaceAndName.put(repository.getNamespaceAndName(), clone);
try {
metadataStore.write(repositoryPath, repository);
} catch (Exception e) {
repositoryLocationResolver.remove(repository.getId());
throw new InternalRepositoryException(repository, "failed to create filesystem", e);
}
byId.put(repository.getId(), clone);
byNamespaceAndName.put(repository.getNamespaceAndName(), clone);
}
@Override

2
scm-dao-xml/src/main/java/sonia/scm/store/TypedStoreContext.java
View File

@@ -48,7 +48,7 @@ final class TypedStoreContext<T> {
JAXBContext jaxbContext = JAXBContext.newInstance(parameters.getType());
return new TypedStoreContext<>(jaxbContext, parameters);
} catch (JAXBException e) {
throw new StoreException("failed to create context for store");
throw new StoreException("failed to create context for store", e);
}
}

114
scm-dao-xml/src/test/java/sonia/scm/repository/xml/XmlRepositoryDAOSynchronizationTest.java Normal file
View File

@@ -0,0 +1,114 @@
/*
* MIT License
*
* Copyright (c) 2020-present Cloudogu GmbH and Contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.repository.xml;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.io.TempDir;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import sonia.scm.SCMContextProvider;
import sonia.scm.io.DefaultFileSystem;
import sonia.scm.io.FileSystem;
import sonia.scm.repository.InitialRepositoryLocationResolver;
import sonia.scm.repository.Repository;
import java.nio.file.Path;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
class XmlRepositoryDAOSynchronizationTest {
private static final int CREATION_COUNT = 100;
private static final long TIMEOUT = 10L;
@Mock
private SCMContextProvider provider;
private FileSystem fileSystem;
private PathBasedRepositoryLocationResolver resolver;
private XmlRepositoryDAO repositoryDAO;
@BeforeEach
void setUpObjectUnderTest(@TempDir Path path) {
when(provider.getBaseDirectory()).thenReturn(path.toFile());
when(provider.resolve(any())).then(ic -> {
Path args = ic.getArgument(0);
return path.resolve(args);
});
fileSystem = new DefaultFileSystem();
resolver = new PathBasedRepositoryLocationResolver(
provider, new InitialRepositoryLocationResolver(), fileSystem
);
repositoryDAO = new XmlRepositoryDAO(resolver, fileSystem);
}
@Test
@Timeout(TIMEOUT)
void shouldCreateALotOfRepositoriesInSerial() {
for (int i=0; i<CREATION_COUNT; i++) {
repositoryDAO.add(new Repository("repo_" + i, "git", "sync_it", "repo_" + i));
}
assertCreated();
}
private void assertCreated() {
XmlRepositoryDAO assertionDao = new XmlRepositoryDAO(resolver, fileSystem);
assertThat(assertionDao.getAll()).hasSize(CREATION_COUNT);
}
@Test
@Timeout(TIMEOUT)
void shouldCreateALotOfRepositoriesInParallel() throws InterruptedException {
ExecutorService executors = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
final XmlRepositoryDAO repositoryDAO = new XmlRepositoryDAO(resolver, fileSystem);
for (int i=0; i<CREATION_COUNT; i++) {
executors.submit(create(repositoryDAO, i));
}
executors.shutdown();
executors.awaitTermination(TIMEOUT, TimeUnit.SECONDS);
assertCreated();
}
private Runnable create(XmlRepositoryDAO repositoryDAO, int index) {
return () -> repositoryDAO.add(new Repository("repo_" + index, "git", "sync_it", "repo_" + index));
}
}

23
scm-test/src/main/java/sonia/scm/repository/spi/ZippedRepositoryTestBase.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.repository.spi;
//~--- non-JDK imports --------------------------------------------------------
@@ -150,18 +150,18 @@ public abstract class ZippedRepositoryTestBase extends AbstractTestBase
public static void extract(File targetFolder, String zippedRepositoryResource) throws IOException {
URL url = Resources.getResource(zippedRepositoryResource);
ZipInputStream zip = null;
try
try (ZipInputStream zip = new ZipInputStream(url.openStream());)
{
zip = new ZipInputStream(url.openStream());
ZipEntry entry = zip.getNextEntry();
while (entry != null)
{
File file = new File(targetFolder, entry.getName());
File parent = file.getParentFile();
if (!IOUtil.isChild(parent, file)) {
throw new IOException("invalid zip entry name");
}
if (!parent.exists())
{
@@ -174,27 +174,16 @@ public abstract class ZippedRepositoryTestBase extends AbstractTestBase
}
else
{
OutputStream output = null;
try
try (OutputStream output = new FileOutputStream(file))
{
output = new FileOutputStream(file);
IOUtil.copy(zip, output);
}
finally
{
IOUtil.close(output);
}
}
zip.closeEntry();
entry = zip.getNextEntry();
}
}
finally
{
IOUtil.close(zip);
}
}
//~--- fields ---------------------------------------------------------------

6
yarn.lock
View File

@@ -8374,9 +8374,9 @@ gitconfiglocal@^1.0.0:
dependencies:
ini "^1.3.2"
gitdiff-parser@^0.1.2, "gitdiff-parser@https://github.com/scm-manager/gitdiff-parser#617747460280bf4522bb84d217a9064ac8eb6d3d":
version "0.1.2"
resolved "https://github.com/scm-manager/gitdiff-parser#617747460280bf4522bb84d217a9064ac8eb6d3d"
gitdiff-parser@^0.1.2, "gitdiff-parser@https://github.com/scm-manager/gitdiff-parser#420d6cfa17a6a8f9bf1a517a2c629dcb332dbe13":
version "0.2.2"
resolved "https://github.com/scm-manager/gitdiff-parser#420d6cfa17a6a8f9bf1a517a2c629dcb332dbe13"
glob-base@^0.3.0:
version "0.3.0"