Test and fix parsing, and rename to MavenRepository

3 files changed, 5 insertions, 6 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/maven/Repository.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/maven/MavenRepository.java
index 41a13d41814..ef667bac8c5 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/maven/Repository.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/maven/MavenRepository.java
@@ -5,7 +5,7 @@ package com.yahoo.vespa.hosted.controller.api.integration.maven;
  *
  * @author jonmv
  */
-public interface Repository {
+public interface MavenRepository {
 
     Metadata getMetadata(ArtifactId id);
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/maven/Metadata.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/maven/Metadata.java
index e837eaf875e..fd84a05db6a 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/maven/Metadata.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/maven/Metadata.java
@@ -31,12 +31,11 @@ public class Metadata {
 
     /** Creates a new Metadata object from the given XML document. */
     public static Metadata fromXml(String xml) {
-        Element root = XML.getDocument(xml).getDocumentElement();
-        Element metadata = XML.getChild(root, "metadata");
+        Element metadata = XML.getDocument(xml).getDocumentElement();
         ArtifactId id = new ArtifactId(XML.getValue(XML.getChild(metadata, "groupId")),
                                        XML.getValue(XML.getChild(metadata, "artifactId")));
         List<Version> versions = new ArrayList<>();
-        for (Element version : XML.getChildren(XML.getChild(metadata, "versioning"), "versions"))
+        for (Element version : XML.getChildren(XML.getChild(XML.getChild(metadata, "versioning"), "versions")))
             versions.add(Version.fromString(XML.getValue(version)));
 
         return new Metadata(id, versions);
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockRepository.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockMavenRepository.java
index 9a93cd94aaa..2a8b47af777 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockRepository.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockMavenRepository.java
@@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.controller.api.integration.stubs;
 import com.yahoo.component.Version;
 import com.yahoo.vespa.hosted.controller.api.integration.maven.ArtifactId;
 import com.yahoo.vespa.hosted.controller.api.integration.maven.Metadata;
-import com.yahoo.vespa.hosted.controller.api.integration.maven.Repository;
+import com.yahoo.vespa.hosted.controller.api.integration.maven.MavenRepository;
 
 import java.util.List;
 
@@ -12,7 +12,7 @@ import java.util.List;
  *
  * @author jonmv
  */
-public class MockRepository implements Repository {
+public class MockMavenRepository implements MavenRepository {
 
     @Override
     public Metadata getMetadata(ArtifactId id) {