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

improve event handling

Browse Source
This commit is contained in:
Eduard Heimbuch
2020-11-30 12:04:03 +01:00
parent 6f2dda4fe4
commit 5468fddf90
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryImportResource.java
View File

@@ -39,7 +39,6 @@ import lombok.Setter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.HandlerEventType;
import sonia.scm.NotFoundException;
import sonia.scm.Type;
import sonia.scm.event.ScmEventBus;
import sonia.scm.repository.InternalRepositoryException;
@@ -215,10 +214,17 @@ public class RepositoryImportResource {
logger.info("start {} import for external url {}", type, request.getUrl());
Repository repository = manager.create(
new Repository(null, type, request.getNamespace(), request.getName()),
pullChangesFromRemoteUrl(request)
);
Repository repository = null;
try {
repository = manager.create(
new Repository(null, type, request.getNamespace(), request.getName()),
pullChangesFromRemoteUrl(request)
);
} catch (Exception e) {
eventBus.post(new RepositoryImportEvent(HandlerEventType.MODIFY, repository, true));
throw e;
}
eventBus.post(new RepositoryImportEvent(HandlerEventType.MODIFY, repository, false));
return Response.created(URI.create(resourceLinks.repository().self(repository.getNamespace(), repository.getName()))).build();
}
@@ -236,13 +242,8 @@ public class RepositoryImportResource {
pullCommand.pull(request.getUrl());
} catch (IOException e) {
eventBus.post(new RepositoryImportEvent(HandlerEventType.MODIFY, repository, true));
throw new InternalRepositoryException(repository, "Failed to import from remote url", e);
} catch (Exception e) {
eventBus.post(new RepositoryImportEvent(HandlerEventType.MODIFY, repository, true));
throw e;
}
eventBus.post(new RepositoryImportEvent(HandlerEventType.MODIFY, repository, false));
};
}

15
scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
View File

@@ -466,6 +466,7 @@ public class RepositoryRootResourceTest extends RepositoryTestBase {
@Test
public void shouldImportRepositoryFromUrl() throws URISyntaxException, IOException {
ArgumentCaptor<RepositoryImportEvent> captor = ArgumentCaptor.forClass(RepositoryImportEvent.class);
when(manager.getHandler("git")).thenReturn(repositoryHandler);
when(repositoryHandler.getType()).thenReturn(new RepositoryType("git", "git", ImmutableSet.of(Command.PULL)));
when(manager.create(any(Repository.class), any())).thenReturn(RepositoryTestData.create42Puzzle());
@@ -482,10 +483,14 @@ public class RepositoryRootResourceTest extends RepositoryTestBase {
dispatcher.invoke(request, response);
assertEquals(SC_CREATED, response.getStatus());
verify(eventBus).post(captor.capture());
assertThat(captor.getValue().isFailed()).isFalse();
}
@Test
public void shouldFailOnImportRepositoryFromUrl() throws URISyntaxException, IOException {
ArgumentCaptor<RepositoryImportEvent> captor = ArgumentCaptor.forClass(RepositoryImportEvent.class);
when(manager.getHandler("git")).thenReturn(repositoryHandler);
when(repositoryHandler.getType()).thenReturn(new RepositoryType("git", "git", ImmutableSet.of(Command.PULL)));
doThrow(ImportFailedException.class).when(manager).create(any(Repository.class), any());
@@ -502,10 +507,13 @@ public class RepositoryRootResourceTest extends RepositoryTestBase {
dispatcher.invoke(request, response);
assertEquals(500, response.getStatus());
verify(eventBus).post(captor.capture());
assertThat(captor.getValue().isFailed()).isTrue();
}
@Test
public void shouldPullChangesFromRemoteUrl() {
public void shouldPullChangesFromRemoteUrl() throws IOException {
PullCommandBuilder pullCommandBuilder = mock(PullCommandBuilder.class, RETURNS_SELF);
when(service.getPullCommand()).thenReturn(pullCommandBuilder);
@@ -518,7 +526,7 @@ public class RepositoryRootResourceTest extends RepositoryTestBase {
Consumer<Repository> repositoryConsumer = repositoryImportResource.pullChangesFromRemoteUrl(repositoryImportDto);
repositoryConsumer.accept(repository);
verify(eventBus).post(new RepositoryImportEvent(HandlerEventType.MODIFY, repository, false));
verify(pullCommandBuilder).pull("https://scm-manager.org/scm/repo/scmadmin/scm-manager.git");
}
@Test
@@ -539,7 +547,6 @@ public class RepositoryRootResourceTest extends RepositoryTestBase {
verify(pullCommandBuilder).withUsername("trillian");
verify(pullCommandBuilder).withPassword("secret");
verify(eventBus).post(new RepositoryImportEvent(HandlerEventType.MODIFY, repository, false));
}
@Test
@@ -556,8 +563,6 @@ public class RepositoryRootResourceTest extends RepositoryTestBase {
Consumer<Repository> repositoryConsumer = repositoryImportResource.pullChangesFromRemoteUrl(repositoryImportDto);
assertThrows(ImportFailedException.class, () -> repositoryConsumer.accept(repository));
verify(eventBus).post(new RepositoryImportEvent(HandlerEventType.MODIFY, repository, true));
}
private PageResult<Repository> createSingletonPageResult(Repository repository) {