Skip to content

Commit d052311

Browse files
ignite1771mikelalcon
authored andcommitted
GitHub PR#160 Refactor NonReversibleValidationException pkg
-- 9de1cfc by ignite1771 <[email protected]>: Categorize it into exception package and solve related build dependencies. Closes #160 Change-Id: I72d8cdfbffa031c2941e8532d2a50baca7264408 PiperOrigin-RevId: 374244608
1 parent 44ca710 commit d052311

33 files changed

+39
-36
lines changed

java/com/google/copybara/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ BASE_SRCS = [
9999
"LocalParallelizer.java",
100100
"Metadata.java",
101101
"MigrationInfo.java",
102-
"NonReversibleValidationException.java",
103102
"Option.java",
104103
"Options.java",
105104
"Origin.java",

java/com/google/copybara/Core.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import com.google.copybara.doc.annotations.Example;
3838
import com.google.copybara.doc.annotations.UsesFlags;
3939
import com.google.copybara.exception.EmptyChangeException;
40+
import com.google.copybara.exception.NonReversibleValidationException;
4041
import com.google.copybara.feedback.Feedback;
4142
import com.google.copybara.folder.FolderModule;
4243
import com.google.copybara.templatetoken.Parser;

java/com/google/copybara/MapMapper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.google.common.base.Preconditions;
2020
import com.google.common.collect.ImmutableBiMap;
2121
import com.google.common.collect.ImmutableMap;
22+
import com.google.copybara.exception.NonReversibleValidationException;
2223
import com.google.copybara.transform.ReversibleFunction;
2324

2425
public class MapMapper implements ReversibleFunction<String, String> {

java/com/google/copybara/Transformation.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.google.copybara;
1818

19+
import com.google.copybara.exception.NonReversibleValidationException;
1920
import com.google.copybara.exception.RepoException;
2021
import com.google.copybara.exception.ValidationException;
2122
import java.io.IOException;

java/com/google/copybara/buildozer/BuildozerBatch.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
import com.google.common.base.Preconditions;
2020
import com.google.common.collect.ImmutableList;
2121
import com.google.common.collect.Iterables;
22-
import com.google.copybara.NonReversibleValidationException;
2322
import com.google.copybara.TransformWork;
2423
import com.google.copybara.Transformation;
2524
import com.google.copybara.WorkflowOptions;
26-
import com.google.copybara.exception.ValidationException;
2725
import com.google.copybara.buildozer.BuildozerOptions.BuildozerCommand;
26+
import com.google.copybara.exception.NonReversibleValidationException;
27+
import com.google.copybara.exception.ValidationException;
2828
import java.io.IOException;
2929

3030
/**

java/com/google/copybara/buildozer/BuildozerDelete.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020

2121
import com.google.common.base.MoreObjects;
2222
import com.google.common.collect.ImmutableList;
23-
import com.google.copybara.NonReversibleValidationException;
2423
import com.google.copybara.TransformWork;
2524
import com.google.copybara.Transformation;
2625
import com.google.copybara.WorkflowOptions;
2726
import com.google.copybara.buildozer.BuildozerOptions.BuildozerCommand;
27+
import com.google.copybara.exception.NonReversibleValidationException;
2828
import com.google.copybara.exception.ValidationException;
2929
import java.io.IOException;
3030
import javax.annotation.Nullable;

java/com/google/copybara/buildozer/BuildozerModify.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020

2121
import com.google.common.base.MoreObjects;
2222
import com.google.common.collect.ImmutableList;
23-
import com.google.copybara.NonReversibleValidationException;
2423
import com.google.copybara.TransformWork;
2524
import com.google.copybara.Transformation;
2625
import com.google.copybara.WorkflowOptions;
2726
import com.google.copybara.buildozer.BuildozerOptions.BuildozerCommand;
27+
import com.google.copybara.exception.NonReversibleValidationException;
2828
import com.google.copybara.exception.ValidationException;
2929
import com.google.copybara.util.console.Console;
3030
import java.io.IOException;

java/com/google/copybara/buildozer/Command.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.google.common.base.Joiner;
2222
import com.google.common.base.Preconditions;
2323
import com.google.common.base.Splitter;
24-
import com.google.copybara.NonReversibleValidationException;
24+
import com.google.copybara.exception.NonReversibleValidationException;
2525
import java.util.ArrayList;
2626
import java.util.Collections;
2727
import java.util.List;

java/com/google/copybara/exception/BUILD

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,8 @@ java_library(
2828
["**/*.java"],
2929
),
3030
javacopts = JAVACOPTS,
31-
deps = ["//third_party:error_prone"],
31+
deps = [
32+
"//third_party:error_prone",
33+
"//third_party:starlark",
34+
],
3235
)

java/com/google/copybara/NonReversibleValidationException.java renamed to java/com/google/copybara/exception/NonReversibleValidationException.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.copybara;
17+
package com.google.copybara.exception;
1818

1919
import net.starlark.java.eval.EvalException;
2020

2121
/**
22-
* Exception thrown when a {@link Transformation} is not reversible but the configuration asked for
23-
* the reverse.
24-
*
25-
* TODO(malcon): Move to the exception package
22+
* Exception thrown when a {@link com.google.copybara.Transformation} is not reversible
23+
* but the configuration asked for the reverse.
2624
*/
2725
public class NonReversibleValidationException extends EvalException {
2826

0 commit comments

Comments
 (0)