diff options
| author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-04-15 10:30:18 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-04-15 10:30:18 +0200 |
| commit | 132c65ea92960f583ada0db4fcf5796d85bf6a4c (patch) | |
| tree | c7142bca58113f050144f8b4e9a460a66280c853 /controller-api | |
| parent | 18f1cb580818523baa3c2dcd06b986c8ab20dbac (diff) | |
Update some doc
Diffstat (limited to 'controller-api')
4 files changed, 5 insertions, 5 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/ApplicationRole.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/ApplicationRole.java index 80a83c4adca..37ef06d461b 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/ApplicationRole.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/ApplicationRole.java @@ -5,7 +5,7 @@ import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.TenantName; /** - * A {@link Role} with a {@link Context} of a {@link SystemName} a {@link TenantName} and an {@link ApplicationName}. + * A {@link Role} with a {@link Context} of a {@link TenantName} and an {@link ApplicationName}. * * @author jonmv */ diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Policy.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Policy.java index 8de4478f955..15745d69dc5 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Policy.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Policy.java @@ -11,8 +11,8 @@ import java.util.Set; /** * Policies for REST APIs in the controller. A policy is only considered when defined in a {@link Role}. * A policy describes a set of {@link Privilege}s, which are valid for a set of {@link SystemName}s. - * A policy is evaluated with a {@link Context}, which provides the {@link SystemName} the policy is - * evaluated in, and any limitations to a specific {@link TenantName} or {@link ApplicationName}. + * A policy is evaluated by an {@link Enforcer}, which holds the {@link SystemName} the evaluation is done in. + * A policy is evaluated with a {@link Context}, which may limit it to a specific {@link TenantName} or {@link ApplicationName}. * * @author mpolden */ diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/TenantRole.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/TenantRole.java index 2690f5242df..8712b436c0d 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/TenantRole.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/TenantRole.java @@ -4,7 +4,7 @@ import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.TenantName; /** - * A {@link Role} with a {@link Context} of a {@link SystemName} and a {@link TenantName}. + * A {@link Role} with a {@link Context} of a {@link TenantName}. * * @author jonmv */ diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/UnboundRole.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/UnboundRole.java index 30e9f197148..93774b25210 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/UnboundRole.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/UnboundRole.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.controller.api.role; import com.yahoo.config.provision.SystemName; /** - * A {@link Role} with a {@link Context} of only a {@link SystemName}. + * A {@link Role} with an unlimited {@link Context}. * * @author jonmv */ |