Skip to content

Commit f43ed1e

Browse files
committed
google#159 Refactor NonReversibleValidationException package
Categorize it into exception package and solve related build dependencies.
1 parent 185e6e8 commit f43ed1e

33 files changed

+37
-33
lines changed

java/com/google/copybara/BUILD

-1
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

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import com.google.copybara.doc.annotations.Example;
3636
import com.google.copybara.doc.annotations.UsesFlags;
3737
import com.google.copybara.exception.EmptyChangeException;
38+
import com.google.copybara.exception.NonReversibleValidationException;
3839
import com.google.copybara.feedback.Action;
3940
import com.google.copybara.feedback.Feedback;
4041
import com.google.copybara.feedback.StarlarkAction;

java/com/google/copybara/MapMapper.java

+1
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

+1
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
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;
22+
import com.google.copybara.exception.NonReversibleValidationException;
2323
import com.google.copybara.TransformWork;
2424
import com.google.copybara.Transformation;
2525
import com.google.copybara.WorkflowOptions;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import com.google.common.base.MoreObjects;
2222
import com.google.common.collect.ImmutableList;
23-
import com.google.copybara.NonReversibleValidationException;
23+
import com.google.copybara.exception.NonReversibleValidationException;
2424
import com.google.copybara.TransformWork;
2525
import com.google.copybara.Transformation;
2626
import com.google.copybara.WorkflowOptions;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import com.google.common.base.MoreObjects;
2222
import com.google.common.collect.ImmutableList;
23-
import com.google.copybara.NonReversibleValidationException;
23+
import com.google.copybara.exception.NonReversibleValidationException;
2424
import com.google.copybara.TransformWork;
2525
import com.google.copybara.Transformation;
2626
import com.google.copybara.WorkflowOptions;

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

+1-1
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

+4-1
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:starlark",
33+
"//third_party:error_prone"
34+
],
3235
)

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

+3-5
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

java/com/google/copybara/format/BuildifierFormat.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.google.common.collect.Iterables;
2828
import com.google.common.flogger.FluentLogger;
2929
import com.google.copybara.GeneralOptions;
30-
import com.google.copybara.NonReversibleValidationException;
30+
import com.google.copybara.exception.NonReversibleValidationException;
3131
import com.google.copybara.TransformWork;
3232
import com.google.copybara.Transformation;
3333
import com.google.copybara.WorkflowOptions;

java/com/google/copybara/transform/CopyOrMove.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.google.common.base.MoreObjects;
2222
import com.google.common.base.Preconditions;
2323
import com.google.common.collect.ImmutableList;
24-
import com.google.copybara.NonReversibleValidationException;
24+
import com.google.copybara.exception.NonReversibleValidationException;
2525
import com.google.copybara.TransformWork;
2626
import com.google.copybara.Transformation;
2727
import com.google.copybara.WorkflowOptions;

java/com/google/copybara/transform/FilterReplace.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.google.common.collect.Iterables;
2323
import com.google.common.flogger.FluentLogger;
2424
import com.google.copybara.LocalParallelizer.TransformFunc;
25-
import com.google.copybara.NonReversibleValidationException;
25+
import com.google.copybara.exception.NonReversibleValidationException;
2626
import com.google.copybara.TransformWork;
2727
import com.google.copybara.Transformation;
2828
import com.google.copybara.WorkflowOptions;

java/com/google/copybara/transform/Remove.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import com.google.common.base.Preconditions;
2222
import com.google.common.flogger.FluentLogger;
23-
import com.google.copybara.NonReversibleValidationException;
23+
import com.google.copybara.exception.NonReversibleValidationException;
2424
import com.google.copybara.TransformWork;
2525
import com.google.copybara.Transformation;
2626
import com.google.copybara.WorkflowOptions;

java/com/google/copybara/transform/Replace.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import com.google.common.collect.Iterables;
2626
import com.google.common.flogger.FluentLogger;
2727
import com.google.copybara.LocalParallelizer;
28-
import com.google.copybara.NonReversibleValidationException;
28+
import com.google.copybara.exception.NonReversibleValidationException;
2929
import com.google.copybara.TransformWork;
3030
import com.google.copybara.Transformation;
3131
import com.google.copybara.WorkflowOptions;

java/com/google/copybara/transform/ReplaceMapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.google.common.cache.CacheLoader;
2222
import com.google.common.cache.LoadingCache;
2323
import com.google.common.collect.ImmutableList;
24-
import com.google.copybara.NonReversibleValidationException;
24+
import com.google.copybara.exception.NonReversibleValidationException;
2525
import com.google.copybara.transform.RegexTemplateTokens.Replacer;
2626
import java.util.concurrent.ExecutionException;
2727

java/com/google/copybara/transform/ReversibleFunction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.google.copybara.transform;
1818

19-
import com.google.copybara.NonReversibleValidationException;
19+
import com.google.copybara.exception.NonReversibleValidationException;
2020
import java.util.function.Function;
2121
import net.starlark.java.annot.StarlarkBuiltin;
2222
import net.starlark.java.eval.StarlarkValue;

java/com/google/copybara/transform/Sequence.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.google.common.annotations.VisibleForTesting;
2020
import com.google.common.base.Preconditions;
2121
import com.google.common.collect.ImmutableList;
22-
import com.google.copybara.NonReversibleValidationException;
22+
import com.google.copybara.exception.NonReversibleValidationException;
2323
import com.google.copybara.TransformWork;
2424
import com.google.copybara.Transformation;
2525
import com.google.copybara.exception.RepoException;

java/com/google/copybara/transform/SkylarkTransformation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.google.common.base.Preconditions;
2222
import com.google.common.collect.ImmutableList;
2323
import com.google.common.collect.ImmutableMap;
24-
import com.google.copybara.NonReversibleValidationException;
24+
import com.google.copybara.exception.NonReversibleValidationException;
2525
import com.google.copybara.TransformWork;
2626
import com.google.copybara.Transformation;
2727
import com.google.copybara.exception.EmptyChangeException;

java/com/google/copybara/transform/TodoReplace.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import com.google.common.collect.ImmutableMap;
3030
import com.google.common.collect.Iterables;
3131
import com.google.copybara.LocalParallelizer;
32-
import com.google.copybara.NonReversibleValidationException;
32+
import com.google.copybara.exception.NonReversibleValidationException;
3333
import com.google.copybara.TransformWork;
3434
import com.google.copybara.Transformation;
3535
import com.google.copybara.exception.ValidationException;

java/com/google/copybara/transform/debug/TransformDebug.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.google.common.collect.Maps;
2828
import com.google.common.hash.Hashing;
2929
import com.google.common.io.BaseEncoding;
30-
import com.google.copybara.NonReversibleValidationException;
30+
import com.google.copybara.exception.NonReversibleValidationException;
3131
import com.google.copybara.TransformWork;
3232
import com.google.copybara.Transformation;
3333
import com.google.copybara.exception.RepoException;

java/com/google/copybara/transform/metadata/MapAuthor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.google.common.collect.ImmutableBiMap;
2424
import com.google.common.collect.ImmutableMap;
2525
import com.google.copybara.Change;
26-
import com.google.copybara.NonReversibleValidationException;
26+
import com.google.copybara.exception.NonReversibleValidationException;
2727
import com.google.copybara.TransformWork;
2828
import com.google.copybara.Transformation;
2929
import com.google.copybara.authoring.Author;

java/com/google/copybara/transform/metadata/MetadataSquashNotes.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.google.common.collect.Lists;
2020
import com.google.copybara.Change;
21-
import com.google.copybara.NonReversibleValidationException;
21+
import com.google.copybara.exception.NonReversibleValidationException;
2222
import com.google.copybara.TransformWork;
2323
import com.google.copybara.Transformation;
2424
import com.google.copybara.exception.ValidationException;

java/com/google/copybara/transform/metadata/MetadataVerifyMatch.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import static com.google.copybara.exception.ValidationException.checkCondition;
2020

2121
import com.google.common.base.Preconditions;
22-
import com.google.copybara.NonReversibleValidationException;
22+
import com.google.copybara.exception.NonReversibleValidationException;
2323
import com.google.copybara.TransformWork;
2424
import com.google.copybara.Transformation;
2525
import com.google.copybara.exception.ValidationException;

java/com/google/copybara/transform/metadata/RestoreOriginalAuthor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.google.common.collect.ImmutableCollection;
2121
import com.google.common.collect.Iterables;
2222
import com.google.copybara.Change;
23-
import com.google.copybara.NonReversibleValidationException;
23+
import com.google.copybara.exception.NonReversibleValidationException;
2424
import com.google.copybara.TransformWork;
2525
import com.google.copybara.Transformation;
2626
import com.google.copybara.authoring.Author;

java/com/google/copybara/transform/metadata/SaveOriginalAuthor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package com.google.copybara.transform.metadata;
1818

1919
import com.google.common.base.Preconditions;
20-
import com.google.copybara.NonReversibleValidationException;
20+
import com.google.copybara.exception.NonReversibleValidationException;
2121
import com.google.copybara.TransformWork;
2222
import com.google.copybara.Transformation;
2323
import com.google.copybara.exception.ValidationException;

java/com/google/copybara/transform/metadata/Scrubber.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package com.google.copybara.transform.metadata;
1818

1919
import com.google.common.base.Preconditions;
20-
import com.google.copybara.NonReversibleValidationException;
20+
import com.google.copybara.exception.NonReversibleValidationException;
2121
import com.google.copybara.TransformWork;
2222
import com.google.copybara.Transformation;
2323
import com.google.copybara.exception.ValidationException;

java/com/google/copybara/transform/metadata/UseLastChange.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.google.common.base.Preconditions;
2020
import com.google.copybara.Change;
21-
import com.google.copybara.NonReversibleValidationException;
21+
import com.google.copybara.exception.NonReversibleValidationException;
2222
import com.google.copybara.TransformWork;
2323
import com.google.copybara.Transformation;
2424
import com.google.copybara.exception.ValidationException;

javatests/com/google/copybara/CoreReverseTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static org.junit.Assert.assertThrows;
2121

2222
import com.google.common.collect.ImmutableSet;
23+
import com.google.copybara.exception.NonReversibleValidationException;
2324
import com.google.copybara.exception.ValidationException;
2425
import com.google.copybara.testing.OptionsBuilder;
2526
import com.google.copybara.testing.SkylarkTestExecutor;

javatests/com/google/copybara/transform/CopyOrMoveTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import com.google.common.collect.ImmutableList;
2525
import com.google.common.jimfs.Jimfs;
26-
import com.google.copybara.NonReversibleValidationException;
26+
import com.google.copybara.exception.NonReversibleValidationException;
2727
import com.google.copybara.Transformation;
2828
import com.google.copybara.exception.ValidationException;
2929
import com.google.copybara.testing.OptionsBuilder;

javatests/com/google/copybara/transform/ExplicitReversalTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import static com.google.common.truth.Truth.assertThat;
2020
import static java.nio.file.Paths.get;
21-
import com.google.copybara.NonReversibleValidationException;
21+
import com.google.copybara.exception.NonReversibleValidationException;
2222
import com.google.copybara.TransformWork;
2323
import com.google.copybara.Transformation;
2424
import com.google.copybara.exception.ValidationException;

javatests/com/google/copybara/transform/TodoReplaceTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import com.google.common.base.Joiner;
2525
import com.google.common.jimfs.Jimfs;
26-
import com.google.copybara.NonReversibleValidationException;
26+
import com.google.copybara.exception.NonReversibleValidationException;
2727
import com.google.copybara.TransformWork;
2828
import com.google.copybara.Transformation;
2929
import com.google.copybara.exception.ValidationException;

javatests/com/google/copybara/transform/metadata/MetadataModuleTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import com.google.common.collect.Iterables;
3030
import com.google.copybara.Change;
3131
import com.google.copybara.Changes;
32-
import com.google.copybara.NonReversibleValidationException;
32+
import com.google.copybara.exception.NonReversibleValidationException;
3333
import com.google.copybara.TransformWork;
3434
import com.google.copybara.Transformation;
3535
import com.google.copybara.Workflow;

0 commit comments

Comments
 (0)