| + 1 + | ++ 1 + | ++ package com.cloudogu.scm.review.events; + | +
| + 2 + | ++ 2 + | ++ + | +
| + 3 + | ++ | + import com.cloudogu.scm.review.comment.service.BasicComment; + | +
| + 4 + | ++ | + import com.cloudogu.scm.review.comment.service.BasicCommentEvent; + | +
| + 5 + | ++ | + import com.cloudogu.scm.review.comment.service.CommentEvent; + | +
| + 6 + | ++ | + import com.cloudogu.scm.review.comment.service.ReplyEvent; + | +
| + 7 + | ++ 3 + | ++ import com.cloudogu.scm.review.pullrequest.service.BasicPullRequestEvent; + | +
| + 8 + | ++ 4 + | ++ import com.cloudogu.scm.review.pullrequest.service.PullRequest; + | +
| + 9 + | ++ | + import com.cloudogu.scm.review.pullrequest.service.PullRequestEvent; + | +
| + 10 + | ++ 5 + | ++ import com.github.legman.Subscribe; + | +
| + 11 + | ++ | + import lombok.Data; + | +
| + 12 + | ++ 6 + | ++ import org.apache.shiro.SecurityUtils; + | +
| + 13 + | ++ 7 + | ++ import org.apache.shiro.subject.PrincipalCollection; + | +
| + 14 + | ++ 8 + | ++ import org.apache.shiro.subject.Subject; + | +
| + 15 + | ++ 9 + | ++ import sonia.scm.EagerSingleton; + | +
| + 16 + | ++ | + import sonia.scm.HandlerEventType; + | +
| + 17 + | ++ | + import sonia.scm.event.HandlerEvent; + | +
| + 18 + | ++ 10 + | ++ import sonia.scm.plugin.Extension; + | +
| + 19 + | ++ 11 + | ++ import sonia.scm.repository.Repository; + | +
| + 20 + | ++ 12 + | ++ import sonia.scm.security.SessionId; + | +
|
+
+
+
+
+ diff.expandLastBottomByLines
+
+
+
+
+
+ diff.expandLastBottomComplete
+
+
+ |
+
|
+
+
+
+
+ diff.expandComplete
+
+
+ |
+ ||
| + 2 + | ++ 2 + | ++ import { Link } from "@scm-manager/ui-types"; + | +
| + 3 + | ++ 3 + | ++ import { apiClient, Toast, ToastButtons, ToastButton } from "@scm-manager/ui-components"; + | +
| + 4 + | ++ 4 + | ++ import { PullRequest } from "./types/PullRequest"; + | +
| + | + 5 + | ++ import { useTranslation } from "react-i18next"; + | +
| + 5 + | ++ 6 + | ++ + | +
| + 6 + | ++ 7 + | ++ type HandlerProps = { + | +
| + 7 + | ++ 8 + | ++ url: string; + | +
|
+
+
+
+
+ diff.expandComplete
+
+
+ |
+ ||
|
+
+
+
+
+ diff.expandComplete
+
+
+ |
+ ||
| + 15 + | ++ 16 + | ++ pullRequest: setEvent + | +
| + 16 + | ++ 17 + | ++ }); + | +
| + 17 + | ++ 18 + | ++ }, [url]); + | +
| + | + 19 + | ++ const { t } = useTranslation("plugins"); + | +
| + 18 + | ++ 20 + | ++ if (event) { + | +
| + 19 + | ++ 21 + | ++ return ( + | +
| + 20 + | ++ | + <Toast type="warning" title="New Changes"> + | +
| + 21 + | ++ | + <p>The underlying Pull-Request has changed. Press reload to see the changes.</p> + | +
| + 22 + | ++ | + <p>Warning: Non saved modification will be lost.</p> + | +
| + | + 22 + | ++ <Toast type="warning" title={t("scm-review-plugin.changeNotification.title")}> + | +
| + | + 23 + | ++ <p>{t("scm-review-plugin.changeNotification.description")}</p> + | +
| + | + 24 + | ++ <p>{t("scm-review-plugin.changeNotification.modificationWarning")}</p> + | +
| + 23 + | ++ 25 + | ++ <ToastButtons> + | +
| + 24 + | ++ | + <ToastButton icon="redo" onClick={reload}>Reload</ToastButton> + | +
| + 25 + | ++ | + <ToastButton icon="times" onClick={() => setEvent(undefined)}>Ignore</ToastButton> + | +
| + | + 26 + | ++ <ToastButton icon="redo" onClick={reload}> + | +
| + | + 27 + | ++ {t("scm-review-plugin.changeNotification.buttons.reload")} + | +
| + | + 28 + | ++ </ToastButton> + | +
| + | + 29 + | ++ <ToastButton icon="times" onClick={() => setEvent(undefined)}> + | +
| + | + 30 + | ++ {t("scm-review-plugin.changeNotification.buttons.ignore")} + | +
| + | + 31 + | ++ </ToastButton> + | +
| + 26 + | ++ 32 + | ++ </ToastButtons> + | +
| + 27 + | ++ 33 + | ++ </Toast> + | +
| + 28 + | ++ 34 + | ++ ); + | +
|
+
+
+
+
+ diff.expandLastBottomByLines
+
+
+
+
+
+ diff.expandLastBottomComplete
+
+
+ |
+
|
+
+
+
+
+ diff.expandByLines
+
+
+
+
+
+ diff.expandComplete
+
+
+ |
+ ||
| + 181 + | ++ 181 + | ++ "titleClickable": "Der Kommentar bezieht sich auf eine ältere Version des Source- oder Target-Branches. Klicken Sie hier, um den ursprünglichen Kontext zu sehen." + | +
| + 182 + | ++ 182 + | ++ } + | +
| + 183 + | ++ 183 + | ++ } + | +
| + | + 184 + | ++ }, + | +
| + | + 185 + | ++ "changeNotification": { + | +
| + | + 186 + | ++ "title": "Neue Änderungen", + | +
| + | + 187 + | ++ "description": "An diesem Pull Request wurden Änderungen vorgenommen. Laden Sie die Seite neu um diese anzuzeigen.", + | +
| + | + 188 + | ++ "modificationWarning": "Warnung: Nicht gespeicherte Eingaben gehen verloren.", + | +
| + | + 189 + | ++ "buttons": { + | +
| + | + 190 + | ++ "reload": "Neu laden", + | +
| + | + 191 + | ++ "ignore": "Ignorieren" + | +
| + | + 192 + | ++ } + | +
| + 184 + | ++ 193 + | ++ } + | +
| + 185 + | ++ 194 + | ++ }, + | +
| + 186 + | ++ 195 + | ++ "permissions": { + | +
|
+
+
+
+
+ diff.expandLastBottomByLines
+
+
+
+
+
+ diff.expandLastBottomComplete
+
+
+ |
+
|
+
+
+
+
+ diff.expandByLines
+
+
+
+
+
+ diff.expandComplete
+
+
+ |
+ ||
| + 181 + | ++ 181 + | ++ "titleClickable": "The comment is related to an older of the source or target branch. Click here to see the original context." + | +
| + 182 + | ++ 182 + | ++ } + | +
| + 183 + | ++ 183 + | ++ } + | +
| + | + 184 + | ++ }, + | +
| + | + 185 + | ++ "changeNotification": { + | +
| + | + 186 + | ++ "title": "New Changes", + | +
| + | + 187 + | ++ "description": "The underlying Pull-Request has changed. Press reload to see the changes.", + | +
| + | + 188 + | ++ "modificationWarning": "Warning: Non saved modification will be lost.", + | +
| + | + 189 + | ++ "buttons": { + | +
| + | + 190 + | ++ "reload": "Reload", + | +
| + | + 191 + | ++ "ignore": "Ignore" + | +
| + | + 192 + | ++ } + | +
| + 184 + | ++ 193 + | ++ } + | +
| + 185 + | ++ 194 + | ++ }, + | +
| + 186 + | ++ 195 + | ++ "permissions": { + | +
|
+
+
+
+
+ diff.expandLastBottomByLines
+
+
+
+
+
+ diff.expandLastBottomComplete
+
+
+ |
+
|
+
+
+
+
+ diff.expandComplete
+
+
+ |
+ ||
| + 7 + | ++ 7 + | ++ import org.mockito.Mock; + | +
| + 8 + | ++ 8 + | ++ import org.mockito.junit.jupiter.MockitoExtension; + | +
| + 9 + | ++ 9 + | ++ import sonia.scm.security.SessionId; + | +
| + | + 10 + | ++ + | +
| + 10 + | ++ 11 + | ++ import javax.ws.rs.sse.OutboundSseEvent; + | +
| + 11 + | ++ 12 + | ++ import javax.ws.rs.sse.SseEventSink; + | +
| + 12 + | ++ | + + | +
| + 13 + | ++ 13 + | ++ import java.time.Clock; + | +
| + 14 + | ++ 14 + | ++ import java.time.Instant; + | +
| + 15 + | ++ 15 + | ++ import java.time.LocalDateTime; + | +
| + 16 + | ++ 16 + | ++ import java.time.ZoneOffset; + | +
| + 17 + | ++ 17 + | ++ import java.time.temporal.ChronoField; + | +
| + 18 + | ++ | + import java.time.temporal.ChronoUnit; + | +
| + 19 + | ++ | + import java.time.temporal.TemporalField; + | +
| + 20 + | ++ 18 + | ++ import java.util.concurrent.CompletableFuture; + | +
| + 21 + | ++ 19 + | ++ import java.util.concurrent.CompletionStage; + | +
| + 22 + | ++ | + import java.util.concurrent.atomic.AtomicLong; + | +
| + 23 + | ++ 20 + | ++ import java.util.concurrent.atomic.AtomicReference; + | +
| + 24 + | ++ 21 + | ++ + | +
| + 25 + | ++ 22 + | ++ import static java.time.temporal.ChronoUnit.MINUTES; + | +
|
+
+
+
+
+ diff.expandByLines
+
+
+
+
+
+ diff.expandComplete
+
+
+ |
+ ||
|
+
+
+
+
+ diff.expandByLines
+
+
+
+
+
+ diff.expandComplete
+
+
+ |
+ ||
| + 83 + | ++ 80 + | ++ + | +
| + 84 + | ++ 81 + | ++ @Test + | +
| + 85 + | ++ 82 + | ++ @SuppressWarnings("unchecked") + | +
| + 86 + | ++ | + void shouldCloseEventSinkOnFailure() throws InterruptedException { + | +
| + | + 83 + | ++ void shouldCloseEventSinkOnFailure() { + | +
| + 87 + | ++ 84 + | ++ CompletionStage future = CompletableFuture.supplyAsync(() -> { + | +
| + 88 + | ++ 85 + | ++ throw new RuntimeException("failed to send message"); + | +
| + 89 + | ++ 86 + | ++ }); + | +
|
+
+
+
+
+ diff.expandComplete
+
+
+ |
+ ||
|
+
+
+
+
+ diff.expandComplete
+
+
+ |
+ ||
| + 91 + | ++ 88 + | ++ + | +
| + 92 + | ++ 89 + | ++ client.send(message); + | +
| + 93 + | ++ 90 + | ++ + | +
| + 94 + | ++ | + Thread.sleep(50L); + | +
| + 95 + | ++ | + + | +
| + 96 + | ++ | + verify(eventSink).close(); + | +
| + | + 91 + | ++ verify(eventSink, timeout(50L)).close(); + | +
| + 97 + | ++ 92 + | ++ } + | +
| + 98 + | ++ 93 + | ++ + | +
| + 99 + | ++ 94 + | ++ @Test + | +
|
+
+
+
+
+ diff.expandLastBottomByLines
+
+
+
+
+
+ diff.expandLastBottomComplete
+
+
+ |
+
| + | + 1 + | ++ import java.io.PrintStream; + | +
| + 1 + | ++ 2 + | ++ import java.util.Arrays; + | +
| + 2 + | ++ 3 + | ++ + | +
| + 3 + | ++ 4 + | ++ class Main { + | +
| + | + 5 + | ++ private static final PrintStream OUT = System.out; + | +
| + | + 6 + | ++ + | +
| + 4 + | ++ 7 + | ++ public static void main(String[] args) { + | +
| + | + 8 + | ++ <<<<<<< HEAD + | +
| + 5 + | ++ 9 + | ++ System.out.println("Expect nothing more to happen."); + | +
| + 6 + | ++ 10 + | ++ System.out.println("The command line parameters are:"); + | +
| + 7 + | ++ 11 + | ++ Arrays.stream(args).map(arg -> "- " + arg).forEach(System.out::println); + | +
| + | + 12 + | ++ ======= + | +
| + | + 13 + | ++ OUT.println("Expect nothing more to happen."); + | +
| + | + 14 + | ++ OUT.println("Parameters:"); + | +
| + | + 15 + | ++ Arrays.stream(args).map(arg -> "- " + arg).forEach(OUT::println); + | +
| + | + 16 + | ++ >>>>>>> feature/use_constant + | +
| + 8 + | ++ 17 + | ++ } + | +
| + 9 + | ++ 18 + | ++ } + | +
|
+
+
+
+
+ diff.expandLastBottomByLines
+
+
+
+
+
+ diff.expandLastBottomComplete
+
+
+ |
+
HEAD on the same URL. If a programming languge could be
* recognized, this will be given in the header Language.
- *
- * @param namespace the namespace of the repository
+ * @param namespace the namespace of the repository
* @param name the name of the repository
* @param revision the revision
* @param path The path of the file
+ * @param start
+ * @param end
*/
@GET
@Path("{revision}/{path: .*}")
@@ -94,8 +98,25 @@ public class ContentResource {
mediaType = VndMediaType.ERROR_TYPE,
schema = @Schema(implementation = ErrorDto.class)
))
- public Response get(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("revision") String revision, @PathParam("path") String path) {
- StreamingOutput stream = createStreamingOutput(namespace, name, revision, path);
+ @Parameter(
+ name = "start",
+ description = "If set, the content will be returned from this line on. The first line is line number 0. " +
+ "If omitted, the output will start with the first line."
+ )
+ @Parameter(
+ name = "end",
+ description = "If set, the content will be returned excluding the given line number and following." +
+ "The first line ist line number 0. " +
+ "If set to -1, no lines will be excluded (this equivalent to omitting this parameter"
+ )
+ public Response get(
+ @PathParam("namespace") String namespace,
+ @PathParam("name") String name,
+ @PathParam("revision") String revision,
+ @PathParam("path") String path,
+ @QueryParam("start") Integer start,
+ @QueryParam("end") Integer end) {
+ StreamingOutput stream = createStreamingOutput(namespace, name, revision, path, start, end);
try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) {
Response.ResponseBuilder responseBuilder = Response.ok(stream);
return createContentHeader(namespace, name, revision, path, repositoryService, responseBuilder);
@@ -105,11 +126,23 @@ public class ContentResource {
}
}
- private StreamingOutput createStreamingOutput(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("revision") String revision, @PathParam("path") String path) {
+ private StreamingOutput createStreamingOutput(String namespace, String name, String revision, String path, Integer start, Integer end) {
+ Integer effectiveEnd;
+ if (end != null && end < 0) {
+ effectiveEnd = null;
+ } else {
+ effectiveEnd = end;
+ }
return os -> {
+ OutputStream sourceOut;
+ if (start != null || effectiveEnd != null) {
+ sourceOut = new LineFilteredOutputStream(os, start, effectiveEnd);
+ } else {
+ sourceOut = os;
+ }
try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) {
- repositoryService.getCatCommand().setRevision(revision).retriveContent(os, path);
- os.close();
+ repositoryService.getCatCommand().setRevision(revision).retriveContent(sourceOut, path);
+ sourceOut.close();
} catch (NotFoundException e) {
LOG.debug(e.getMessage());
throw new WebApplicationException(Status.NOT_FOUND);
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffResultDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffResultDto.java
index 8df431632a..aa1f617945 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffResultDto.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffResultDto.java
@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
-
+
package sonia.scm.api.v2.resources;
import com.fasterxml.jackson.annotation.JsonInclude;
@@ -43,7 +43,11 @@ public class DiffResultDto extends HalRepresentation {
@Data
@JsonInclude(JsonInclude.Include.NON_DEFAULT)
- public static class FileDto {
+ public static class FileDto extends HalRepresentation {
+
+ public FileDto(Links links) {
+ super(links);
+ }
private String oldPath;
private String newPath;
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffResultToDiffResultDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffResultToDiffResultDtoMapper.java
index 5057950149..0384ed7d45 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffResultToDiffResultDtoMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DiffResultToDiffResultDtoMapper.java
@@ -27,6 +27,7 @@ package sonia.scm.api.v2.resources;
import com.github.sdorra.spotter.ContentTypes;
import com.github.sdorra.spotter.Language;
import com.google.inject.Inject;
+import de.otto.edison.hal.Links;
import sonia.scm.repository.Repository;
import sonia.scm.repository.api.DiffFile;
import sonia.scm.repository.api.DiffLine;
@@ -38,6 +39,7 @@ import java.util.List;
import java.util.Optional;
import java.util.OptionalInt;
+import static de.otto.edison.hal.Link.linkBuilder;
import static de.otto.edison.hal.Links.linkingTo;
/**
@@ -54,26 +56,30 @@ class DiffResultToDiffResultDtoMapper {
public DiffResultDto mapForIncoming(Repository repository, DiffResult result, String source, String target) {
DiffResultDto dto = new DiffResultDto(linkingTo().self(resourceLinks.incoming().diffParsed(repository.getNamespace(), repository.getName(), source, target)).build());
- setFiles(result, dto);
+ setFiles(result, dto, repository, source);
return dto;
}
public DiffResultDto mapForRevision(Repository repository, DiffResult result, String revision) {
DiffResultDto dto = new DiffResultDto(linkingTo().self(resourceLinks.diff().parsed(repository.getNamespace(), repository.getName(), revision)).build());
- setFiles(result, dto);
+ setFiles(result, dto, repository, revision);
return dto;
}
- private void setFiles(DiffResult result, DiffResultDto dto) {
+ private void setFiles(DiffResult result, DiffResultDto dto, Repository repository, String revision) {
List