diff options
Diffstat (limited to 'controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers')
22 files changed, 0 insertions, 616 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/ApplicationId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/ApplicationId.java deleted file mode 100644 index 96bbff56242..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/ApplicationId.java +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.identifiers; - -/** - * @author smorgrav - */ -public class ApplicationId extends NonDefaultIdentifier { - - public ApplicationId(String id) { - super(id); - } - - @Override - public void validate() { - super.validate(); - validateNoUpperCase(); - } - - public static void validate(String id) { - if ( ! strictPattern.matcher(id).matches()) - throwInvalidId(id, strictPatternExplanation); - new ApplicationId(id); // validate - } - -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/ClusterId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/ClusterId.java deleted file mode 100644 index 7cec4068c2e..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/ClusterId.java +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.identifiers; - -import com.yahoo.config.provision.ClusterSpec; - -import java.util.Objects; - -/** - * DeploymentId x ClusterSpec.Id = ClusterId - * - * @author ogronnesby - */ -public class ClusterId { - private final DeploymentId deploymentId; - private final ClusterSpec.Id clusterId; - - public ClusterId(DeploymentId deploymentId, ClusterSpec.Id clusterId) { - this.deploymentId = deploymentId; - this.clusterId = clusterId; - } - - public DeploymentId deploymentId() { - return deploymentId; - } - - public ClusterSpec.Id clusterId() { - return clusterId; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - ClusterId clusterId1 = (ClusterId) o; - return Objects.equals(deploymentId, clusterId1.deploymentId) && Objects.equals(clusterId, clusterId1.clusterId); - } - - @Override - public int hashCode() { - return Objects.hash(deploymentId, clusterId); - } - - @Override - public String toString() { - return "ClusterId{" + - "deploymentId=" + deploymentId + - ", clusterId=" + clusterId + - '}'; - } -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/ControllerVersion.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/ControllerVersion.java deleted file mode 100644 index 0f6cf6bb78d..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/ControllerVersion.java +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.identifiers; - -import com.yahoo.component.Version; -import com.yahoo.component.Vtag; - -import java.time.Instant; -import java.util.Objects; - -/** - * A controller's Vespa version and commit details. - * - * @author mpolden - */ -public class ControllerVersion implements Comparable<ControllerVersion> { - - /** The current version of this controller */ - public static final ControllerVersion CURRENT = new ControllerVersion(Vtag.currentVersion, Vtag.commitSha, Vtag.commitDate); - - private final Version version; - private final String commitSha; - private final Instant commitDate; - - public ControllerVersion(Version version, String commitSha, Instant commitDate) { - this.version = Objects.requireNonNull(version); - this.commitSha = Objects.requireNonNull(commitSha); - this.commitDate = Objects.requireNonNull(commitDate); - } - - /** Vespa version */ - public Version version() { - return version; - } - - /** Commit SHA of this */ - public String commitSha() { - return commitSha; - } - - /** The time this was committed */ - public Instant commitDate() { - return commitDate; - } - - @Override - public String toString() { - return version + ", commit " + commitSha + " @ " + commitDate; - } - - @Override - public int compareTo(ControllerVersion o) { - return version.compareTo(o.version); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - ControllerVersion that = (ControllerVersion) o; - return version.equals(that.version); - } - - @Override - public int hashCode() { - return Objects.hash(version); - } - -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/DeploymentId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/DeploymentId.java deleted file mode 100644 index 58b7e4f38ff..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/DeploymentId.java +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.identifiers; - -import com.yahoo.config.provision.zone.ZoneId; - -import java.util.Objects; - -/** - * ApplicationId x ZoneId. - * - * @author smorgrav - * @author bratseth - */ -public class DeploymentId { - - private final com.yahoo.config.provision.ApplicationId applicationId; - private final ZoneId zoneId; - - public DeploymentId(com.yahoo.config.provision.ApplicationId applicationId, ZoneId zoneId) { - this.applicationId = applicationId; - this.zoneId = zoneId; - } - - public com.yahoo.config.provision.ApplicationId applicationId() { - return applicationId; - } - - public ZoneId zoneId() { - return zoneId; - } - - public String dottedString() { - return unCapitalize(applicationId().tenant().value()) + "." - + unCapitalize(applicationId().application().value()) + "." - + unCapitalize(zoneId.environment().value()) + "." - + unCapitalize(zoneId.region().value()) + "." - + unCapitalize(applicationId.instance().value()); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if ( ! (o instanceof DeploymentId)) return false; - DeploymentId id = (DeploymentId) o; - return Objects.equals(applicationId, id.applicationId) && - Objects.equals(zoneId, id.zoneId); - } - - @Override - public int hashCode() { - return Objects.hash(applicationId, zoneId); - } - - @Override - public String toString() { - return toUserFriendlyString(); - } - - public String toUserFriendlyString() { - return applicationId + " in " + zoneId; - } - - private static String unCapitalize(String str) { - return str.toLowerCase().substring(0,1) + str.substring(1); - } - -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/EnvironmentId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/EnvironmentId.java deleted file mode 100644 index 2d95ad9380b..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/EnvironmentId.java +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.identifiers; - -/** - * @author smorgrav - */ -public class EnvironmentId extends NonDefaultIdentifier { - - public EnvironmentId(String id) { - super(id); - } - -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/GitBranch.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/GitBranch.java deleted file mode 100644 index ebc20d372df..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/GitBranch.java +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.identifiers; - -/** - * @author smorgrav - */ -public class GitBranch extends Identifier { - - public GitBranch(String id) { - super(id); - } - -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/GitCommit.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/GitCommit.java deleted file mode 100644 index 23d5acaae37..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/GitCommit.java +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.identifiers; - -/** - * @author smorgrav - */ -public class GitCommit extends Identifier { - - public GitCommit(String id) { - super(id); - } - -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/GitRepository.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/GitRepository.java deleted file mode 100644 index 7b97044af12..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/GitRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.identifiers; - -/** - * @author smorgrav - */ -public class GitRepository extends Identifier { - - public GitRepository(String id) { - super(id); - } - -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/Identifier.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/Identifier.java deleted file mode 100644 index e8814b199ba..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/Identifier.java +++ /dev/null @@ -1,104 +0,0 @@ -// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.identifiers; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - -import java.util.Objects; -import java.util.regex.Pattern; - -/** - * @author smorgrav - */ -public abstract class Identifier { - - // Note: The limit of 20 characters is due to hostname being 'cluster--app--tenant', which can be max. 63 characters. - // This is an issue for level 7 routing, with level 4 routing we do not have the same limitation - protected static final String strictPatternExplanation = - "Tenant, application and instance names must start with a letter, may contain no more than 20 " + - "characters, and may only contain lowercase letters, digits or dashes, but no double-dashes."; - protected static final Pattern strictPattern = Pattern.compile("^(?=.{1,20}$)[a-z](-?[a-z0-9]+)*$"); - private static final Pattern serializedIdentifierPattern = Pattern.compile("[a-zA-Z0-9_-]+"); - private static final Pattern serializedPattern = Pattern.compile("[a-zA-Z0-9_.-]+"); - - private final String id; - - @JsonCreator - public Identifier(String id) { - Objects.requireNonNull(id, "Id string cannot be null"); - this.id = id; - validate(); - } - - public String toDns() { - return id.replace('_', '-'); - } - - @Override - public String toString() { - return id; - } - - @JsonValue - public String id() { return id; } - - public String capitalizedType() { - String simpleName = this.getClass().getSimpleName(); - String suffix = "Id"; - if (simpleName.endsWith(suffix)) { - simpleName = simpleName.substring(0, simpleName.length() - suffix.length()); - } - return simpleName; - } - - public void validate() { - if (id.equals("api")) { - throwInvalidId(id, "'api' not allowed."); - } - } - - protected void validateSerialized() { - if (!serializedPattern.matcher(id).matches()) { - throwInvalidId(id, "Must match pattern " + serializedPattern); - } - } - - protected void validateSerializedIdentifier() { - if (!serializedIdentifierPattern.matcher(id).matches()) { - throwInvalidId(id, "Must match pattern " + serializedIdentifierPattern); - } - } - - protected void validateNoDefault() { - if (id.equals("default")) { - throwInvalidId(id, "'default' not allowed."); - } - } - - protected void validateNoUpperCase() { - if (!id.equals(id.toLowerCase())) - throwInvalidId(id, "Uppercase not allowed."); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - Identifier identity = (Identifier) o; - - return id.equals(identity.id); - - } - - @Override - public int hashCode() { - return id.hashCode(); - } - - public static void throwInvalidId(String id, String explanation) { - throw new IllegalArgumentException(String.format("Invalid id '%s'. %s", id, explanation)); - } - -} - diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/InstanceId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/InstanceId.java deleted file mode 100644 index 49d0af12c45..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/InstanceId.java +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.identifiers; - -/** - * @author smorgrav - */ -public class InstanceId extends SerializedIdentifier { - - public InstanceId(String id) { - super(id); - } - - @Override - public void validate() { - super.validate(); - validateNoUpperCase(); - } - - public static void validate(String id) { - if ( ! strictPattern.matcher(id).matches()) - throwInvalidId(id, strictPatternExplanation); - new InstanceId(id); // validate - } - -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/MetricsType.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/MetricsType.java deleted file mode 100644 index fd95bd6fd81..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/MetricsType.java +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.identifiers; - -/** - * @author akvalsvik - */ -public class MetricsType extends SerializedIdentifier { - - public MetricsType(String id) { - super(id); - } - - @Override - public void validate() { - super.validate(); - validateNoUpperCase(); - } - - public static void validate(String id) { - if (!(id.equals("deployment") || id.equals("proton"))) { - throwInvalidId(id, "MetricsType be \"deployment\" or \"proton\""); - } - } -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/NonDefaultIdentifier.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/NonDefaultIdentifier.java deleted file mode 100644 index 92a7f360462..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/NonDefaultIdentifier.java +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.identifiers; - -/** - * TODO: Class description - * - * @author smorgrav - */ -public abstract class NonDefaultIdentifier extends SerializedIdentifier { - - public NonDefaultIdentifier(String id) { - super(id); - } - - @Override - public void validate() { - super.validate(); - validateNoDefault(); - } - -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/Property.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/Property.java deleted file mode 100644 index 8733fc5181f..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/Property.java +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.identifiers; - -/** - * A business property. - * - * @author smorgrav - */ -public class Property extends Identifier { - - public Property(String id) { - super(id); - } - -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/PropertyId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/PropertyId.java deleted file mode 100644 index c9d6c2afb7e..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/PropertyId.java +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.identifiers; - -import java.util.regex.Pattern; - -/** - * A business property ID. - * - * @author frodelu - */ -public class PropertyId extends Identifier { - - private static final Pattern PATTERN = Pattern.compile("\\d+"); - - public PropertyId(String id) { - super(id); - } - - /** Returns this id as a long */ - public long value() { return Long.parseLong(id()); } - - @Override - public void validate() { - super.validate(); - if(!PATTERN.matcher(id()).matches()) { - throwInvalidId(id(), "Property id must match pattern: " + PATTERN); - } - } -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/RegionId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/RegionId.java deleted file mode 100644 index 5a0c54af86b..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/RegionId.java +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.identifiers; - -/** - * @author smorgrav - */ -public class RegionId extends NonDefaultIdentifier { - - public RegionId(String id) { - super(id); - } - -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/RevisionId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/RevisionId.java deleted file mode 100644 index 663dc2b1cc6..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/RevisionId.java +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.identifiers; - -/** - * An unique identifier of an application package. - * - * @author smorgrav - */ -public class RevisionId extends Identifier { - - public RevisionId(String id) { - super(id); - } - -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/ScrewdriverId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/ScrewdriverId.java deleted file mode 100644 index db843e7cd66..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/ScrewdriverId.java +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.identifiers; - -import java.util.regex.Pattern; - -/** - * @author smorgrav - * @author bjorncs - */ -public class ScrewdriverId extends Identifier { - - // TODO: If only there was a separate type for this ... - // This demonstrates why this subclassing scheme is a bad idea - private static final Pattern PATTERN = Pattern.compile("\\d+"); - - public ScrewdriverId(String id) { - super(id); - } - - /** Returns this id as a long */ - public long value() { return Long.parseLong(id()); } - - @Override - public void validate() { - super.validate(); - if(!PATTERN.matcher(id()).matches()) { - throwInvalidId(id(), "Screwdriver id must match pattern: " + PATTERN); - } - } -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/SerializedIdentifier.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/SerializedIdentifier.java deleted file mode 100644 index 5f56888a472..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/SerializedIdentifier.java +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.identifiers; - -/** - * TODO: Class description - * - * @author smorgrav - */ - -public abstract class SerializedIdentifier extends Identifier { - - public SerializedIdentifier(String id) { - super(id); - } - - @Override - public void validate() { - super.validate(); - validateSerializedIdentifier(); - } - -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/TenantId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/TenantId.java deleted file mode 100644 index 6628a4246a3..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/TenantId.java +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.identifiers; - -/** - * @author smorgrav - */ -public class TenantId extends NonDefaultIdentifier { - - public TenantId(String id) { - super(id); - } - - @Override - public void validate() { - super.validate(); - validateNoUpperCase(); - } - - public static void validate(String id) { - if ( ! strictPattern.matcher(id).matches()) - throwInvalidId(id, strictPatternExplanation); - new TenantId(id); // validate - } - -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/UserGroup.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/UserGroup.java deleted file mode 100644 index 82fd914310c..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/UserGroup.java +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.identifiers; - -/** - * @author smorgrav - */ -public class UserGroup extends Identifier { - - public UserGroup(String id) { - super(id); - } - -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/UserId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/UserId.java deleted file mode 100644 index f2338fd135f..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/UserId.java +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.api.identifiers; - -/** - * @author smorgrav - */ -public class UserId extends NonDefaultIdentifier { - - public UserId(String id) { - super(id); - } - -} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/package-info.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/package-info.java deleted file mode 100644 index b140d8a2498..00000000000 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage -package com.yahoo.vespa.hosted.controller.api.identifiers; - -import com.yahoo.osgi.annotation.ExportPackage; |