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

Author: ignite1771

java/com/google/copybara/BUILD

@@ -99,7 +99,6 @@ BASE_SRCS = [
     "LocalParallelizer.java",
     "Metadata.java",
     "MigrationInfo.java",
-    "NonReversibleValidationException.java",
     "Option.java",
     "Options.java",
     "Origin.java",

java/com/google/copybara/Core.java

@@ -37,6 +37,7 @@
 import com.google.copybara.doc.annotations.Example;
 import com.google.copybara.doc.annotations.UsesFlags;
 import com.google.copybara.exception.EmptyChangeException;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.feedback.Feedback;
 import com.google.copybara.folder.FolderModule;
 import com.google.copybara.templatetoken.Parser;

java/com/google/copybara/MapMapper.java

@@ -19,6 +19,7 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableMap;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.transform.ReversibleFunction;
 
 public class MapMapper implements ReversibleFunction<String, String> {

java/com/google/copybara/Transformation.java

@@ -16,6 +16,7 @@
 
 package com.google.copybara;
 
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.RepoException;
 import com.google.copybara.exception.ValidationException;
 import java.io.IOException;

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

@@ -19,12 +19,12 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
-import com.google.copybara.NonReversibleValidationException;
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
 import com.google.copybara.WorkflowOptions;
-import com.google.copybara.exception.ValidationException;
 import com.google.copybara.buildozer.BuildozerOptions.BuildozerCommand;
+import com.google.copybara.exception.NonReversibleValidationException;
+import com.google.copybara.exception.ValidationException;
 import java.io.IOException;
 
 /**

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

@@ -20,11 +20,11 @@
 
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
-import com.google.copybara.NonReversibleValidationException;
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
 import com.google.copybara.WorkflowOptions;
 import com.google.copybara.buildozer.BuildozerOptions.BuildozerCommand;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.ValidationException;
 import java.io.IOException;
 import javax.annotation.Nullable;

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

@@ -20,11 +20,11 @@
 
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
-import com.google.copybara.NonReversibleValidationException;
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
 import com.google.copybara.WorkflowOptions;
 import com.google.copybara.buildozer.BuildozerOptions.BuildozerCommand;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.util.console.Console;
 import java.io.IOException;

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

@@ -21,7 +21,7 @@
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
-import com.google.copybara.NonReversibleValidationException;
+import com.google.copybara.exception.NonReversibleValidationException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

java/com/google/copybara/exception/BUILD

@@ -28,5 +28,8 @@ java_library(
         ["**/*.java"],
     ),
     javacopts = JAVACOPTS,
-    deps = ["//third_party:error_prone"],
+    deps = [
+        "//third_party:error_prone",
+        "//third_party:starlark",
+    ],
 )

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

@@ -14,15 +14,13 @@
  * limitations under the License.
  */
 
-package com.google.copybara;
+package com.google.copybara.exception;
 
 import net.starlark.java.eval.EvalException;
 
 /**
- * Exception thrown when a {@link Transformation} is not reversible but the configuration asked for
- * the reverse.
- *
- * TODO(malcon): Move to the exception package
+ * Exception thrown when a {@link com.google.copybara.Transformation} is not reversible
+ * but the configuration asked for the reverse.
  */
 public class NonReversibleValidationException extends EvalException {
 

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

@@ -27,10 +27,10 @@
 import com.google.common.collect.Iterables;
 import com.google.common.flogger.FluentLogger;
 import com.google.copybara.GeneralOptions;
-import com.google.copybara.NonReversibleValidationException;
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
 import com.google.copybara.WorkflowOptions;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.util.BadExitStatusWithOutputException;
 import com.google.copybara.util.CommandOutput;

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

@@ -21,10 +21,10 @@
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
-import com.google.copybara.NonReversibleValidationException;
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
 import com.google.copybara.WorkflowOptions;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.util.FileUtil;
 import com.google.copybara.util.Glob;

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

@@ -22,10 +22,10 @@
 import com.google.common.collect.Iterables;
 import com.google.common.flogger.FluentLogger;
 import com.google.copybara.LocalParallelizer.TransformFunc;
-import com.google.copybara.NonReversibleValidationException;
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
 import com.google.copybara.WorkflowOptions;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.treestate.TreeState.FileState;
 import com.google.copybara.util.Glob;

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

@@ -20,10 +20,10 @@
 
 import com.google.common.base.Preconditions;
 import com.google.common.flogger.FluentLogger;
-import com.google.copybara.NonReversibleValidationException;
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
 import com.google.copybara.WorkflowOptions;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.util.FileUtil;
 import com.google.copybara.util.Glob;

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

@@ -25,10 +25,10 @@
 import com.google.common.collect.Iterables;
 import com.google.common.flogger.FluentLogger;
 import com.google.copybara.LocalParallelizer;
-import com.google.copybara.NonReversibleValidationException;
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
 import com.google.copybara.WorkflowOptions;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.transform.RegexTemplateTokens.Replacer;
 import com.google.copybara.treestate.TreeState.FileState;

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

@@ -21,7 +21,7 @@
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.google.common.collect.ImmutableList;
-import com.google.copybara.NonReversibleValidationException;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.transform.RegexTemplateTokens.Replacer;
 import java.util.concurrent.ExecutionException;
 

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

@@ -16,7 +16,7 @@
 
 package com.google.copybara.transform;
 
-import com.google.copybara.NonReversibleValidationException;
+import com.google.copybara.exception.NonReversibleValidationException;
 import java.util.function.Function;
 import net.starlark.java.annot.StarlarkBuiltin;
 import net.starlark.java.eval.StarlarkValue;

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

@@ -19,9 +19,9 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
-import com.google.copybara.NonReversibleValidationException;
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.RepoException;
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.profiler.Profiler;

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

@@ -21,10 +21,10 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.copybara.NonReversibleValidationException;
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
 import com.google.copybara.exception.EmptyChangeException;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.RepoException;
 import com.google.copybara.exception.ValidationException;
 import java.io.IOException;

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

@@ -29,9 +29,9 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.copybara.LocalParallelizer;
-import com.google.copybara.NonReversibleValidationException;
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.treestate.TreeState.FileState;
 import com.google.copybara.util.Glob;

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

@@ -27,9 +27,9 @@
 import com.google.common.collect.Maps;
 import com.google.common.hash.Hashing;
 import com.google.common.io.BaseEncoding;
-import com.google.copybara.NonReversibleValidationException;
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.RepoException;
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.treestate.TreeState;

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

@@ -23,12 +23,12 @@
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableMap;
 import com.google.copybara.Change;
-import com.google.copybara.NonReversibleValidationException;
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
 import com.google.copybara.authoring.Author;
 import com.google.copybara.authoring.AuthorParser;
 import com.google.copybara.authoring.InvalidAuthorException;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.transform.ExplicitReversal;
 import com.google.copybara.transform.IntentionalNoop;

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

@@ -18,9 +18,9 @@
 
 import com.google.common.collect.Lists;
 import com.google.copybara.Change;
-import com.google.copybara.NonReversibleValidationException;
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.templatetoken.LabelTemplate;
 import com.google.copybara.templatetoken.LabelTemplate.LabelNotFoundException;

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

@@ -19,9 +19,9 @@
 import static com.google.copybara.exception.ValidationException.checkCondition;
 
 import com.google.common.base.Preconditions;
-import com.google.copybara.NonReversibleValidationException;
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.transform.ExplicitReversal;
 import com.google.copybara.transform.IntentionalNoop;

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

@@ -20,10 +20,10 @@
 import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.Iterables;
 import com.google.copybara.Change;
-import com.google.copybara.NonReversibleValidationException;
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
 import com.google.copybara.authoring.Author;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.ValidationException;
 import java.io.IOException;
 import net.starlark.java.eval.EvalException;

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

@@ -17,9 +17,9 @@
 package com.google.copybara.transform.metadata;
 
 import com.google.common.base.Preconditions;
-import com.google.copybara.NonReversibleValidationException;
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.ValidationException;
 import java.io.IOException;
 import net.starlark.java.syntax.Location;

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

@@ -17,9 +17,9 @@
 package com.google.copybara.transform.metadata;
 
 import com.google.common.base.Preconditions;
-import com.google.copybara.NonReversibleValidationException;
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.transform.ExplicitReversal;
 import com.google.copybara.transform.IntentionalNoop;

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

@@ -18,9 +18,9 @@
 
 import com.google.common.base.Preconditions;
 import com.google.copybara.Change;
-import com.google.copybara.NonReversibleValidationException;
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.transform.ExplicitReversal;
 import com.google.copybara.transform.IntentionalNoop;

javatests/com/google/copybara/CoreReverseTest.java

@@ -20,6 +20,7 @@
 import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.testing.OptionsBuilder;
 import com.google.copybara.testing.SkylarkTestExecutor;

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

@@ -23,8 +23,8 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.jimfs.Jimfs;
-import com.google.copybara.NonReversibleValidationException;
 import com.google.copybara.Transformation;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.testing.OptionsBuilder;
 import com.google.copybara.testing.SkylarkTestExecutor;

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

@@ -18,9 +18,10 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static java.nio.file.Paths.get;
-import com.google.copybara.NonReversibleValidationException;
+
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.exception.VoidOperationException;
 import com.google.copybara.testing.TransformWorks;

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

@@ -23,9 +23,9 @@
 
 import com.google.common.base.Joiner;
 import com.google.common.jimfs.Jimfs;
-import com.google.copybara.NonReversibleValidationException;
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.testing.OptionsBuilder;
 import com.google.copybara.testing.SkylarkTestExecutor;

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

@@ -29,14 +29,14 @@
 import com.google.common.collect.Iterables;
 import com.google.copybara.Change;
 import com.google.copybara.Changes;
-import com.google.copybara.NonReversibleValidationException;
 import com.google.copybara.TransformWork;
 import com.google.copybara.Transformation;
 import com.google.copybara.Workflow;
 import com.google.copybara.WorkflowMode;
 import com.google.copybara.authoring.Author;
 import com.google.copybara.config.Config;
 import com.google.copybara.config.MapConfigFile;
+import com.google.copybara.exception.NonReversibleValidationException;
 import com.google.copybara.exception.RepoException;
 import com.google.copybara.exception.ValidationException;
 import com.google.copybara.testing.DummyOrigin;
@@ -48,14 +48,12 @@
 import com.google.copybara.testing.TransformWorks;
 import com.google.copybara.util.console.Message.MessageType;
 import com.google.copybara.util.console.testing.TestingConsole;
-
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;