From 135189839986f98cfb5c4455b681bdc43b2386e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 6 Nov 2018 11:01:33 +0100 Subject: [PATCH] Fix typo --- .../sonia/scm/repository/api/DiffCommandBuilder.java | 2 +- .../scm/api/rest/resources/DiffStreamingOutput.java | 2 +- .../sonia/scm/api/v2/resources/DiffRootResource.java | 2 +- .../sonia/scm/api/v2/resources/DiffResourceTest.java | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scm-core/src/main/java/sonia/scm/repository/api/DiffCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/DiffCommandBuilder.java index c0e9e3f622..d92cd57f1f 100644 --- a/scm-core/src/main/java/sonia/scm/repository/api/DiffCommandBuilder.java +++ b/scm-core/src/main/java/sonia/scm/repository/api/DiffCommandBuilder.java @@ -104,7 +104,7 @@ public final class DiffCommandBuilder * * @throws IOException */ - public DiffCommandBuilder retriveContent(OutputStream outputStream) throws IOException, RevisionNotFoundException { + public DiffCommandBuilder retrieveContent(OutputStream outputStream) throws IOException, RevisionNotFoundException { getDiffResult(outputStream); return this; diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/DiffStreamingOutput.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/DiffStreamingOutput.java index db29725917..1e452eeee2 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/DiffStreamingOutput.java +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/DiffStreamingOutput.java @@ -93,7 +93,7 @@ public class DiffStreamingOutput implements StreamingOutput public void write(OutputStream output) throws IOException { try { - builder.retriveContent(output); + builder.retrieveContent(output); } catch (RevisionNotFoundException ex) { diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java index dbbad2c076..6db23a7fce 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffRootResource.java @@ -66,7 +66,7 @@ public class DiffRootResource { repositoryService.getDiffCommand() .setRevision(revision) .setFormat(diffFormat) - .retriveContent(output); + .retrieveContent(output); } catch (RevisionNotFoundException e) { throw new WebApplicationException(Response.Status.NOT_FOUND); } diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java index 8c508be9fd..d530e0dd4e 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java @@ -92,7 +92,7 @@ public class DiffResourceTest extends RepositoryTestBase { public void shouldGetDiffs() throws Exception { when(diffCommandBuilder.setRevision(anyString())).thenReturn(diffCommandBuilder); when(diffCommandBuilder.setFormat(any())).thenReturn(diffCommandBuilder); - when(diffCommandBuilder.retriveContent(any())).thenReturn(diffCommandBuilder); + when(diffCommandBuilder.retrieveContent(any())).thenReturn(diffCommandBuilder); MockHttpRequest request = MockHttpRequest .get(DIFF_URL + "revision") .accept(VndMediaType.DIFF); @@ -124,7 +124,7 @@ public class DiffResourceTest extends RepositoryTestBase { public void shouldGet404OnMissingRevision() throws Exception { when(diffCommandBuilder.setRevision(anyString())).thenReturn(diffCommandBuilder); when(diffCommandBuilder.setFormat(any())).thenReturn(diffCommandBuilder); - when(diffCommandBuilder.retriveContent(any())).thenThrow(RevisionNotFoundException.class); + when(diffCommandBuilder.retrieveContent(any())).thenThrow(RevisionNotFoundException.class); MockHttpRequest request = MockHttpRequest .get(DIFF_URL + "revision") @@ -138,7 +138,7 @@ public class DiffResourceTest extends RepositoryTestBase { public void shouldGet400OnCrlfInjection() throws Exception { when(diffCommandBuilder.setRevision(anyString())).thenReturn(diffCommandBuilder); when(diffCommandBuilder.setFormat(any())).thenReturn(diffCommandBuilder); - when(diffCommandBuilder.retriveContent(any())).thenThrow(RevisionNotFoundException.class); + when(diffCommandBuilder.retrieveContent(any())).thenThrow(RevisionNotFoundException.class); MockHttpRequest request = MockHttpRequest .get(DIFF_URL + "ny%0D%0ASet-cookie:%20Tamper=3079675143472450634") @@ -152,7 +152,7 @@ public class DiffResourceTest extends RepositoryTestBase { public void shouldGet400OnUnknownFormat() throws Exception { when(diffCommandBuilder.setRevision(anyString())).thenReturn(diffCommandBuilder); when(diffCommandBuilder.setFormat(any())).thenReturn(diffCommandBuilder); - when(diffCommandBuilder.retriveContent(any())).thenThrow(RevisionNotFoundException.class); + when(diffCommandBuilder.retrieveContent(any())).thenThrow(RevisionNotFoundException.class); MockHttpRequest request = MockHttpRequest .get(DIFF_URL + "revision?format=Unknown") @@ -166,7 +166,7 @@ public class DiffResourceTest extends RepositoryTestBase { public void shouldAcceptDiffFormats() throws Exception { when(diffCommandBuilder.setRevision(anyString())).thenReturn(diffCommandBuilder); when(diffCommandBuilder.setFormat(any())).thenReturn(diffCommandBuilder); - when(diffCommandBuilder.retriveContent(any())).thenReturn(diffCommandBuilder); + when(diffCommandBuilder.retrieveContent(any())).thenReturn(diffCommandBuilder); Arrays.stream(DiffFormat.values()).map(DiffFormat::name).forEach( this::assertRequestOk