PathCodeOwners: Add an AutoValue class to represent the result
PathCodeOwners resolve a code owner config for a path. Add an AutoValue
class to represent the result of resolving the code owner config and
move the get() and ignoreParentCodeOwners() into it, as they operate on
the resolved code owner config. Since in the context of the new
AutoValue class the meaning of the get() method is not that clear,
rename it to getPathCodeOwners().
Having a dedicated result class will allow us to add further properties
to in in follow-up changes (e.g. a flag to tell whether there have been
unresolved imports).
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: Ibd6e390b91ee15427c7da730bec1c5db9c209c35
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigHierarchy.java b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigHierarchy.java
index f443c50..e9db8c8 100644
--- a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigHierarchy.java
+++ b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigHierarchy.java
@@ -130,7 +130,8 @@
logger.atFine().log("visit code owner config for %s", ownerConfigFolder);
boolean visitFurtherCodeOwnerConfigs =
codeOwnerConfigVisitor.visit(pathCodeOwners.get().getCodeOwnerConfig());
- boolean ignoreParentCodeOwners = pathCodeOwners.get().ignoreParentCodeOwners();
+ boolean ignoreParentCodeOwners =
+ pathCodeOwners.get().resolveCodeOwnerConfig().ignoreParentCodeOwners();
if (ignoreParentCodeOwners) {
parentCodeOwnersIgnoredCallback.accept(codeOwnerConfigKey);
}
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerResolver.java b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerResolver.java
index 205e931..7f7cfff 100644
--- a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerResolver.java
+++ b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerResolver.java
@@ -153,7 +153,11 @@
.filePath(codeOwnerConfig.key().fileName().orElse("<default>"))
.build())) {
logger.atFine().log("resolving path code owners for path %s", absolutePath);
- return resolve(pathCodeOwnersFactory.create(codeOwnerConfig, absolutePath).get());
+ return resolve(
+ pathCodeOwnersFactory
+ .create(codeOwnerConfig, absolutePath)
+ .resolveCodeOwnerConfig()
+ .getPathCodeOwners());
}
}
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/PathCodeOwners.java b/java/com/google/gerrit/plugins/codeowners/backend/PathCodeOwners.java
index c8a9b82..9911150 100644
--- a/java/com/google/gerrit/plugins/codeowners/backend/PathCodeOwners.java
+++ b/java/com/google/gerrit/plugins/codeowners/backend/PathCodeOwners.java
@@ -20,7 +20,6 @@
import static java.util.stream.Collectors.toSet;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableSet;
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.entities.BranchNameKey;
import com.google.gerrit.entities.Project;
@@ -123,7 +122,7 @@
private final Path path;
private final PathExpressionMatcher pathExpressionMatcher;
- private CodeOwnerConfig resolvedCodeOwnerConfig;
+ private PathCodeOwnersResult pathCodeOwnersResult;
private PathCodeOwners(
ProjectCache projectCache,
@@ -146,32 +145,6 @@
}
/**
- * Gets the code owners from the code owner config that apply to the path.
- *
- * <p>Code owners from inherited code owner configs are not considered.
- *
- * @return the code owners of the path
- */
- public ImmutableSet<CodeOwnerReference> get() {
- logger.atFine().log("computing path code owners for %s from %s", path, codeOwnerConfig.key());
- ImmutableSet<CodeOwnerReference> pathCodeOwners =
- resolveCodeOwnerConfig().codeOwnerSets().stream()
- .flatMap(codeOwnerSet -> codeOwnerSet.codeOwners().stream())
- .collect(toImmutableSet());
- logger.atFine().log("pathCodeOwners = %s", pathCodeOwners);
- return pathCodeOwners;
- }
-
- /**
- * Whether parent code owners should be ignored for the path.
- *
- * @return whether parent code owners should be ignored for the path
- */
- public boolean ignoreParentCodeOwners() {
- return resolveCodeOwnerConfig().ignoreParentCodeOwners();
- }
-
- /**
* Resolves the {@link #codeOwnerConfig}.
*
* <p>Resolving means that:
@@ -207,9 +180,9 @@
*
* @return the resolved code owner config
*/
- private CodeOwnerConfig resolveCodeOwnerConfig() {
- if (this.resolvedCodeOwnerConfig != null) {
- return this.resolvedCodeOwnerConfig;
+ public PathCodeOwnersResult resolveCodeOwnerConfig() {
+ if (this.pathCodeOwnersResult != null) {
+ return this.pathCodeOwnersResult;
}
try (TraceTimer traceTimer =
@@ -255,9 +228,9 @@
.build();
}
- this.resolvedCodeOwnerConfig = resolvedCodeOwnerConfig;
- logger.atFine().log("resolved code owner config = %s", resolvedCodeOwnerConfig);
- return this.resolvedCodeOwnerConfig;
+ this.pathCodeOwnersResult = PathCodeOwnersResult.create(path, resolvedCodeOwnerConfig);
+ logger.atFine().log("path code owners result = %s", pathCodeOwnersResult);
+ return this.pathCodeOwnersResult;
}
}
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/PathCodeOwnersResult.java b/java/com/google/gerrit/plugins/codeowners/backend/PathCodeOwnersResult.java
new file mode 100644
index 0000000..fd15503
--- /dev/null
+++ b/java/com/google/gerrit/plugins/codeowners/backend/PathCodeOwnersResult.java
@@ -0,0 +1,75 @@
+// Copyright (C) 2020 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.plugins.codeowners.backend;
+
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
+
+import com.google.auto.value.AutoValue;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.flogger.FluentLogger;
+import java.nio.file.Path;
+
+/** The result of resolving path code owners via {@link PathCodeOwners}. */
+@AutoValue
+public abstract class PathCodeOwnersResult {
+ private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+
+ /** Gets the path for which the code owner config was resolved. */
+ abstract Path path();
+
+ /** Gets the resolved code owner config. */
+ abstract CodeOwnerConfig codeOwnerConfig();
+
+ /**
+ * Gets the code owners from the code owner config that apply to the path.
+ *
+ * <p>Code owners from inherited code owner configs are not considered.
+ *
+ * @return the code owners of the path
+ */
+ public ImmutableSet<CodeOwnerReference> getPathCodeOwners() {
+ logger.atFine().log(
+ "computing path code owners for %s from %s", path(), codeOwnerConfig().key());
+ ImmutableSet<CodeOwnerReference> pathCodeOwners =
+ codeOwnerConfig().codeOwnerSets().stream()
+ .flatMap(codeOwnerSet -> codeOwnerSet.codeOwners().stream())
+ .collect(toImmutableSet());
+ logger.atFine().log("pathCodeOwners = %s", pathCodeOwners);
+ return pathCodeOwners;
+ }
+
+ /**
+ * Whether parent code owners should be ignored for the path.
+ *
+ * @return whether parent code owners should be ignored for the path
+ */
+ public boolean ignoreParentCodeOwners() {
+ return codeOwnerConfig().ignoreParentCodeOwners();
+ }
+
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper(this)
+ .add("path", path())
+ .add("codeOwnerConfig", codeOwnerConfig())
+ .toString();
+ }
+
+ /** Creates a {@link CodeOwnerResolverResult} instance. */
+ public static PathCodeOwnersResult create(Path path, CodeOwnerConfig codeOwnerConfig) {
+ return new AutoValue_PathCodeOwnersResult(path, codeOwnerConfig);
+ }
+}
diff --git a/javatests/com/google/gerrit/plugins/codeowners/backend/PathCodeOwnersTest.java b/javatests/com/google/gerrit/plugins/codeowners/backend/PathCodeOwnersTest.java
index e5d06ac..02a1ca8 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/backend/PathCodeOwnersTest.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/backend/PathCodeOwnersTest.java
@@ -205,7 +205,7 @@
CodeOwnerConfig emptyCodeOwnerConfig = createCodeOwnerBuilder().build();
PathCodeOwners pathCodeOwners =
pathCodeOwnersFactory.create(emptyCodeOwnerConfig, Paths.get("/foo/bar/baz.md"));
- assertThat(pathCodeOwners.get()).isEmpty();
+ assertThat(pathCodeOwners.resolveCodeOwnerConfig().getPathCodeOwners()).isEmpty();
}
@Test
@@ -216,7 +216,7 @@
.build();
PathCodeOwners pathCodeOwners =
pathCodeOwnersFactory.create(codeOwnerConfig, Paths.get("/foo/bar/baz.md"));
- assertThat(pathCodeOwners.get())
+ assertThat(pathCodeOwners.resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email(), user.email());
}
@@ -254,7 +254,7 @@
.build();
PathCodeOwners pathCodeOwners =
pathCodeOwnersFactory.create(codeOwnerConfig, Paths.get("/foo/bar/baz.md"));
- assertThat(pathCodeOwners.get())
+ assertThat(pathCodeOwners.resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email(), user.email());
}
@@ -275,7 +275,7 @@
.build();
PathCodeOwners pathCodeOwners =
pathCodeOwnersFactory.create(codeOwnerConfig, Paths.get("/foo/bar/baz.md"));
- assertThat(pathCodeOwners.get()).isEmpty();
+ assertThat(pathCodeOwners.resolveCodeOwnerConfig().getPathCodeOwners()).isEmpty();
}
}
@@ -307,7 +307,7 @@
.build();
PathCodeOwners pathCodeOwners =
pathCodeOwnersFactory.create(codeOwnerConfig, Paths.get("/foo/bar/baz.md"));
- assertThat(pathCodeOwners.get())
+ assertThat(pathCodeOwners.resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email());
}
@@ -341,7 +341,7 @@
.build();
PathCodeOwners pathCodeOwners =
pathCodeOwnersFactory.create(codeOwnerConfig, Paths.get("/foo/bar/baz.md"));
- assertThat(pathCodeOwners.get())
+ assertThat(pathCodeOwners.resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email(), user.email());
}
@@ -376,7 +376,7 @@
.build();
PathCodeOwners pathCodeOwners =
pathCodeOwnersFactory.create(codeOwnerConfig, Paths.get("/foo/bar/baz.md"));
- assertThat(pathCodeOwners.get())
+ assertThat(pathCodeOwners.resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email(), user.email());
}
@@ -389,7 +389,7 @@
pathCodeOwnersFactory.create(
createCodeOwnerBuilder().setIgnoreParentCodeOwners().build(),
Paths.get("/foo/bar/baz.md"));
- assertThat(pathCodeOwners.ignoreParentCodeOwners()).isTrue();
+ assertThat(pathCodeOwners.resolveCodeOwnerConfig().ignoreParentCodeOwners()).isTrue();
}
@Test
@@ -399,7 +399,7 @@
pathCodeOwnersFactory.create(
createCodeOwnerBuilder().setIgnoreParentCodeOwners(false).build(),
Paths.get("/foo/bar/baz.md"));
- assertThat(pathCodeOwners.ignoreParentCodeOwners()).isFalse();
+ assertThat(pathCodeOwners.resolveCodeOwnerConfig().ignoreParentCodeOwners()).isFalse();
}
@Test
@@ -415,7 +415,7 @@
.build())
.build(),
Paths.get("/foo.md"));
- assertThat(pathCodeOwners.ignoreParentCodeOwners()).isTrue();
+ assertThat(pathCodeOwners.resolveCodeOwnerConfig().ignoreParentCodeOwners()).isTrue();
}
@Test
@@ -432,7 +432,7 @@
.build())
.build(),
Paths.get("/foo.md"));
- assertThat(pathCodeOwners.ignoreParentCodeOwners()).isFalse();
+ assertThat(pathCodeOwners.resolveCodeOwnerConfig().ignoreParentCodeOwners()).isFalse();
}
@Test
@@ -459,7 +459,7 @@
// Expectation: we get the global code owner from the importing code owner config, the
// non-resolveable import is silently ignored
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email());
}
@@ -504,7 +504,7 @@
// Expectation: we get the global code owners from the importing and the imported code owner
// config
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email(), user.email());
}
@@ -549,7 +549,7 @@
// Expectation: we get the matching per-file code owners from the importing and the imported
// code owner config
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email(), user.email());
}
@@ -595,7 +595,7 @@
// Expectation: we only get the matching per-file code owners from the importing code owner
// config, the per-file code owners from the imported code owner config are not relevant since
// they do not match
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email());
}
@@ -642,7 +642,7 @@
// Expectation: we only get the matching per-file code owners from the importing code owner
// config, the matching per-file code owners from the imported code owner config are not
// relevant with import mode GLOBAL_CODE_OWNER_SETS_ONLY
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email());
}
@@ -690,10 +690,10 @@
// the matching per-file code owner set in the imported code owner config has the
// ignoreGlobalAndParentCodeOwners flag set to true which causes global code owners to be
// ignored, in addition this flag causes parent code owners to be ignored
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(user.email());
- assertThat(pathCodeOwners.get().ignoreParentCodeOwners()).isTrue();
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().ignoreParentCodeOwners()).isTrue();
}
@Test
@@ -738,10 +738,10 @@
// per-file code owners from the imported code owner config and its
// ignoreGlobalAndParentCodeOwners flag are not relevant since the per-file code owner set does
// not match
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email());
- assertThat(pathCodeOwners.get().ignoreParentCodeOwners()).isFalse();
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().ignoreParentCodeOwners()).isFalse();
}
@Test
@@ -786,10 +786,10 @@
// matching per-file code owners from the imported code owner config and its
// ignoreGlobalAndParentCodeOwners flag are not relevant with import mode
// GLOBAL_CODE_OWNER_SETS_ONLY
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email());
- assertThat(pathCodeOwners.get().ignoreParentCodeOwners()).isFalse();
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().ignoreParentCodeOwners()).isFalse();
}
@Test
@@ -824,7 +824,7 @@
// Expectation: ignoreParentCodeOwners is true because the ignoreParentCodeOwners flag in the
// imported code owner config is set to true
- assertThat(pathCodeOwners.get().ignoreParentCodeOwners()).isTrue();
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().ignoreParentCodeOwners()).isTrue();
}
@Test
@@ -861,7 +861,7 @@
// Expectation: ignoreParentCodeOwners is false because the ignoreParentCodeOwners flag in the
// imported code owner config is not relevant with import mode GLOBAL_CODE_OWNER_SETS_ONLY
- assertThat(pathCodeOwners.get().ignoreParentCodeOwners()).isFalse();
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().ignoreParentCodeOwners()).isFalse();
}
@Test
@@ -919,7 +919,7 @@
// Expectation: we get the global owners from the importing code owner config, the imported code
// owner config and the code owner config that is imported by the imported code owner config
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email(), user.email(), user2.email());
}
@@ -977,7 +977,7 @@
// Expectation: we get the global owners from the importing code owner config and the imported
// code owner config but not the per file code owner from the code owner config that is imported
// by the imported code owner config
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email(), user.email());
}
@@ -1027,7 +1027,7 @@
// Expectation: we get the global code owners from the importing and the imported code owner
// config
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email(), user.email());
}
@@ -1064,7 +1064,7 @@
assertThat(pathCodeOwners).isPresent();
// Expectation: we get the global owners from the importing and the imported code owner config
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email(), user.email());
}
@@ -1111,7 +1111,7 @@
// Expectation: we get the global owners from the importing and the imported code owner config
// as they were defined at oldRevision
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email(), user.email());
}
@@ -1147,7 +1147,7 @@
assertThat(pathCodeOwners).isPresent();
// Expectation: we get the global owners from the importing and the imported code owner config
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email(), user.email());
}
@@ -1176,7 +1176,7 @@
assertThat(pathCodeOwners).isPresent();
// Expectation: we get the global owners from the importing code owner config
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email());
}
@@ -1220,7 +1220,7 @@
// Expectation: we get the global owners from the importing code owner config, the global code
// owners from the imported code owner config are ignored since the project that contains the
// code owner config is hidden
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email());
}
@@ -1250,7 +1250,7 @@
assertThat(pathCodeOwners).isPresent();
// Expectation: we get the global owners from the importing code owner config
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email());
}
@@ -1290,7 +1290,7 @@
assertThat(pathCodeOwners).isPresent();
// Expectation: we get the global owners from the importing and the imported code owner config
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email(), user.email());
}
@@ -1337,7 +1337,7 @@
assertThat(pathCodeOwners).isPresent();
// Expectation: we get the global owners from the importing and the imported code owner config
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email(), user.email());
}
@@ -1380,7 +1380,7 @@
assertThat(pathCodeOwners).isPresent();
// Expectation: we get the global owners from the importing and the imported code owner config
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email(), user.email());
}
@@ -1425,7 +1425,7 @@
assertThat(pathCodeOwners).isPresent();
// Expectation: we get the global owners from the importing and the imported code owner config
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email(), user.email());
}
@@ -1459,7 +1459,7 @@
// Expectation: we get the per file code owner from the importing code owner config, the
// non-resolveable per file import is silently ignored
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email());
}
@@ -1511,12 +1511,12 @@
// Expectation: we get the per file code owners from the importing and the global code owner
// from the imported code owner config, but not the per file code owner from the imported code
// owner config
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email(), user.email());
// Expectation: the ignoreParentCodeOwners flag from the imported code owner config is ignored
- assertThat(pathCodeOwners.get().ignoreParentCodeOwners()).isFalse();
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().ignoreParentCodeOwners()).isFalse();
}
@Test
@@ -1570,7 +1570,7 @@
// Expectation: we get the global owners from the importing code owner config, the imported code
// owner config and the code owner config that is imported by the imported code owner config
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email(), user.email(), user2.email());
}
@@ -1629,7 +1629,7 @@
// Expectation: we get the global owners from the importing code owner config and the imported
// code owner config, but not the per file code owner from the code owner config that is
// imported by the imported code owner config
- assertThat(pathCodeOwners.get().get())
+ assertThat(pathCodeOwners.get().resolveCodeOwnerConfig().getPathCodeOwners())
.comparingElementsUsing(hasEmail())
.containsExactly(admin.email(), user.email());
}
