diff options
author | Martin Polden <mpolden@mpolden.no> | 2022-11-14 11:01:56 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2022-11-14 11:37:14 +0100 |
commit | ab09b81951e20cd85d8c2e595ca02be9e3deae77 (patch) | |
tree | 1ce1a17d815c965ca30d6f1c463b3e9edb165c46 /configserver | |
parent | 0979fffb39994efb81fb6f51daf807dc696eae26 (diff) |
Extract factory method
Diffstat (limited to 'configserver')
5 files changed, 5 insertions, 5 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/CloudAccountSerializer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/CloudAccountSerializer.java index 2478cf6baeb..7bc2ad3f777 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/CloudAccountSerializer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/CloudAccountSerializer.java @@ -16,7 +16,7 @@ public class CloudAccountSerializer { private CloudAccountSerializer() {} public static CloudAccount fromSlime(Inspector object) { - return new CloudAccount(object.field(ID_FIELD).asString()); + return CloudAccount.from(object.field(ID_FIELD).asString()); } public static Slime toSlime(CloudAccount account) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java index b1b42465b00..95f44bf09a1 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java @@ -512,7 +512,7 @@ public class HostedDeployTest { @Test public void testRedeployWithCloudAccount() { - CloudAccount cloudAccount = new CloudAccount("012345678912"); + CloudAccount cloudAccount = CloudAccount.from("012345678912"); DeployTester tester = new DeployTester.Builder(temporaryFolder) .modelFactory(createHostedModelFactory(Version.fromString("4.5.6"), Clock.systemUTC())) .build(); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java index 34921db1bb7..82d6f183761 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java @@ -210,7 +210,7 @@ public class PrepareParamsTest { public void testCloudAccount() { String json = "{\"cloudAccount\": {\"id\": \"012345678912\"}}"; PrepareParams params = PrepareParams.fromJson(json.getBytes(StandardCharsets.UTF_8), TenantName.defaultName(), Duration.ZERO); - assertEquals(new CloudAccount("012345678912"), params.cloudAccount().get()); + assertEquals(CloudAccount.from("012345678912"), params.cloudAccount().get()); } private void assertPrepareParamsEqual(PrepareParams urlParams, PrepareParams jsonParams) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java index 78548dea195..6156dd8b6dc 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java @@ -348,7 +348,7 @@ public class SessionPreparerTest { TestModelFactory modelFactory = new TestModelFactory(version123); preparer = createPreparer(new ModelFactoryRegistry(List.of(modelFactory)), HostProvisionerProvider.empty()); ApplicationId applicationId = applicationId("test"); - CloudAccount expected = new CloudAccount("012345678912"); + CloudAccount expected = CloudAccount.from("012345678912"); PrepareParams params = new PrepareParams.Builder().applicationId(applicationId) .cloudAccount(expected) .build(); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/CloudAccountSerializerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/CloudAccountSerializerTest.java index 7989cdcf019..7fb6a27b22b 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/CloudAccountSerializerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/CloudAccountSerializerTest.java @@ -15,7 +15,7 @@ public class CloudAccountSerializerTest { @Test public void serialization() { - CloudAccount account = new CloudAccount("012345678912"); + CloudAccount account = CloudAccount.from("012345678912"); assertEquals(account, fromSlime(toSlime(account).get())); } |