opendev/gerrit
Code Issues Proposed changes

Split off library classes from server/patch/ into diff/

Browse Source 
The server library is large, and its resulting compilation time gets
in the way of edit/compile/debug cycles.

The new diff library files depend mainly on JGit, and are independent
of the Guice stack in the server library.

Change-Id: I483992fff91873b1c1751c16fe3a83b823f4f8fa
This commit is contained in:
Han-Wen Nienhuys
2017-11-10 11:35:12 +01:00
parent 309fc90ea9
commit 0d157b3561
75 changed files with 263 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
java/com/google/gerrit/server/patch/IntraLineDiffArgs.java
View File

@@ -1,56 +0,0 @@
// Copyright (C) 2015 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.server.patch;
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import com.google.gerrit.reviewdb.client.Project;
import java.util.List;
import org.eclipse.jgit.diff.Edit;
import org.eclipse.jgit.lib.ObjectId;
@AutoValue
public abstract class IntraLineDiffArgs {
public static IntraLineDiffArgs create(
Text aText,
Text bText,
List<Edit> edits,
Project.NameKey project,
ObjectId commit,
String path) {
return new AutoValue_IntraLineDiffArgs(
aText, bText, deepCopyEdits(edits), project, commit, path);
}
private static ImmutableList<Edit> deepCopyEdits(List<Edit> edits) {
return edits.stream().map(IntraLineDiffArgs::copy).collect(ImmutableList.toImmutableList());
}
private static Edit copy(Edit edit) {
return new Edit(edit.getBeginA(), edit.getEndA(), edit.getBeginB(), edit.getEndB());
}
public abstract Text aText();
public abstract Text bText();
public abstract ImmutableList<Edit> edits();
public abstract Project.NameKey project();
public abstract ObjectId commit();
public abstract String path();
}