Use static create methods instead of having many public constructor only used for testing.

1 files changed, 15 insertions, 8 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
index 39e9617b12c..dac1f1ed15a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
@@ -75,18 +75,13 @@ public class VespaModelFactory implements ModelFactory {
     }
 
     // For testing only
-    public VespaModelFactory(ConfigModelRegistry configModelRegistry) {
-        this(configModelRegistry, Clock.systemUTC());
-    }
-
-    // For testing only
-    public VespaModelFactory(ConfigModelRegistry configModelRegistry, Clock clock) {
+    protected VespaModelFactory(ConfigModelRegistry configModelRegistry) {
         this(new Version(VespaVersion.major, VespaVersion.minor, VespaVersion.micro), configModelRegistry,
-             clock, Zone.defaultZone());
+                Clock.systemUTC(), Zone.defaultZone());
     }
 
     // For testing only
-    public VespaModelFactory(Version version, ConfigModelRegistry configModelRegistry, Clock clock, Zone zone) {
+    private VespaModelFactory(Version version, ConfigModelRegistry configModelRegistry, Clock clock, Zone zone) {
         this.version = version;
         if (configModelRegistry == null) {
             this.configModelRegistry = new NullConfigModelRegistry();
@@ -100,6 +95,18 @@ public class VespaModelFactory implements ModelFactory {
         this.clock = clock;
     }
 
+    public static VespaModelFactory createTestFactory() {
+        return createTestFactory(new NullConfigModelRegistry(), Clock.systemUTC());
+    }
+    public static VespaModelFactory createTestFactory(ConfigModelRegistry configModelRegistry, Clock clock) {
+        return createTestFactory(new Version(VespaVersion.major, VespaVersion.minor, VespaVersion.micro), configModelRegistry,
+                clock, Zone.defaultZone());
+    }
+
+    public static VespaModelFactory createTestFactory(Version version, ConfigModelRegistry configModelRegistry, Clock clock, Zone zone) {
+        return new VespaModelFactory(version, configModelRegistry, clock, zone);
+    }
+
     /** Returns the version this model is build for */
     @Override
     public Version version() { return version; }