Make the config package a subpacke of the backend package Both packages have dependencies on each other, hence all these classes should be in the same root package. This is a step towards splitting the monolithic plugin target across java packages. Also-by: David Ostrovsky <david@ostrovsky.org> Signed-off-by: Edwin Kempin <ekempin@google.com> Change-Id: Ie36fd9baf9f405d5663926272a2477e993cbf8be
diff --git a/java/com/google/gerrit/plugins/codeowners/acceptance/AbstractCodeOwnersIT.java b/java/com/google/gerrit/plugins/codeowners/acceptance/AbstractCodeOwnersIT.java index ec40999..0b50f6e 100644 --- a/java/com/google/gerrit/plugins/codeowners/acceptance/AbstractCodeOwnersIT.java +++ b/java/com/google/gerrit/plugins/codeowners/acceptance/AbstractCodeOwnersIT.java
@@ -23,7 +23,7 @@ import com.google.gerrit.plugins.codeowners.api.impl.CodeOwnersFactory; import com.google.gerrit.plugins.codeowners.api.impl.ProjectCodeOwnersFactory; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerBackendId; -import com.google.gerrit.plugins.codeowners.config.BackendConfig; +import com.google.gerrit.plugins.codeowners.backend.config.BackendConfig; import com.google.gerrit.testing.ConfigSuite; import java.util.Arrays; import org.eclipse.jgit.lib.Config;
diff --git a/java/com/google/gerrit/plugins/codeowners/acceptance/AbstractCodeOwnersTest.java b/java/com/google/gerrit/plugins/codeowners/acceptance/AbstractCodeOwnersTest.java index 3580969..3d7c628 100644 --- a/java/com/google/gerrit/plugins/codeowners/acceptance/AbstractCodeOwnersTest.java +++ b/java/com/google/gerrit/plugins/codeowners/acceptance/AbstractCodeOwnersTest.java
@@ -36,8 +36,8 @@ import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.plugins.codeowners.acceptance.testsuite.CodeOwnerConfigOperations; import com.google.gerrit.plugins.codeowners.acceptance.testsuite.TestCodeOwnerConfigCreation.Builder; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; -import com.google.gerrit.plugins.codeowners.config.StatusConfig; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.StatusConfig; import com.google.gerrit.plugins.codeowners.util.JgitPath; import com.google.inject.Inject; import java.nio.file.Path;
diff --git a/java/com/google/gerrit/plugins/codeowners/acceptance/testsuite/CodeOwnerConfigOperationsImpl.java b/java/com/google/gerrit/plugins/codeowners/acceptance/testsuite/CodeOwnerConfigOperationsImpl.java index 317098d..5fe97c9 100644 --- a/java/com/google/gerrit/plugins/codeowners/acceptance/testsuite/CodeOwnerConfigOperationsImpl.java +++ b/java/com/google/gerrit/plugins/codeowners/acceptance/testsuite/CodeOwnerConfigOperationsImpl.java
@@ -22,7 +22,7 @@ import com.google.gerrit.plugins.codeowners.backend.CodeOwnerSetModification; import com.google.gerrit.plugins.codeowners.backend.CodeOwners; import com.google.gerrit.plugins.codeowners.backend.CodeOwnersUpdate; -import com.google.gerrit.plugins.codeowners.config.BackendConfig; +import com.google.gerrit.plugins.codeowners.backend.config.BackendConfig; import com.google.gerrit.plugins.codeowners.util.JgitPath; import com.google.gerrit.server.ServerInitiated; import com.google.gerrit.server.git.GitRepositoryManager;
diff --git a/java/com/google/gerrit/plugins/codeowners/acceptance/testsuite/TestPathExpressions.java b/java/com/google/gerrit/plugins/codeowners/acceptance/testsuite/TestPathExpressions.java index b0ebb67..91867cb 100644 --- a/java/com/google/gerrit/plugins/codeowners/acceptance/testsuite/TestPathExpressions.java +++ b/java/com/google/gerrit/plugins/codeowners/acceptance/testsuite/TestPathExpressions.java
@@ -19,7 +19,7 @@ import com.google.gerrit.plugins.codeowners.backend.GlobMatcher; import com.google.gerrit.plugins.codeowners.backend.PathExpressionMatcher; import com.google.gerrit.plugins.codeowners.backend.SimplePathExpressionMatcher; -import com.google.gerrit.plugins.codeowners.config.BackendConfig; +import com.google.gerrit.plugins.codeowners.backend.config.BackendConfig; import com.google.inject.Inject; /**
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/AbstractFileBasedCodeOwnerBackend.java b/java/com/google/gerrit/plugins/codeowners/backend/AbstractFileBasedCodeOwnerBackend.java index 1de1325..f392696 100644 --- a/java/com/google/gerrit/plugins/codeowners/backend/AbstractFileBasedCodeOwnerBackend.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/AbstractFileBasedCodeOwnerBackend.java
@@ -21,7 +21,7 @@ import com.google.gerrit.common.Nullable; import com.google.gerrit.entities.Project; import com.google.gerrit.exceptions.StorageException; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.git.GitRepositoryManager;
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/ChangedFiles.java b/java/com/google/gerrit/plugins/codeowners/backend/ChangedFiles.java index 1b836fe..78956a2 100644 --- a/java/com/google/gerrit/plugins/codeowners/backend/ChangedFiles.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/ChangedFiles.java
@@ -23,9 +23,9 @@ import com.google.gerrit.entities.Patch; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.client.DiffPreferencesInfo.Whitespace; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; import com.google.gerrit.plugins.codeowners.common.ChangedFile; import com.google.gerrit.plugins.codeowners.common.MergeCommitStrategy; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; import com.google.gerrit.server.change.RevisionResource; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.patch.PatchListCache;
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheck.java b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheck.java index 0a1f837..69d6dea 100644 --- a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheck.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheck.java
@@ -28,10 +28,10 @@ import com.google.gerrit.entities.Project; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.restapi.ResourceConflictException; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.RequiredApproval; import com.google.gerrit.plugins.codeowners.common.ChangedFile; import com.google.gerrit.plugins.codeowners.common.CodeOwnerStatus; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; -import com.google.gerrit.plugins.codeowners.config.RequiredApproval; import com.google.gerrit.server.ApprovalsUtil; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.logging.Metadata;
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigFileUpdateScanner.java b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigFileUpdateScanner.java index 6222b7d..aa11eb8 100644 --- a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigFileUpdateScanner.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigFileUpdateScanner.java
@@ -21,7 +21,7 @@ import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.git.RefUpdateUtil; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.git.GitRepositoryManager;
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigScanner.java b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigScanner.java index c8c96ab..1aa38e6 100644 --- a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigScanner.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigScanner.java
@@ -22,7 +22,7 @@ import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.RefNames; import com.google.gerrit.exceptions.StorageException; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.inject.Inject; import java.io.IOException;
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerResolver.java b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerResolver.java index 8e1d906..2fb7607 100644 --- a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerResolver.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerResolver.java
@@ -25,7 +25,7 @@ import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Project; import com.google.gerrit.exceptions.StorageException; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountCache;
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerSubmitRule.java b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerSubmitRule.java index 0599cf6..6cf8ef3 100644 --- a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerSubmitRule.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerSubmitRule.java
@@ -23,7 +23,7 @@ import com.google.gerrit.extensions.annotations.Exports; import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.extensions.restapi.RestApiException; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; import com.google.gerrit.server.logging.Metadata; import com.google.gerrit.server.logging.TraceContext; import com.google.gerrit.server.logging.TraceContext.TraceTimer;
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwners.java b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwners.java index 2165fda..843a054 100644 --- a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwners.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwners.java
@@ -17,7 +17,7 @@ import static java.util.Objects.requireNonNull; import com.google.common.base.Throwables; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; import com.google.inject.Inject; import com.google.inject.Singleton; import java.nio.file.Path;
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnersExceptionHook.java b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnersExceptionHook.java index b4e2931..abfc9f5 100644 --- a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnersExceptionHook.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnersExceptionHook.java
@@ -17,7 +17,7 @@ import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.gerrit.common.Nullable; -import com.google.gerrit.plugins.codeowners.config.InvalidPluginConfigurationException; +import com.google.gerrit.plugins.codeowners.backend.config.InvalidPluginConfigurationException; import com.google.gerrit.server.ExceptionHook; import java.util.Optional;
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnersOnPostReview.java b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnersOnPostReview.java index 8f07807..c018d61 100644 --- a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnersOnPostReview.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnersOnPostReview.java
@@ -23,9 +23,9 @@ import com.google.gerrit.entities.Account; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.extensions.restapi.ResourceConflictException; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.RequiredApproval; import com.google.gerrit.plugins.codeowners.common.CodeOwnerStatus; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; -import com.google.gerrit.plugins.codeowners.config.RequiredApproval; import com.google.gerrit.plugins.codeowners.util.JgitPath; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.notedb.ChangeNotes;
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnersUpdate.java b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnersUpdate.java index e123b84..d2a7f01 100644 --- a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnersUpdate.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnersUpdate.java
@@ -14,7 +14,7 @@ package com.google.gerrit.plugins.codeowners.backend; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; import com.google.gerrit.server.IdentifiedUser; import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.AssistedInject;
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/PathCodeOwners.java b/java/com/google/gerrit/plugins/codeowners/backend/PathCodeOwners.java index ae14883..f787dc8 100644 --- a/java/com/google/gerrit/plugins/codeowners/backend/PathCodeOwners.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/PathCodeOwners.java
@@ -24,7 +24,7 @@ import com.google.common.flogger.FluentLogger; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.Project; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; import com.google.gerrit.server.logging.Metadata; import com.google.gerrit.server.logging.TraceContext; import com.google.gerrit.server.logging.TraceContext.TraceTimer;
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/UnresolvedImport.java b/java/com/google/gerrit/plugins/codeowners/backend/UnresolvedImport.java index f2491b7..4d1b975 100644 --- a/java/com/google/gerrit/plugins/codeowners/backend/UnresolvedImport.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/UnresolvedImport.java
@@ -16,7 +16,7 @@ import com.google.auto.value.AutoValue; import com.google.common.base.MoreObjects; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; /** Information about an unresolved import. */ @AutoValue
diff --git a/java/com/google/gerrit/plugins/codeowners/config/AbstractRequiredApprovalConfig.java b/java/com/google/gerrit/plugins/codeowners/backend/config/AbstractRequiredApprovalConfig.java similarity index 96% rename from java/com/google/gerrit/plugins/codeowners/config/AbstractRequiredApprovalConfig.java rename to java/com/google/gerrit/plugins/codeowners/backend/config/AbstractRequiredApprovalConfig.java index 260d9d9..01d381b 100644 --- a/java/com/google/gerrit/plugins/codeowners/config/AbstractRequiredApprovalConfig.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/config/AbstractRequiredApprovalConfig.java
@@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.plugins.codeowners.config; +package com.google.gerrit.plugins.codeowners.backend.config; -import static com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration.SECTION_CODE_OWNERS; +import static com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration.SECTION_CODE_OWNERS; import static java.util.Objects.requireNonNull; import com.google.common.collect.ImmutableList;
diff --git a/java/com/google/gerrit/plugins/codeowners/config/BackendConfig.java b/java/com/google/gerrit/plugins/codeowners/backend/config/BackendConfig.java similarity index 97% rename from java/com/google/gerrit/plugins/codeowners/config/BackendConfig.java rename to java/com/google/gerrit/plugins/codeowners/backend/config/BackendConfig.java index a820739..9f163ce 100644 --- a/java/com/google/gerrit/plugins/codeowners/config/BackendConfig.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/config/BackendConfig.java
@@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.plugins.codeowners.config; +package com.google.gerrit.plugins.codeowners.backend.config; -import static com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration.SECTION_CODE_OWNERS; +import static com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration.SECTION_CODE_OWNERS; import static java.util.Objects.requireNonNull; import com.google.common.annotations.VisibleForTesting;
diff --git a/java/com/google/gerrit/plugins/codeowners/config/CodeOwnersPluginConfigValidator.java b/java/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigValidator.java similarity index 99% rename from java/com/google/gerrit/plugins/codeowners/config/CodeOwnersPluginConfigValidator.java rename to java/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigValidator.java index bddfdc9..28e7a8d 100644 --- a/java/com/google/gerrit/plugins/codeowners/config/CodeOwnersPluginConfigValidator.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigValidator.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.plugins.codeowners.config; +package com.google.gerrit.plugins.codeowners.backend.config; import com.google.common.collect.ImmutableList; import com.google.common.flogger.FluentLogger;
diff --git a/java/com/google/gerrit/plugins/codeowners/config/CodeOwnersPluginConfiguration.java b/java/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfiguration.java similarity index 99% rename from java/com/google/gerrit/plugins/codeowners/config/CodeOwnersPluginConfiguration.java rename to java/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfiguration.java index fe18fb8..a440235 100644 --- a/java/com/google/gerrit/plugins/codeowners/config/CodeOwnersPluginConfiguration.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfiguration.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.plugins.codeowners.config; +package com.google.gerrit.plugins.codeowners.backend.config; import static com.google.gerrit.server.project.ProjectCache.illegalState; import static java.util.Objects.requireNonNull;
diff --git a/java/com/google/gerrit/plugins/codeowners/config/ConfigModule.java b/java/com/google/gerrit/plugins/codeowners/backend/config/ConfigModule.java similarity index 94% rename from java/com/google/gerrit/plugins/codeowners/config/ConfigModule.java rename to java/com/google/gerrit/plugins/codeowners/backend/config/ConfigModule.java index ec439ad..5d8522b 100644 --- a/java/com/google/gerrit/plugins/codeowners/config/ConfigModule.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/config/ConfigModule.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.plugins.codeowners.config; +package com.google.gerrit.plugins.codeowners.backend.config; import com.google.gerrit.extensions.registration.DynamicSet; import com.google.gerrit.server.git.validators.CommitValidationListener;
diff --git a/java/com/google/gerrit/plugins/codeowners/config/GeneralConfig.java b/java/com/google/gerrit/plugins/codeowners/backend/config/GeneralConfig.java similarity index 98% rename from java/com/google/gerrit/plugins/codeowners/config/GeneralConfig.java rename to java/com/google/gerrit/plugins/codeowners/backend/config/GeneralConfig.java index cdd17ad..5d7062b 100644 --- a/java/com/google/gerrit/plugins/codeowners/config/GeneralConfig.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/config/GeneralConfig.java
@@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.plugins.codeowners.config; +package com.google.gerrit.plugins.codeowners.backend.config; import static com.google.common.collect.ImmutableSet.toImmutableSet; -import static com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration.SECTION_CODE_OWNERS; +import static com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration.SECTION_CODE_OWNERS; import static java.util.Objects.requireNonNull; import com.google.common.annotations.VisibleForTesting;
diff --git a/java/com/google/gerrit/plugins/codeowners/config/InvalidPluginConfigurationException.java b/java/com/google/gerrit/plugins/codeowners/backend/config/InvalidPluginConfigurationException.java similarity index 94% rename from java/com/google/gerrit/plugins/codeowners/config/InvalidPluginConfigurationException.java rename to java/com/google/gerrit/plugins/codeowners/backend/config/InvalidPluginConfigurationException.java index dd78ada..d80b7cf 100644 --- a/java/com/google/gerrit/plugins/codeowners/config/InvalidPluginConfigurationException.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/config/InvalidPluginConfigurationException.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.plugins.codeowners.config; +package com.google.gerrit.plugins.codeowners.backend.config; /** * Exception that is thrown if a configuration parameter of the code-owners plugin has an invalid
diff --git a/java/com/google/gerrit/plugins/codeowners/config/OverrideApprovalConfig.java b/java/com/google/gerrit/plugins/codeowners/backend/config/OverrideApprovalConfig.java similarity index 96% rename from java/com/google/gerrit/plugins/codeowners/config/OverrideApprovalConfig.java rename to java/com/google/gerrit/plugins/codeowners/backend/config/OverrideApprovalConfig.java index 3b4f56c..2a815a8 100644 --- a/java/com/google/gerrit/plugins/codeowners/config/OverrideApprovalConfig.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/config/OverrideApprovalConfig.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.plugins.codeowners.config; +package com.google.gerrit.plugins.codeowners.backend.config; import com.google.common.annotations.VisibleForTesting; import com.google.gerrit.extensions.annotations.PluginName;
diff --git a/java/com/google/gerrit/plugins/codeowners/config/RequiredApproval.java b/java/com/google/gerrit/plugins/codeowners/backend/config/RequiredApproval.java similarity index 98% rename from java/com/google/gerrit/plugins/codeowners/config/RequiredApproval.java rename to java/com/google/gerrit/plugins/codeowners/backend/config/RequiredApproval.java index e361ea6..f71df6a 100644 --- a/java/com/google/gerrit/plugins/codeowners/config/RequiredApproval.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/config/RequiredApproval.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.plugins.codeowners.config; +package com.google.gerrit.plugins.codeowners.backend.config; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState;
diff --git a/java/com/google/gerrit/plugins/codeowners/config/RequiredApprovalConfig.java b/java/com/google/gerrit/plugins/codeowners/backend/config/RequiredApprovalConfig.java similarity index 94% rename from java/com/google/gerrit/plugins/codeowners/config/RequiredApprovalConfig.java rename to java/com/google/gerrit/plugins/codeowners/backend/config/RequiredApprovalConfig.java index e49904d..3902655 100644 --- a/java/com/google/gerrit/plugins/codeowners/config/RequiredApprovalConfig.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/config/RequiredApprovalConfig.java
@@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.plugins.codeowners.config; +package com.google.gerrit.plugins.codeowners.backend.config; -import static com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration.SECTION_CODE_OWNERS; +import static com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration.SECTION_CODE_OWNERS; import com.google.common.annotations.VisibleForTesting; import com.google.gerrit.extensions.annotations.PluginName;
diff --git a/java/com/google/gerrit/plugins/codeowners/config/StatusConfig.java b/java/com/google/gerrit/plugins/codeowners/backend/config/StatusConfig.java similarity index 97% rename from java/com/google/gerrit/plugins/codeowners/config/StatusConfig.java rename to java/com/google/gerrit/plugins/codeowners/backend/config/StatusConfig.java index 4648271..bdc6e2f 100644 --- a/java/com/google/gerrit/plugins/codeowners/config/StatusConfig.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/config/StatusConfig.java
@@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.plugins.codeowners.config; +package com.google.gerrit.plugins.codeowners.backend.config; -import static com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration.SECTION_CODE_OWNERS; +import static com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration.SECTION_CODE_OWNERS; import static java.util.Objects.requireNonNull; import com.google.common.annotations.VisibleForTesting;
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/findowners/FindOwnersBackend.java b/java/com/google/gerrit/plugins/codeowners/backend/findowners/FindOwnersBackend.java index 15b4385..257c1d4 100644 --- a/java/com/google/gerrit/plugins/codeowners/backend/findowners/FindOwnersBackend.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/findowners/FindOwnersBackend.java
@@ -19,7 +19,7 @@ import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfig; import com.google.gerrit.plugins.codeowners.backend.FindOwnersGlobMatcher; import com.google.gerrit.plugins.codeowners.backend.PathExpressionMatcher; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.meta.MetaDataUpdate;
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/proto/ProtoBackend.java b/java/com/google/gerrit/plugins/codeowners/backend/proto/ProtoBackend.java index e671c6f..e8e0694 100644 --- a/java/com/google/gerrit/plugins/codeowners/backend/proto/ProtoBackend.java +++ b/java/com/google/gerrit/plugins/codeowners/backend/proto/ProtoBackend.java
@@ -19,7 +19,7 @@ import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfig; import com.google.gerrit.plugins.codeowners.backend.PathExpressionMatcher; import com.google.gerrit.plugins.codeowners.backend.SimplePathExpressionMatcher; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.meta.MetaDataUpdate;
diff --git a/java/com/google/gerrit/plugins/codeowners/module/Module.java b/java/com/google/gerrit/plugins/codeowners/module/Module.java index 1c362f4..c5447f6 100644 --- a/java/com/google/gerrit/plugins/codeowners/module/Module.java +++ b/java/com/google/gerrit/plugins/codeowners/module/Module.java
@@ -17,7 +17,7 @@ import com.google.gerrit.extensions.config.FactoryModule; import com.google.gerrit.plugins.codeowners.api.impl.ApiModule; import com.google.gerrit.plugins.codeowners.backend.BackendModule; -import com.google.gerrit.plugins.codeowners.config.ConfigModule; +import com.google.gerrit.plugins.codeowners.backend.config.ConfigModule; import com.google.gerrit.plugins.codeowners.restapi.RestApiModule; import com.google.gerrit.plugins.codeowners.validation.ValidationModule;
diff --git a/java/com/google/gerrit/plugins/codeowners/restapi/AbstractGetCodeOwnersForPath.java b/java/com/google/gerrit/plugins/codeowners/restapi/AbstractGetCodeOwnersForPath.java index c77cb1d..71cb59f 100644 --- a/java/com/google/gerrit/plugins/codeowners/restapi/AbstractGetCodeOwnersForPath.java +++ b/java/com/google/gerrit/plugins/codeowners/restapi/AbstractGetCodeOwnersForPath.java
@@ -39,7 +39,7 @@ import com.google.gerrit.plugins.codeowners.backend.CodeOwnerResolverResult; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerScore; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerScoring; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; import com.google.gerrit.server.account.AccountControl; import com.google.gerrit.server.account.AccountDirectory.FillOptions; import com.google.gerrit.server.account.AccountLoader;
diff --git a/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwner.java b/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwner.java index a125d34..874400c 100644 --- a/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwner.java +++ b/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwner.java
@@ -34,7 +34,7 @@ import com.google.gerrit.plugins.codeowners.backend.OptionalResultWithMessages; import com.google.gerrit.plugins.codeowners.backend.PathCodeOwners; import com.google.gerrit.plugins.codeowners.backend.PathCodeOwnersResult; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; import com.google.gerrit.plugins.codeowners.util.JgitPath; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.permissions.PermissionBackend;
diff --git a/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwnerConfigFiles.java b/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwnerConfigFiles.java index 144f0e5..73ed96d 100644 --- a/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwnerConfigFiles.java +++ b/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwnerConfigFiles.java
@@ -38,7 +38,7 @@ import com.google.gerrit.plugins.codeowners.backend.CodeOwnerBackend; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfig; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfigScanner; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; import com.google.gerrit.plugins.codeowners.validation.CodeOwnerConfigValidator; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.git.validators.CommitValidationMessage;
diff --git a/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwnerConfigFilesInRevision.java b/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwnerConfigFilesInRevision.java index b3e2494..d960595 100644 --- a/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwnerConfigFilesInRevision.java +++ b/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwnerConfigFilesInRevision.java
@@ -24,7 +24,7 @@ import com.google.gerrit.plugins.codeowners.api.CheckCodeOwnerConfigFilesInRevisionInput; import com.google.gerrit.plugins.codeowners.backend.ChangedFiles; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerBackend; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; import com.google.gerrit.plugins.codeowners.validation.CodeOwnerConfigValidator; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.change.RevisionResource;
diff --git a/java/com/google/gerrit/plugins/codeowners/restapi/CodeOwnerProjectConfigJson.java b/java/com/google/gerrit/plugins/codeowners/restapi/CodeOwnerProjectConfigJson.java index bf3a8ad..d9f9a8b 100644 --- a/java/com/google/gerrit/plugins/codeowners/restapi/CodeOwnerProjectConfigJson.java +++ b/java/com/google/gerrit/plugins/codeowners/restapi/CodeOwnerProjectConfigJson.java
@@ -34,8 +34,8 @@ import com.google.gerrit.plugins.codeowners.api.RequiredApprovalInfo; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerBackendId; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfigScanner; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; -import com.google.gerrit.plugins.codeowners.config.RequiredApproval; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.RequiredApproval; import com.google.gerrit.server.permissions.PermissionBackendException; import com.google.gerrit.server.project.BranchResource; import com.google.gerrit.server.project.ProjectResource;
diff --git a/java/com/google/gerrit/plugins/codeowners/restapi/GetCodeOwnerConfigFiles.java b/java/com/google/gerrit/plugins/codeowners/restapi/GetCodeOwnerConfigFiles.java index 9ec7118..ef08584 100644 --- a/java/com/google/gerrit/plugins/codeowners/restapi/GetCodeOwnerConfigFiles.java +++ b/java/com/google/gerrit/plugins/codeowners/restapi/GetCodeOwnerConfigFiles.java
@@ -26,7 +26,7 @@ import com.google.gerrit.plugins.codeowners.backend.CodeOwnerBackend; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfig; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfigScanner; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; import com.google.gerrit.server.project.BranchResource; import com.google.inject.Inject; import java.nio.file.Path;
diff --git a/java/com/google/gerrit/plugins/codeowners/restapi/GetCodeOwnerConfigForPathInBranch.java b/java/com/google/gerrit/plugins/codeowners/restapi/GetCodeOwnerConfigForPathInBranch.java index 801537d..1347471 100644 --- a/java/com/google/gerrit/plugins/codeowners/restapi/GetCodeOwnerConfigForPathInBranch.java +++ b/java/com/google/gerrit/plugins/codeowners/restapi/GetCodeOwnerConfigForPathInBranch.java
@@ -20,7 +20,7 @@ import com.google.gerrit.plugins.codeowners.api.CodeOwnerConfigInfo; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfig; import com.google.gerrit.plugins.codeowners.backend.CodeOwners; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; import com.google.gerrit.plugins.codeowners.restapi.CodeOwnerConfigsInBranchCollection.PathResource; import com.google.inject.Inject; import com.google.inject.Singleton;
diff --git a/java/com/google/gerrit/plugins/codeowners/restapi/GetCodeOwnersForPathInBranch.java b/java/com/google/gerrit/plugins/codeowners/restapi/GetCodeOwnersForPathInBranch.java index 3fab537..b1d3957 100644 --- a/java/com/google/gerrit/plugins/codeowners/restapi/GetCodeOwnersForPathInBranch.java +++ b/java/com/google/gerrit/plugins/codeowners/restapi/GetCodeOwnersForPathInBranch.java
@@ -25,7 +25,7 @@ import com.google.gerrit.plugins.codeowners.api.CodeOwnerInfo; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfigHierarchy; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerResolver; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; import com.google.gerrit.server.account.AccountControl; import com.google.gerrit.server.account.Accounts; import com.google.gerrit.server.change.IncludedInResolver;
diff --git a/java/com/google/gerrit/plugins/codeowners/restapi/GetCodeOwnersForPathInChange.java b/java/com/google/gerrit/plugins/codeowners/restapi/GetCodeOwnersForPathInChange.java index c0465f3..0e6e2fa 100644 --- a/java/com/google/gerrit/plugins/codeowners/restapi/GetCodeOwnersForPathInChange.java +++ b/java/com/google/gerrit/plugins/codeowners/restapi/GetCodeOwnersForPathInChange.java
@@ -22,7 +22,7 @@ import com.google.gerrit.plugins.codeowners.backend.CodeOwner; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfigHierarchy; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerResolver; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; import com.google.gerrit.server.account.AccountControl; import com.google.gerrit.server.account.Accounts; import com.google.gerrit.server.account.ServiceUserClassifier;
diff --git a/java/com/google/gerrit/plugins/codeowners/restapi/RenameEmail.java b/java/com/google/gerrit/plugins/codeowners/restapi/RenameEmail.java index 0ed505b..6f597fd 100644 --- a/java/com/google/gerrit/plugins/codeowners/restapi/RenameEmail.java +++ b/java/com/google/gerrit/plugins/codeowners/restapi/RenameEmail.java
@@ -35,7 +35,7 @@ import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfigFileUpdateScanner; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerReference; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerResolver; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.git.CommitUtil; import com.google.gerrit.server.permissions.PermissionBackend;
diff --git a/java/com/google/gerrit/plugins/codeowners/testing/RequiredApprovalSubject.java b/java/com/google/gerrit/plugins/codeowners/testing/RequiredApprovalSubject.java index 68673df..e869632 100644 --- a/java/com/google/gerrit/plugins/codeowners/testing/RequiredApprovalSubject.java +++ b/java/com/google/gerrit/plugins/codeowners/testing/RequiredApprovalSubject.java
@@ -22,7 +22,7 @@ import com.google.common.truth.IntegerSubject; import com.google.common.truth.StringSubject; import com.google.common.truth.Subject; -import com.google.gerrit.plugins.codeowners.config.RequiredApproval; +import com.google.gerrit.plugins.codeowners.backend.config.RequiredApproval; import com.google.gerrit.truth.ListSubject; import com.google.gerrit.truth.OptionalSubject; import java.util.Optional;
diff --git a/java/com/google/gerrit/plugins/codeowners/validation/CodeOwnerConfigValidator.java b/java/com/google/gerrit/plugins/codeowners/validation/CodeOwnerConfigValidator.java index 08915e4..17235cd 100644 --- a/java/com/google/gerrit/plugins/codeowners/validation/CodeOwnerConfigValidator.java +++ b/java/com/google/gerrit/plugins/codeowners/validation/CodeOwnerConfigValidator.java
@@ -37,11 +37,11 @@ import com.google.gerrit.plugins.codeowners.backend.CodeOwnerReference; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerResolver; import com.google.gerrit.plugins.codeowners.backend.PathCodeOwners; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.InvalidPluginConfigurationException; import com.google.gerrit.plugins.codeowners.common.ChangedFile; import com.google.gerrit.plugins.codeowners.common.CodeOwnerConfigValidationPolicy; import com.google.gerrit.plugins.codeowners.common.MergeCommitStrategy; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; -import com.google.gerrit.plugins.codeowners.config.InvalidPluginConfigurationException; import com.google.gerrit.plugins.codeowners.util.JgitPath; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.PatchSetUtil;
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerConfigFilesIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerConfigFilesIT.java index 9a31ca1..5be55be 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerConfigFilesIT.java +++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerConfigFilesIT.java
@@ -40,9 +40,9 @@ import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfig; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfigImportMode; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfigReference; +import com.google.gerrit.plugins.codeowners.backend.config.BackendConfig; import com.google.gerrit.plugins.codeowners.backend.findowners.FindOwnersBackend; import com.google.gerrit.plugins.codeowners.backend.proto.ProtoBackend; -import com.google.gerrit.plugins.codeowners.config.BackendConfig; import com.google.inject.Inject; import java.util.HashMap; import java.util.List;
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerConfigFilesInRevisionIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerConfigFilesInRevisionIT.java index b67f0f0..3d71b53 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerConfigFilesInRevisionIT.java +++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerConfigFilesInRevisionIT.java
@@ -27,11 +27,11 @@ import com.google.gerrit.plugins.codeowners.backend.CodeOwnerBackend; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfig; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerSet; +import com.google.gerrit.plugins.codeowners.backend.config.BackendConfig; import com.google.gerrit.plugins.codeowners.backend.findowners.FindOwnersBackend; import com.google.gerrit.plugins.codeowners.backend.findowners.FindOwnersCodeOwnerConfigParser; import com.google.gerrit.plugins.codeowners.backend.proto.ProtoBackend; import com.google.gerrit.plugins.codeowners.backend.proto.ProtoCodeOwnerConfigParser; -import com.google.gerrit.plugins.codeowners.config.BackendConfig; import com.google.gerrit.plugins.codeowners.util.JgitPath; import java.util.HashMap; import java.util.List;
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerIT.java index 5cd6e88..282594b 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerIT.java +++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerIT.java
@@ -38,9 +38,9 @@ import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfigImportMode; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfigReference; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerResolver; +import com.google.gerrit.plugins.codeowners.backend.config.BackendConfig; import com.google.gerrit.plugins.codeowners.backend.findowners.FindOwnersBackend; import com.google.gerrit.plugins.codeowners.backend.proto.ProtoBackend; -import com.google.gerrit.plugins.codeowners.config.BackendConfig; import com.google.gerrit.plugins.codeowners.restapi.CheckCodeOwnerCapability; import com.google.gerrit.plugins.codeowners.util.JgitPath; import com.google.gerrit.server.ServerInitiated;
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnerConfigValidatorIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnerConfigValidatorIT.java index 2e5e73b..fe9bdc1 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnerConfigValidatorIT.java +++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnerConfigValidatorIT.java
@@ -46,11 +46,11 @@ import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfigReference; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerResolver; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerSet; +import com.google.gerrit.plugins.codeowners.backend.config.BackendConfig; import com.google.gerrit.plugins.codeowners.backend.findowners.FindOwnersBackend; import com.google.gerrit.plugins.codeowners.backend.findowners.FindOwnersCodeOwnerConfigParser; import com.google.gerrit.plugins.codeowners.backend.proto.ProtoBackend; import com.google.gerrit.plugins.codeowners.backend.proto.ProtoCodeOwnerConfigParser; -import com.google.gerrit.plugins.codeowners.config.BackendConfig; import com.google.inject.Inject; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.ObjectId;
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnersPluginConfigValidatorIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnersPluginConfigValidatorIT.java index 01ff95b..7f6e660 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnersPluginConfigValidatorIT.java +++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnersPluginConfigValidatorIT.java
@@ -26,15 +26,15 @@ import com.google.gerrit.plugins.codeowners.acceptance.AbstractCodeOwnersIT; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerBackendId; import com.google.gerrit.plugins.codeowners.backend.FallbackCodeOwners; +import com.google.gerrit.plugins.codeowners.backend.config.BackendConfig; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.GeneralConfig; +import com.google.gerrit.plugins.codeowners.backend.config.OverrideApprovalConfig; +import com.google.gerrit.plugins.codeowners.backend.config.RequiredApproval; +import com.google.gerrit.plugins.codeowners.backend.config.RequiredApprovalConfig; +import com.google.gerrit.plugins.codeowners.backend.config.StatusConfig; import com.google.gerrit.plugins.codeowners.backend.proto.ProtoBackend; import com.google.gerrit.plugins.codeowners.common.MergeCommitStrategy; -import com.google.gerrit.plugins.codeowners.config.BackendConfig; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; -import com.google.gerrit.plugins.codeowners.config.GeneralConfig; -import com.google.gerrit.plugins.codeowners.config.OverrideApprovalConfig; -import com.google.gerrit.plugins.codeowners.config.RequiredApproval; -import com.google.gerrit.plugins.codeowners.config.RequiredApprovalConfig; -import com.google.gerrit.plugins.codeowners.config.StatusConfig; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevObject;
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/GetCodeOwnerBranchConfigIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/GetCodeOwnerBranchConfigIT.java index ef9a688..d022d13 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/GetCodeOwnerBranchConfigIT.java +++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/GetCodeOwnerBranchConfigIT.java
@@ -29,12 +29,12 @@ import com.google.gerrit.plugins.codeowners.backend.CodeOwnerBackend; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerBackendId; import com.google.gerrit.plugins.codeowners.backend.FallbackCodeOwners; +import com.google.gerrit.plugins.codeowners.backend.config.BackendConfig; +import com.google.gerrit.plugins.codeowners.backend.config.GeneralConfig; +import com.google.gerrit.plugins.codeowners.backend.config.OverrideApprovalConfig; +import com.google.gerrit.plugins.codeowners.backend.config.RequiredApprovalConfig; +import com.google.gerrit.plugins.codeowners.backend.config.StatusConfig; import com.google.gerrit.plugins.codeowners.common.MergeCommitStrategy; -import com.google.gerrit.plugins.codeowners.config.BackendConfig; -import com.google.gerrit.plugins.codeowners.config.GeneralConfig; -import com.google.gerrit.plugins.codeowners.config.OverrideApprovalConfig; -import com.google.gerrit.plugins.codeowners.config.RequiredApprovalConfig; -import com.google.gerrit.plugins.codeowners.config.StatusConfig; import org.junit.Before; import org.junit.Test;
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/GetCodeOwnerConfigFilesIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/GetCodeOwnerConfigFilesIT.java index b9df0b3..da9c694 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/GetCodeOwnerConfigFilesIT.java +++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/GetCodeOwnerConfigFilesIT.java
@@ -24,9 +24,9 @@ import com.google.gerrit.plugins.codeowners.backend.CodeOwnerBackend; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfig; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerSet; +import com.google.gerrit.plugins.codeowners.backend.config.BackendConfig; import com.google.gerrit.plugins.codeowners.backend.findowners.FindOwnersBackend; import com.google.gerrit.plugins.codeowners.backend.proto.ProtoBackend; -import com.google.gerrit.plugins.codeowners.config.BackendConfig; import com.google.gerrit.plugins.codeowners.util.JgitPath; import org.junit.Before; import org.junit.Test;
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/GetCodeOwnerProjectConfigIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/GetCodeOwnerProjectConfigIT.java index 39ea0fe..64f81af 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/GetCodeOwnerProjectConfigIT.java +++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/GetCodeOwnerProjectConfigIT.java
@@ -33,12 +33,12 @@ import com.google.gerrit.plugins.codeowners.backend.CodeOwnerBackend; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerBackendId; import com.google.gerrit.plugins.codeowners.backend.FallbackCodeOwners; +import com.google.gerrit.plugins.codeowners.backend.config.BackendConfig; +import com.google.gerrit.plugins.codeowners.backend.config.GeneralConfig; +import com.google.gerrit.plugins.codeowners.backend.config.OverrideApprovalConfig; +import com.google.gerrit.plugins.codeowners.backend.config.RequiredApprovalConfig; +import com.google.gerrit.plugins.codeowners.backend.config.StatusConfig; import com.google.gerrit.plugins.codeowners.common.MergeCommitStrategy; -import com.google.gerrit.plugins.codeowners.config.BackendConfig; -import com.google.gerrit.plugins.codeowners.config.GeneralConfig; -import com.google.gerrit.plugins.codeowners.config.OverrideApprovalConfig; -import com.google.gerrit.plugins.codeowners.config.RequiredApprovalConfig; -import com.google.gerrit.plugins.codeowners.config.StatusConfig; import com.google.inject.Inject; import org.junit.Before; import org.junit.Test;
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/RenameEmailIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/RenameEmailIT.java index b9e7502..74e0d52 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/RenameEmailIT.java +++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/RenameEmailIT.java
@@ -41,8 +41,8 @@ import com.google.gerrit.plugins.codeowners.api.RenameEmailResultInfo; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfig; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfigFileUpdateScanner; +import com.google.gerrit.plugins.codeowners.backend.config.BackendConfig; import com.google.gerrit.plugins.codeowners.backend.proto.ProtoBackend; -import com.google.gerrit.plugins.codeowners.config.BackendConfig; import com.google.gerrit.plugins.codeowners.restapi.RenameEmail; import com.google.inject.Inject; import java.util.Optional;
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/restapi/RenameEmailRestIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/restapi/RenameEmailRestIT.java index 5978272..70f7b22 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/restapi/RenameEmailRestIT.java +++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/restapi/RenameEmailRestIT.java
@@ -23,8 +23,8 @@ import com.google.gerrit.plugins.codeowners.acceptance.AbstractCodeOwnersIT; import com.google.gerrit.plugins.codeowners.api.RenameEmailInput; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerBackendId; +import com.google.gerrit.plugins.codeowners.backend.config.BackendConfig; import com.google.gerrit.plugins.codeowners.backend.proto.ProtoBackend; -import com.google.gerrit.plugins.codeowners.config.BackendConfig; import com.google.inject.Inject; import org.junit.Before; import org.junit.Test;
diff --git a/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheckWithAllUsersAsFallbackCodeOwnersTest.java b/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheckWithAllUsersAsFallbackCodeOwnersTest.java index 9a9707a..4cf078c 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheckWithAllUsersAsFallbackCodeOwnersTest.java +++ b/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheckWithAllUsersAsFallbackCodeOwnersTest.java
@@ -22,8 +22,8 @@ import com.google.gerrit.entities.Change; import com.google.gerrit.plugins.codeowners.acceptance.AbstractCodeOwnersTest; import com.google.gerrit.plugins.codeowners.acceptance.testsuite.CodeOwnerConfigOperations; +import com.google.gerrit.plugins.codeowners.backend.config.GeneralConfig; import com.google.gerrit.plugins.codeowners.common.CodeOwnerStatus; -import com.google.gerrit.plugins.codeowners.config.GeneralConfig; import com.google.gerrit.plugins.codeowners.testing.FileCodeOwnerStatusSubject; import com.google.gerrit.plugins.codeowners.util.JgitPath; import com.google.gerrit.server.notedb.ChangeNotes;
diff --git a/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheckWithSelfApprovalsIgnoredTest.java b/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheckWithSelfApprovalsIgnoredTest.java index 032cfda..e6bb57f 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheckWithSelfApprovalsIgnoredTest.java +++ b/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerApprovalCheckWithSelfApprovalsIgnoredTest.java
@@ -23,8 +23,8 @@ import com.google.gerrit.extensions.api.changes.ReviewInput; import com.google.gerrit.extensions.common.LabelDefinitionInput; import com.google.gerrit.plugins.codeowners.acceptance.AbstractCodeOwnersTest; +import com.google.gerrit.plugins.codeowners.backend.config.OverrideApprovalConfig; import com.google.gerrit.plugins.codeowners.common.CodeOwnerStatus; -import com.google.gerrit.plugins.codeowners.config.OverrideApprovalConfig; import com.google.gerrit.plugins.codeowners.testing.FileCodeOwnerStatusSubject; import com.google.gerrit.plugins.codeowners.util.JgitPath; import com.google.gerrit.server.notedb.ChangeNotes;
diff --git a/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigHierarchyTest.java b/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigHierarchyTest.java index af08aa3..79885dc 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigHierarchyTest.java +++ b/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigHierarchyTest.java
@@ -29,7 +29,7 @@ import com.google.gerrit.plugins.codeowners.acceptance.AbstractCodeOwnersTest; import com.google.gerrit.plugins.codeowners.acceptance.testsuite.CodeOwnerConfigOperations; import com.google.gerrit.plugins.codeowners.acceptance.testsuite.TestPathExpressions; -import com.google.gerrit.plugins.codeowners.config.InvalidPluginConfigurationException; +import com.google.gerrit.plugins.codeowners.backend.config.InvalidPluginConfigurationException; import com.google.inject.Inject; import java.io.IOException; import java.nio.file.Paths;
diff --git a/javatests/com/google/gerrit/plugins/codeowners/config/AbstractRequiredApprovalConfigTest.java b/javatests/com/google/gerrit/plugins/codeowners/backend/config/AbstractRequiredApprovalConfigTest.java similarity index 95% rename from javatests/com/google/gerrit/plugins/codeowners/config/AbstractRequiredApprovalConfigTest.java rename to javatests/com/google/gerrit/plugins/codeowners/backend/config/AbstractRequiredApprovalConfigTest.java index 42a32dd..f1da349 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/config/AbstractRequiredApprovalConfigTest.java +++ b/javatests/com/google/gerrit/plugins/codeowners/backend/config/AbstractRequiredApprovalConfigTest.java
@@ -12,16 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.plugins.codeowners.config; +package com.google.gerrit.plugins.codeowners.backend.config; import static com.google.common.truth.Truth.assertThat; -import static com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration.SECTION_CODE_OWNERS; +import static com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration.SECTION_CODE_OWNERS; import static com.google.gerrit.plugins.codeowners.testing.RequiredApprovalSubject.assertThat; import static com.google.gerrit.server.project.ProjectCache.illegalState; import static com.google.gerrit.testing.GerritJUnit.assertThrows; import com.google.common.collect.ImmutableList; import com.google.gerrit.plugins.codeowners.acceptance.AbstractCodeOwnersTest; +import com.google.gerrit.plugins.codeowners.backend.config.AbstractRequiredApprovalConfig; +import com.google.gerrit.plugins.codeowners.backend.config.InvalidPluginConfigurationException; +import com.google.gerrit.plugins.codeowners.backend.config.RequiredApproval; import com.google.gerrit.server.git.validators.CommitValidationMessage; import com.google.gerrit.server.git.validators.ValidationMessage; import com.google.gerrit.server.project.ProjectLevelConfig;
diff --git a/javatests/com/google/gerrit/plugins/codeowners/config/BUILD b/javatests/com/google/gerrit/plugins/codeowners/backend/config/BUILD similarity index 100% rename from javatests/com/google/gerrit/plugins/codeowners/config/BUILD rename to javatests/com/google/gerrit/plugins/codeowners/backend/config/BUILD
diff --git a/javatests/com/google/gerrit/plugins/codeowners/config/BackendConfigTest.java b/javatests/com/google/gerrit/plugins/codeowners/backend/config/BackendConfigTest.java similarity index 95% rename from javatests/com/google/gerrit/plugins/codeowners/config/BackendConfigTest.java rename to javatests/com/google/gerrit/plugins/codeowners/backend/config/BackendConfigTest.java index 3d7f709..761f7da 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/config/BackendConfigTest.java +++ b/javatests/com/google/gerrit/plugins/codeowners/backend/config/BackendConfigTest.java
@@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.plugins.codeowners.config; +package com.google.gerrit.plugins.codeowners.backend.config; import static com.google.common.truth.Truth.assertThat; -import static com.google.gerrit.plugins.codeowners.config.BackendConfig.KEY_BACKEND; -import static com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration.SECTION_CODE_OWNERS; +import static com.google.gerrit.plugins.codeowners.backend.config.BackendConfig.KEY_BACKEND; +import static com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration.SECTION_CODE_OWNERS; import static com.google.gerrit.testing.GerritJUnit.assertThrows; import static com.google.gerrit.truth.OptionalSubject.assertThat; @@ -26,6 +26,8 @@ import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.plugins.codeowners.acceptance.AbstractCodeOwnersTest; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerBackendId; +import com.google.gerrit.plugins.codeowners.backend.config.BackendConfig; +import com.google.gerrit.plugins.codeowners.backend.config.InvalidPluginConfigurationException; import com.google.gerrit.plugins.codeowners.backend.findowners.FindOwnersBackend; import com.google.gerrit.plugins.codeowners.backend.proto.ProtoBackend; import com.google.gerrit.server.git.validators.CommitValidationMessage;
diff --git a/javatests/com/google/gerrit/plugins/codeowners/config/CodeOwnersPluginConfigurationTest.java b/javatests/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigurationTest.java similarity index 98% rename from javatests/com/google/gerrit/plugins/codeowners/config/CodeOwnersPluginConfigurationTest.java rename to javatests/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigurationTest.java index 2277bd4..25420b5 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/config/CodeOwnersPluginConfigurationTest.java +++ b/javatests/com/google/gerrit/plugins/codeowners/backend/config/CodeOwnersPluginConfigurationTest.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.plugins.codeowners.config; +package com.google.gerrit.plugins.codeowners.backend.config; import static com.google.common.collect.ImmutableSet.toImmutableSet; import static com.google.common.truth.Truth.assertThat; @@ -39,6 +39,14 @@ import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfig; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfigUpdate; import com.google.gerrit.plugins.codeowners.backend.FallbackCodeOwners; +import com.google.gerrit.plugins.codeowners.backend.config.BackendConfig; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.GeneralConfig; +import com.google.gerrit.plugins.codeowners.backend.config.InvalidPluginConfigurationException; +import com.google.gerrit.plugins.codeowners.backend.config.OverrideApprovalConfig; +import com.google.gerrit.plugins.codeowners.backend.config.RequiredApproval; +import com.google.gerrit.plugins.codeowners.backend.config.RequiredApprovalConfig; +import com.google.gerrit.plugins.codeowners.backend.config.StatusConfig; import com.google.gerrit.plugins.codeowners.backend.findowners.FindOwnersBackend; import com.google.gerrit.plugins.codeowners.common.MergeCommitStrategy; import com.google.gerrit.server.IdentifiedUser;
diff --git a/javatests/com/google/gerrit/plugins/codeowners/config/GeneralConfigTest.java b/javatests/com/google/gerrit/plugins/codeowners/backend/config/GeneralConfigTest.java similarity index 93% rename from javatests/com/google/gerrit/plugins/codeowners/config/GeneralConfigTest.java rename to javatests/com/google/gerrit/plugins/codeowners/backend/config/GeneralConfigTest.java index 5ab585b..e3864ef 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/config/GeneralConfigTest.java +++ b/javatests/com/google/gerrit/plugins/codeowners/backend/config/GeneralConfigTest.java
@@ -12,21 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.plugins.codeowners.config; +package com.google.gerrit.plugins.codeowners.backend.config; import static com.google.common.truth.Truth.assertThat; -import static com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration.SECTION_CODE_OWNERS; -import static com.google.gerrit.plugins.codeowners.config.GeneralConfig.DEFAULT_MAX_PATHS_IN_CHANGE_MESSAGES; -import static com.google.gerrit.plugins.codeowners.config.GeneralConfig.KEY_ENABLE_IMPLICIT_APPROVALS; -import static com.google.gerrit.plugins.codeowners.config.GeneralConfig.KEY_ENABLE_VALIDATION_ON_COMMIT_RECEIVED; -import static com.google.gerrit.plugins.codeowners.config.GeneralConfig.KEY_ENABLE_VALIDATION_ON_SUBMIT; -import static com.google.gerrit.plugins.codeowners.config.GeneralConfig.KEY_FALLBACK_CODE_OWNERS; -import static com.google.gerrit.plugins.codeowners.config.GeneralConfig.KEY_FILE_EXTENSION; -import static com.google.gerrit.plugins.codeowners.config.GeneralConfig.KEY_GLOBAL_CODE_OWNER; -import static com.google.gerrit.plugins.codeowners.config.GeneralConfig.KEY_MAX_PATHS_IN_CHANGE_MESSAGES; -import static com.google.gerrit.plugins.codeowners.config.GeneralConfig.KEY_MERGE_COMMIT_STRATEGY; -import static com.google.gerrit.plugins.codeowners.config.GeneralConfig.KEY_OVERRIDE_INFO_URL; -import static com.google.gerrit.plugins.codeowners.config.GeneralConfig.KEY_READ_ONLY; +import static com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration.SECTION_CODE_OWNERS; +import static com.google.gerrit.plugins.codeowners.backend.config.GeneralConfig.DEFAULT_MAX_PATHS_IN_CHANGE_MESSAGES; +import static com.google.gerrit.plugins.codeowners.backend.config.GeneralConfig.KEY_ENABLE_IMPLICIT_APPROVALS; +import static com.google.gerrit.plugins.codeowners.backend.config.GeneralConfig.KEY_ENABLE_VALIDATION_ON_COMMIT_RECEIVED; +import static com.google.gerrit.plugins.codeowners.backend.config.GeneralConfig.KEY_ENABLE_VALIDATION_ON_SUBMIT; +import static com.google.gerrit.plugins.codeowners.backend.config.GeneralConfig.KEY_FALLBACK_CODE_OWNERS; +import static com.google.gerrit.plugins.codeowners.backend.config.GeneralConfig.KEY_FILE_EXTENSION; +import static com.google.gerrit.plugins.codeowners.backend.config.GeneralConfig.KEY_GLOBAL_CODE_OWNER; +import static com.google.gerrit.plugins.codeowners.backend.config.GeneralConfig.KEY_MAX_PATHS_IN_CHANGE_MESSAGES; +import static com.google.gerrit.plugins.codeowners.backend.config.GeneralConfig.KEY_MERGE_COMMIT_STRATEGY; +import static com.google.gerrit.plugins.codeowners.backend.config.GeneralConfig.KEY_OVERRIDE_INFO_URL; +import static com.google.gerrit.plugins.codeowners.backend.config.GeneralConfig.KEY_READ_ONLY; import static com.google.gerrit.testing.GerritJUnit.assertThrows; import static com.google.gerrit.truth.OptionalSubject.assertThat; @@ -36,6 +36,7 @@ import com.google.gerrit.plugins.codeowners.acceptance.AbstractCodeOwnersTest; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerReference; import com.google.gerrit.plugins.codeowners.backend.FallbackCodeOwners; +import com.google.gerrit.plugins.codeowners.backend.config.GeneralConfig; import com.google.gerrit.plugins.codeowners.common.CodeOwnerConfigValidationPolicy; import com.google.gerrit.plugins.codeowners.common.MergeCommitStrategy; import com.google.gerrit.server.git.validators.CommitValidationMessage;
diff --git a/javatests/com/google/gerrit/plugins/codeowners/config/OverrideApprovalConfigTest.java b/javatests/com/google/gerrit/plugins/codeowners/backend/config/OverrideApprovalConfigTest.java similarity index 88% rename from javatests/com/google/gerrit/plugins/codeowners/config/OverrideApprovalConfigTest.java rename to javatests/com/google/gerrit/plugins/codeowners/backend/config/OverrideApprovalConfigTest.java index 3ea4e18..41a1abc 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/config/OverrideApprovalConfigTest.java +++ b/javatests/com/google/gerrit/plugins/codeowners/backend/config/OverrideApprovalConfigTest.java
@@ -12,13 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.plugins.codeowners.config; +package com.google.gerrit.plugins.codeowners.backend.config; import static com.google.gerrit.plugins.codeowners.testing.RequiredApprovalSubject.assertThat; import static com.google.gerrit.server.project.ProjectCache.illegalState; import com.google.common.collect.ImmutableList; import com.google.gerrit.acceptance.config.GerritConfig; +import com.google.gerrit.plugins.codeowners.backend.config.AbstractRequiredApprovalConfig; +import com.google.gerrit.plugins.codeowners.backend.config.OverrideApprovalConfig; +import com.google.gerrit.plugins.codeowners.backend.config.RequiredApproval; import com.google.gerrit.server.project.ProjectState; import org.eclipse.jgit.lib.Config; import org.junit.Before;
diff --git a/javatests/com/google/gerrit/plugins/codeowners/config/RequiredApprovalConfigTest.java b/javatests/com/google/gerrit/plugins/codeowners/backend/config/RequiredApprovalConfigTest.java similarity index 90% rename from javatests/com/google/gerrit/plugins/codeowners/config/RequiredApprovalConfigTest.java rename to javatests/com/google/gerrit/plugins/codeowners/backend/config/RequiredApprovalConfigTest.java index 37da12d..3409816 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/config/RequiredApprovalConfigTest.java +++ b/javatests/com/google/gerrit/plugins/codeowners/backend/config/RequiredApprovalConfigTest.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.plugins.codeowners.config; +package com.google.gerrit.plugins.codeowners.backend.config; import static com.google.common.truth.Truth.assertThat; import static com.google.gerrit.plugins.codeowners.testing.RequiredApprovalSubject.assertThat; @@ -21,6 +21,9 @@ import com.google.common.collect.ImmutableList; import com.google.gerrit.acceptance.config.GerritConfig; +import com.google.gerrit.plugins.codeowners.backend.config.AbstractRequiredApprovalConfig; +import com.google.gerrit.plugins.codeowners.backend.config.RequiredApproval; +import com.google.gerrit.plugins.codeowners.backend.config.RequiredApprovalConfig; import com.google.gerrit.server.project.ProjectState; import org.eclipse.jgit.lib.Config; import org.junit.Before;
diff --git a/javatests/com/google/gerrit/plugins/codeowners/config/RequiredApprovalTest.java b/javatests/com/google/gerrit/plugins/codeowners/backend/config/RequiredApprovalTest.java similarity index 98% rename from javatests/com/google/gerrit/plugins/codeowners/config/RequiredApprovalTest.java rename to javatests/com/google/gerrit/plugins/codeowners/backend/config/RequiredApprovalTest.java index fba885d..51e160b 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/config/RequiredApprovalTest.java +++ b/javatests/com/google/gerrit/plugins/codeowners/backend/config/RequiredApprovalTest.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.plugins.codeowners.config; +package com.google.gerrit.plugins.codeowners.backend.config; import static com.google.common.truth.Truth.assertThat; import static com.google.gerrit.server.project.ProjectCache.illegalState; @@ -25,6 +25,7 @@ import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.plugins.codeowners.acceptance.AbstractCodeOwnersTest; +import com.google.gerrit.plugins.codeowners.backend.config.RequiredApproval; import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.util.time.TimeUtil; import java.util.Arrays;
diff --git a/javatests/com/google/gerrit/plugins/codeowners/config/StatusConfigTest.java b/javatests/com/google/gerrit/plugins/codeowners/backend/config/StatusConfigTest.java similarity index 96% rename from javatests/com/google/gerrit/plugins/codeowners/config/StatusConfigTest.java rename to javatests/com/google/gerrit/plugins/codeowners/backend/config/StatusConfigTest.java index 6ad8f3b..ae97a67 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/config/StatusConfigTest.java +++ b/javatests/com/google/gerrit/plugins/codeowners/backend/config/StatusConfigTest.java
@@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.plugins.codeowners.config; +package com.google.gerrit.plugins.codeowners.backend.config; import static com.google.common.truth.Truth.assertThat; -import static com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration.SECTION_CODE_OWNERS; -import static com.google.gerrit.plugins.codeowners.config.StatusConfig.KEY_DISABLED; -import static com.google.gerrit.plugins.codeowners.config.StatusConfig.KEY_DISABLED_BRANCH; +import static com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration.SECTION_CODE_OWNERS; +import static com.google.gerrit.plugins.codeowners.backend.config.StatusConfig.KEY_DISABLED; +import static com.google.gerrit.plugins.codeowners.backend.config.StatusConfig.KEY_DISABLED_BRANCH; import static com.google.gerrit.testing.GerritJUnit.assertThrows; import com.google.common.collect.ImmutableList; @@ -26,6 +26,7 @@ import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.RefNames; import com.google.gerrit.plugins.codeowners.acceptance.AbstractCodeOwnersTest; +import com.google.gerrit.plugins.codeowners.backend.config.StatusConfig; import com.google.gerrit.server.git.validators.CommitValidationMessage; import com.google.gerrit.server.git.validators.ValidationMessage; import com.google.gerrit.server.project.ProjectLevelConfig;
diff --git a/javatests/com/google/gerrit/plugins/codeowners/restapi/CodeOwnerProjectConfigJsonTest.java b/javatests/com/google/gerrit/plugins/codeowners/restapi/CodeOwnerProjectConfigJsonTest.java index 3042859..5861aa4 100644 --- a/javatests/com/google/gerrit/plugins/codeowners/restapi/CodeOwnerProjectConfigJsonTest.java +++ b/javatests/com/google/gerrit/plugins/codeowners/restapi/CodeOwnerProjectConfigJsonTest.java
@@ -35,11 +35,11 @@ import com.google.gerrit.plugins.codeowners.backend.CodeOwnerBackendId; import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfigScanner; import com.google.gerrit.plugins.codeowners.backend.FallbackCodeOwners; +import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration; +import com.google.gerrit.plugins.codeowners.backend.config.RequiredApproval; import com.google.gerrit.plugins.codeowners.backend.findowners.FindOwnersBackend; import com.google.gerrit.plugins.codeowners.backend.proto.ProtoBackend; import com.google.gerrit.plugins.codeowners.common.MergeCommitStrategy; -import com.google.gerrit.plugins.codeowners.config.CodeOwnersPluginConfiguration; -import com.google.gerrit.plugins.codeowners.config.RequiredApproval; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.project.BranchResource; import com.google.gerrit.server.project.ProjectResource;