Merge branch 'main' into rename_to_systemAdmin

line · Dec 10, 2024 · 7f9a0b7 · 7f9a0b7
2 parents 9987e03 + 810d02f
commit 7f9a0b7
Show file tree

Hide file tree

Showing 8 changed files with 352 additions and 217 deletions.
diff --git a/common/src/main/java/com/linecorp/centraldogma/common/RedundantChangeException.java b/common/src/main/java/com/linecorp/centraldogma/common/RedundantChangeException.java
@@ -16,37 +16,33 @@
 
 package com.linecorp.centraldogma.common;
 
+import static java.util.Objects.requireNonNull;
+
+import javax.annotation.Nullable;
+
 /**
  * A {@link CentralDogmaException} that is raised when attempted to push a commit without effective changes.
  */
 public class RedundantChangeException extends CentralDogmaException {
 
     private static final long serialVersionUID = 8739464985038079688L;
-
-    /**
-     * Creates a new instance.
-     */
-    public RedundantChangeException() {}
+    @Nullable
+    private final Revision headRevision;
 
     /**
      * Creates a new instance.
      */
     public RedundantChangeException(String message) {
         super(message);
+        headRevision = null;
     }
 
     /**
      * Creates a new instance.
      */
-    public RedundantChangeException(Throwable cause) {
-        super(cause);
-    }
-
-    /**
-     * Creates a new instance.
-     */
-    public RedundantChangeException(String message, Throwable cause) {
-        super(message, cause);
+    public RedundantChangeException(Revision headRevision, String message) {
+        super(message);
+        this.headRevision = requireNonNull(headRevision, "headRevision");
     }
 
     /**
@@ -57,13 +53,14 @@ public RedundantChangeException(String message, Throwable cause) {
      */
     public RedundantChangeException(String message, boolean writableStackTrace) {
         super(message, writableStackTrace);
+        headRevision = null;
     }
 
     /**
-     * Creates a new instance.
+     * Returns the head revision of the repository when this exception was raised.
      */
-    protected RedundantChangeException(String message, Throwable cause, boolean enableSuppression,
-                                       boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
+    @Nullable
+    public Revision headRevision() {
+        return headRevision;
     }
 }
diff --git a/.../linecorp/centraldogma/server/internal/storage/repository/git/AbstractChangesApplier.java b/.../linecorp/centraldogma/server/internal/storage/repository/git/AbstractChangesApplier.java
@@ -38,6 +38,7 @@
 import com.linecorp.centraldogma.common.CentralDogmaException;
 import com.linecorp.centraldogma.common.Revision;
 import com.linecorp.centraldogma.internal.Jackson;
+import com.linecorp.centraldogma.server.internal.admin.service.TokenNotFoundException;
 import com.linecorp.centraldogma.server.storage.StorageException;
 
 abstract class AbstractChangesApplier {
@@ -59,7 +60,7 @@ int apply(Repository jGitRepository, @Nullable Revision baseRevision,
             }
 
             return doApply(dirCache, reader, inserter);
-        } catch (CentralDogmaException | IllegalArgumentException e) {
+        } catch (CentralDogmaException | TokenNotFoundException | IllegalArgumentException e) {
             throw e;
         } catch (Exception e) {
             throw new StorageException("failed to apply changes on revision: " +

diff --git a/...java/com/linecorp/centraldogma/server/internal/storage/repository/git/CommitExecutor.java b/...java/com/linecorp/centraldogma/server/internal/storage/repository/git/CommitExecutor.java
@@ -156,10 +156,12 @@ RevisionAndEntries commit(@Nullable Revision prevRevision, Revision nextRevision
             }
 
             if (!allowEmptyCommit && isEmpty) {
+                // prevRevision is not null when allowEmptyCommit is false.
+                assert prevRevision != null;
                 throw new RedundantChangeException(
+                        prevRevision,
                         "changes did not change anything in " + gitRepository.parent().name() + '/' +
-                        gitRepository.name() + " at revision " +
-                        (prevRevision != null ? prevRevision.major() : 0) + ": " + changes);
+                        gitRepository.name() + " at revision " + prevRevision.major() + ": " + changes);
             }
 
             // flush the current index to repository and get the result tree object id.

diff --git a/...ecorp/centraldogma/server/internal/storage/repository/git/TransformingChangesApplier.java b/...ecorp/centraldogma/server/internal/storage/repository/git/TransformingChangesApplier.java
@@ -30,10 +30,12 @@
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.google.common.base.MoreObjects;
 
+import com.linecorp.centraldogma.common.CentralDogmaException;
 import com.linecorp.centraldogma.common.ChangeConflictException;
 import com.linecorp.centraldogma.common.EntryType;
 import com.linecorp.centraldogma.internal.Jackson;
 import com.linecorp.centraldogma.server.command.ContentTransformer;
+import com.linecorp.centraldogma.server.internal.admin.service.TokenNotFoundException;
 
 final class TransformingChangesApplier extends AbstractChangesApplier {
 
@@ -61,6 +63,8 @@ int doApply(DirCache dirCache, ObjectReader reader, ObjectInserter inserter) thr
                 applyPathEdit(dirCache, new InsertJson(changePath, inserter, newJsonNode));
                 return 1;
             }
+        } catch (CentralDogmaException | TokenNotFoundException | IllegalArgumentException e) {
+            throw e;
         } catch (Exception e) {
             throw new ChangeConflictException("failed to transform the content: " + oldJsonNode +
                                               " transformer: " + transformer, e);