commit feac10f71f09c012ce33e7aabd8f34ece7b09a96
author Antonio Barone <syntonyze@gmail.com> Mon Jun 16 08:50:52 2025 +0200
committer Antonio Barone <syntonyze@gmail.com> Mon Jun 16 08:51:09 2025 +0200
tree d04d97f74e0bf4fe2acb0924349634d1f24e7367
parent bbb7839be030a83ef645678bb6f8016867e5ec06
parent a01a6fa86c8b1cb1c46f02b26fc497bc165c4426

Merge branch 'stable-3.9' into stable-3.10

* stable-3.9:
  Clarify constraints of project deletions
  Introduce projectVersion cache
  Rename getPathFromDynamoDB to getItemFromDynamoDB
  Handle project deletion
  Verify formatting using GJF 1.7

Change-Id: I78375de50478505a21369ed6faf7a80819e48520

BUILD

diff --git a/BUILD b/BUILD
index 1dbc913..f45d775 100644
--- a/BUILD
+++ b/BUILD
@@ -53,13 +53,14 @@
         ":aws-dynamodb-refdb__plugin",
         "//plugins/global-refdb",
         "@amazon-regions//jar",
-        "@testcontainers//jar",
+        "@aws-java-sdk-dynamodb//jar",
         "@docker-java-api//jar",
         "@docker-java-transport//jar",
         "@duct-tape//jar",
         "@jna//jar",
         "@testcontainer-localstack//jar",
-        "@aws-java-sdk-dynamodb//jar",
+        "@testcontainers//jar",
+        "@visible-assertions//jar",
     ],
 )
 

external_plugin_deps.bzl

diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index c3aa3e8..8267357 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -97,6 +97,12 @@
     )
 
     maven_jar(
+        name = "visible-assertions",
+        artifact = "org.rnorth.visible-assertions:visible-assertions:2.1.2",
+        sha1 = "20d31a578030ec8e941888537267d3123c2ad1c1",
+    )
+
+    maven_jar(
         name = "docker-java-api",
         artifact = "com.github.docker-java:docker-java-api:" + DOCKER_JAVA_VERS,
         sha1 = "4ac22a72d546a9f3523cd4b5fabffa77c4a6ec7c",

src/test/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/dynamodb/DynamoDBRefDatabaseIT.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/dynamodb/DynamoDBRefDatabaseIT.java b/src/test/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/dynamodb/DynamoDBRefDatabaseIT.java
index ad82802..246ff79 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/dynamodb/DynamoDBRefDatabaseIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/dynamodb/DynamoDBRefDatabaseIT.java
@@ -15,12 +15,12 @@
 package com.googlesource.gerrit.plugins.validation.dfsrefdb.dynamodb;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth8.assertThat;
 import static com.googlesource.gerrit.plugins.validation.dfsrefdb.dynamodb.Configuration.DEFAULT_LOCKS_TABLE_NAME;
 import static com.googlesource.gerrit.plugins.validation.dfsrefdb.dynamodb.Configuration.DEFAULT_REFS_DB_TABLE_NAME;
 import static org.testcontainers.containers.localstack.LocalStackContainer.Service.DYNAMODB;
 
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
+import com.gerritforge.gerrit.globalrefdb.GlobalRefDbLockException;
 import com.google.common.cache.LoadingCache;
 import com.google.gerrit.acceptance.LightweightPluginDaemonTest;
 import com.google.gerrit.acceptance.TestPlugin;
@@ -53,6 +53,7 @@
           .withExposedPorts(LOCALSTACK_PORT);
 
   @Before
+  @Override
   public void setUpTestPlugin() throws Exception {
     localstack.start();
 
@@ -134,7 +135,8 @@
   }
 
   @Test
-  public void isUpToDateShouldReturnFalseWhenRefDoesNotPointToTheStoredRefValue() {
+  public void isUpToDateShouldReturnFalseWhenRefDoesNotPointToTheStoredRefValue()
+      throws GlobalRefDbLockException {
     String refName = "refs/changes/01/01/meta";
     String currentRefValue = "533d3ccf8a650fb26380faa732921a2c74924d5c";
     String previousRefValue = "9f6f2963cf44505428c61b935ff1ca65372cf28c";
@@ -146,7 +148,8 @@
   }
 
   @Test
-  public void isUpToDateShouldBeConsideredTrueWhenNoPreviousRefExists() {
+  public void isUpToDateShouldBeConsideredTrueWhenNoPreviousRefExists()
+      throws GlobalRefDbLockException {
     String refName = "refs/changes/01/01/meta";
     String currentRefValue = "533d3ccf8a650fb26380faa732921a2c74924d5c";
 
@@ -286,7 +289,7 @@
         .getSysInjector()
         .getInstance(
             Key.get(
-                new TypeLiteral<LoadingCache<String, Optional<Integer>>>() {},
+                new TypeLiteral<>() {},
                 Names.named(ProjectVersionCacheModule.PROJECT_VERSION_CACHE)));
   }