From 5c1558eced850f441b6f17c7637e363ee9abc533 Mon Sep 17 00:00:00 2001
From: Martin Polden <mpolden@mpolden.no>
Date: Fri, 2 Feb 2018 09:04:21 +0100
Subject: Fix RevisionId validation

---
 .../vespa/hosted/controller/api/identifiers/RevisionId.java   |  2 +-
 .../hosted/controller/api/identifiers/IdentifierTest.java     | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

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
index 11094c69707..5e2a9776264 100644
--- 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
@@ -6,7 +6,7 @@ package com.yahoo.vespa.hosted.controller.api.identifiers;
  * 
  * @author smorgrav
  */
-public class RevisionId extends SerializedIdentifier {
+public class RevisionId extends Identifier {
 
     public RevisionId(String id) {
         super(id);
diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/identifiers/IdentifierTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/identifiers/IdentifierTest.java
index 0511ab44a8b..92b8a18b9f5 100644
--- a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/identifiers/IdentifierTest.java
+++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/identifiers/IdentifierTest.java
@@ -5,9 +5,10 @@ import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
+/**
+ * @author smorgrav
+ */
 public class IdentifierTest {
 
     @Test(expected = IllegalArgumentException.class)
@@ -125,11 +126,15 @@ public class IdentifierTest {
         new ApplicationId("api");
     }
 
-
     @Test
     public void application_instance_id_dotted_string_is_subindentifers_concatinated_with_dots() {
         DeploymentId id = new DeploymentId(com.yahoo.config.provision.ApplicationId.from("tenant", "application", "instance"),
                                            ZoneId.from("prod", "region"));
         assertEquals("tenant.application.prod.region.instance", id.dottedString());
     }
+
+    @Test
+    public void revision_id_can_contain_application_version_number() {
+        new RevisionId("1.0.1078-24825d1f6");
+    }
 }
-- 
cgit v1.2.3