Skip to content

Commit bd49f70

Browse files
j-gaocopybara-github
authored andcommitted
Move storage transaction interfaces to a generic directory.
PiperOrigin-RevId: 846629012
1 parent 3238125 commit bd49f70

File tree

15 files changed

+23
-23
lines changed

15 files changed

+23
-23
lines changed

src/java/com/google/devtools/mobileharness/infra/master/central/storage/lab/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ java_library(
3131
"//src/devtools/mobileharness/infra/master/central/proto:lab_java_proto",
3232
"//src/java/com/google/devtools/mobileharness/api/model/error",
3333
"//src/java/com/google/devtools/mobileharness/api/model/lab:locator",
34-
"//src/java/com/google/devtools/mobileharness/infra/master/central/storage:transaction_context",
34+
"//src/java/com/google/devtools/mobileharness/shared/storage/transaction:transaction_context",
3535
"@maven//:com_google_errorprone_error_prone_annotations",
3636
],
3737
)

src/java/com/google/devtools/mobileharness/infra/master/central/storage/lab/LabRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.google.devtools.mobileharness.api.model.error.MobileHarnessException;
2020
import com.google.devtools.mobileharness.api.model.lab.LabLocator;
2121
import com.google.devtools.mobileharness.infra.master.central.proto.Lab.LabServerCondition;
22-
import com.google.devtools.mobileharness.infra.master.central.storage.TransactionContext;
22+
import com.google.devtools.mobileharness.shared.storage.transaction.TransactionContext;
2323
import com.google.errorprone.annotations.CanIgnoreReturnValue;
2424
import java.util.Optional;
2525

src/java/com/google/devtools/mobileharness/infra/master/central/storage/mysql/BUILD

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ java_library(
3333
":mysql",
3434
"//src/java/com/google/devtools/mobileharness/api/model/error",
3535
"//src/java/com/google/devtools/mobileharness/infra/master/central:annotation",
36-
"//src/java/com/google/devtools/mobileharness/infra/master/central/storage:transaction_runner",
3736
"//src/java/com/google/devtools/mobileharness/infra/master/central/storage/lab:lab_repository",
37+
"//src/java/com/google/devtools/mobileharness/shared/storage/transaction:transaction_runner",
3838
"//src/java/com/google/devtools/mobileharness/shared/util/database:database_connections",
3939
"//src/java/com/google/devtools/mobileharness/shared/util/flags",
4040
"//src/java/com/google/devtools/mobileharness/shared/util/logging:google_logger",
@@ -56,11 +56,11 @@ java_library(
5656
"//src/java/com/google/devtools/mobileharness/api/model/error",
5757
"//src/java/com/google/devtools/mobileharness/api/model/lab:locator",
5858
"//src/java/com/google/devtools/mobileharness/infra/master/central:annotation",
59-
"//src/java/com/google/devtools/mobileharness/infra/master/central/storage:transaction_config",
60-
"//src/java/com/google/devtools/mobileharness/infra/master/central/storage:transaction_context",
61-
"//src/java/com/google/devtools/mobileharness/infra/master/central/storage:transaction_runner",
62-
"//src/java/com/google/devtools/mobileharness/infra/master/central/storage:transaction_worker",
6359
"//src/java/com/google/devtools/mobileharness/infra/master/central/storage/lab:lab_repository",
60+
"//src/java/com/google/devtools/mobileharness/shared/storage/transaction:transaction_config",
61+
"//src/java/com/google/devtools/mobileharness/shared/storage/transaction:transaction_context",
62+
"//src/java/com/google/devtools/mobileharness/shared/storage/transaction:transaction_runner",
63+
"//src/java/com/google/devtools/mobileharness/shared/storage/transaction:transaction_worker",
6464
"//src/java/com/google/devtools/mobileharness/shared/util/database:database_connections",
6565
"//src/java/com/google/devtools/mobileharness/shared/util/logging:google_logger",
6666
"@maven//:com_google_errorprone_error_prone_annotations",

src/java/com/google/devtools/mobileharness/infra/master/central/storage/mysql/CentralStorageMySqlModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import com.google.common.flogger.FluentLogger;
2020
import com.google.devtools.mobileharness.api.model.error.MobileHarnessException;
2121
import com.google.devtools.mobileharness.infra.master.central.CentralAnnotation.CentralDatabaseConnections;
22-
import com.google.devtools.mobileharness.infra.master.central.storage.TransactionRunner;
2322
import com.google.devtools.mobileharness.infra.master.central.storage.lab.LabRepository;
23+
import com.google.devtools.mobileharness.shared.storage.transaction.TransactionRunner;
2424
import com.google.devtools.mobileharness.shared.util.database.DatabaseConnections;
2525
import com.google.devtools.mobileharness.shared.util.flags.Flags;
2626
import com.google.inject.AbstractModule;

src/java/com/google/devtools/mobileharness/infra/master/central/storage/mysql/MySqlLabRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import com.google.devtools.mobileharness.api.model.error.MobileHarnessException;
2020
import com.google.devtools.mobileharness.api.model.lab.LabLocator;
2121
import com.google.devtools.mobileharness.infra.master.central.proto.Lab.LabServerCondition;
22-
import com.google.devtools.mobileharness.infra.master.central.storage.TransactionContext;
2322
import com.google.devtools.mobileharness.infra.master.central.storage.lab.LabRepository;
23+
import com.google.devtools.mobileharness.shared.storage.transaction.TransactionContext;
2424
import com.google.errorprone.annotations.CanIgnoreReturnValue;
2525
import java.util.Optional;
2626
import javax.inject.Inject;

src/java/com/google/devtools/mobileharness/infra/master/central/storage/mysql/MySqlTransactionContext.java

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

1717
package com.google.devtools.mobileharness.infra.master.central.storage.mysql;
1818

19-
import com.google.devtools.mobileharness.infra.master.central.storage.TransactionContext;
19+
import com.google.devtools.mobileharness.shared.storage.transaction.TransactionContext;
2020
import java.sql.Connection;
2121

2222
/** MySQL implementation of {@link TransactionContext}. */

src/java/com/google/devtools/mobileharness/infra/master/central/storage/mysql/MySqlTransactionRunner.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import com.google.common.flogger.FluentLogger;
2121
import com.google.devtools.mobileharness.api.model.error.MobileHarnessException;
2222
import com.google.devtools.mobileharness.infra.master.central.CentralAnnotation.CentralDatabaseConnections;
23-
import com.google.devtools.mobileharness.infra.master.central.storage.TransactionConfig;
24-
import com.google.devtools.mobileharness.infra.master.central.storage.TransactionRunner;
25-
import com.google.devtools.mobileharness.infra.master.central.storage.TransactionWorker;
23+
import com.google.devtools.mobileharness.shared.storage.transaction.TransactionConfig;
24+
import com.google.devtools.mobileharness.shared.storage.transaction.TransactionRunner;
25+
import com.google.devtools.mobileharness.shared.storage.transaction.TransactionWorker;
2626
import com.google.devtools.mobileharness.shared.util.database.DatabaseConnections;
2727
import java.sql.Connection;
2828
import java.sql.SQLException;

src/java/com/google/devtools/mobileharness/infra/master/central/storage/BUILD renamed to src/java/com/google/devtools/mobileharness/shared/storage/transaction/BUILD

File renamed without changes.

src/java/com/google/devtools/mobileharness/infra/master/central/storage/TransactionConfig.java renamed to src/java/com/google/devtools/mobileharness/shared/storage/transaction/TransactionConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.devtools.mobileharness.infra.master.central.storage;
17+
package com.google.devtools.mobileharness.shared.storage.transaction;
1818

1919
import com.google.auto.value.AutoValue;
2020
import com.google.devtools.mobileharness.api.model.error.ErrorId;

src/java/com/google/devtools/mobileharness/infra/master/central/storage/TransactionContext.java renamed to src/java/com/google/devtools/mobileharness/shared/storage/transaction/TransactionContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.devtools.mobileharness.infra.master.central.storage;
17+
package com.google.devtools.mobileharness.shared.storage.transaction;
1818

1919
/** Marker interface for transaction context, to be implemented by each specific Database type. */
2020
public interface TransactionContext {}

0 commit comments

Comments
 (0)