From e6b915f1e7a42db676267d0efa23dd60d7c4ab15 Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Tue, 10 Dec 2013 00:05:56 +0530 Subject: [PATCH] druid-api version not required --- .../java/io/druid/server/StatusResource.java | 36 +------------------ 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/server/src/main/java/io/druid/server/StatusResource.java b/server/src/main/java/io/druid/server/StatusResource.java index 59c6da0f4b1..8fb6733d97f 100644 --- a/server/src/main/java/io/druid/server/StatusResource.java +++ b/server/src/main/java/io/druid/server/StatusResource.java @@ -46,14 +46,13 @@ public class StatusResource { return new Status( Initialization.class.getPackage().getImplementationVersion(), - getVersion("/druid-api.version"), getExtensionVersions(), new Memory(Runtime.getRuntime()) ); } /** - * Load the extensions list and return the implementation-versions + * Load the unique extensions and return their implementation-versions * * @return map of extensions loaded with their respective implementation versions. */ @@ -70,46 +69,19 @@ public class StatusResource return moduleVersions; } - /** - * Load properties files from the classpath and return version number - * - * @param versionFile - * - * @return version number - */ - private String getVersion(String versionFile) - { - - Properties properties = new Properties(); - try { - InputStream is = StatusResource.class.getResourceAsStream(versionFile); - if (is == null) { - return null; - } - properties.load(is); - } - catch (IOException e) { -// e.printStackTrace(); - } - return properties.getProperty("version"); - } - public static class Status { final String serverVersion; - final String apiVersion; final Map extensionsVersion; final Memory memory; public Status( String serverVersion, - String apiVersion, Map extensionsVersion, Memory memory ) { this.serverVersion = serverVersion; - this.apiVersion = apiVersion; this.extensionsVersion = extensionsVersion; this.memory = memory; } @@ -120,12 +92,6 @@ public class StatusResource return serverVersion; } - @JsonProperty - public String getApiVersion() - { - return apiVersion; - } - @JsonProperty public Map getExtensionsVersion() {