diff options
author | Harald Musum <musum@yahoo-inc.com> | 2016-12-09 09:21:31 +0100 |
---|---|---|
committer | Harald Musum <musum@yahoo-inc.com> | 2016-12-09 09:21:31 +0100 |
commit | d41cf4ad003b3a7e1089bce17374dc359d0630e8 (patch) | |
tree | e9f3b4bc41f83f9629a2920effd64222dc74cea7 | |
parent | 7c314a1c3b624e2f1db5b2d3c53d5cbd1e38d1e5 (diff) |
Remove unnecessary method
3 files changed, 3 insertions, 6 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java index 11952328e8f..e8764350313 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java @@ -63,9 +63,6 @@ public class Application implements ModelResult { */ public Long getApplicationGeneration() { return appGeneration; } - // TODO: Return ApplicationName - public String getName() { return app.application().value(); } - /** Returns the application model, never null */ @Override public Model getModel() { return model; } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationTest.java index 87313ed5b42..4121d6e4691 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationTest.java @@ -57,7 +57,7 @@ public class ApplicationTest { assertThat(app.getApplicationGeneration(), is(1337l)); assertNotNull(app.getModel()); assertThat(app.getCache(), is(cache)); - assertThat(app.getName(), is("foobar")); + assertThat(app.getId().application().value(), is("foobar")); assertThat(app.getVespaVersion(), is(vespaVersion)); assertThat(app.toString(), is("application 'foobar', generation 1337, vespa version 1.2.3")); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java index 468280b6b3d..f682f491a11 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java @@ -72,14 +72,14 @@ public class RemoteSessionTest { ApplicationSet applicationSet = session.ensureApplicationLoaded(); assertNotNull(applicationSet); assertThat(applicationSet.getApplicationGeneration(), is(3l)); - assertThat(applicationSet.getForVersionOrLatest(Optional.empty()).getName(), is("foo")); + assertThat(applicationSet.getForVersionOrLatest(Optional.empty()).getId().application().value(), is("foo")); assertNotNull(applicationSet.getForVersionOrLatest(Optional.empty()).getModel()); session.deactivate(); applicationSet = session.ensureApplicationLoaded(); assertNotNull(applicationSet); assertThat(applicationSet.getApplicationGeneration(), is(3l)); - assertThat(applicationSet.getForVersionOrLatest(Optional.empty()).getName(), is("foo")); + assertThat(applicationSet.getForVersionOrLatest(Optional.empty()).getId().application().value(), is("foo")); assertNotNull(applicationSet.getForVersionOrLatest(Optional.empty()).getModel()); } |