KYLIN-1655 Fix typo in KylinConfig class
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/e767aa48 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/e767aa48 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/e767aa48 Branch: refs/heads/1.5.x-HBase1.x Commit: e767aa48f00a2625282c13ea04a3720341eda40b Parents: 08bc6c4 Author: lidongsjtu <lid...@apache.org> Authored: Thu May 5 11:47:00 2016 +0800 Committer: lidongsjtu <lid...@apache.org> Committed: Thu May 5 11:47:00 2016 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/kylin/common/KylinConfig.java | 6 +++--- .../org/apache/kylin/common/util/AbstractKylinTestCase.java | 2 +- .../org/apache/kylin/common/util/HBaseMetadataTestCase.java | 2 +- .../apache/kylin/common/util/LocalFileMetadataTestCase.java | 2 +- .../apache/kylin/cube/upgrade/common/CubeMetadataUpgrade.java | 2 +- .../kylin/rest/security/PasswordPlaceholderConfigurer.java | 2 +- .../java/org/apache/kylin/rest/service/CacheServiceTest.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/e767aa48/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java index 0405d18..722c6ce 100644 --- a/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java +++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java @@ -70,7 +70,7 @@ public class KylinConfig extends KylinConfigBase { return ENV_INSTANCE; } - public static void destoryInstance() { + public static void destroyInstance() { ENV_INSTANCE = null; } @@ -171,7 +171,7 @@ public class KylinConfig extends KylinConfigBase { } - public static InputStream getKylinPropertiesAsInputSteam() { + public static InputStream getKylinPropertiesAsInputStream() { File propFile = getKylinProperties(); if (propFile == null || !propFile.exists()) { logger.error("fail to locate kylin.properties"); @@ -232,7 +232,7 @@ public class KylinConfig extends KylinConfigBase { */ private static KylinConfig loadKylinConfig() { - InputStream is = getKylinPropertiesAsInputSteam(); + InputStream is = getKylinPropertiesAsInputStream(); if (is == null) { throw new IllegalArgumentException("Failed to load kylin config"); } http://git-wip-us.apache.org/repos/asf/kylin/blob/e767aa48/core-common/src/test/java/org/apache/kylin/common/util/AbstractKylinTestCase.java ---------------------------------------------------------------------- diff --git a/core-common/src/test/java/org/apache/kylin/common/util/AbstractKylinTestCase.java b/core-common/src/test/java/org/apache/kylin/common/util/AbstractKylinTestCase.java index 3a4b7bb..8081444 100644 --- a/core-common/src/test/java/org/apache/kylin/common/util/AbstractKylinTestCase.java +++ b/core-common/src/test/java/org/apache/kylin/common/util/AbstractKylinTestCase.java @@ -51,7 +51,7 @@ public abstract class AbstractKylinTestCase { public static void staticCleanupTestMetadata() { cleanupCache(); System.clearProperty(KylinConfig.KYLIN_CONF); - KylinConfig.destoryInstance(); + KylinConfig.destroyInstance(); } http://git-wip-us.apache.org/repos/asf/kylin/blob/e767aa48/core-common/src/test/java/org/apache/kylin/common/util/HBaseMetadataTestCase.java ---------------------------------------------------------------------- diff --git a/core-common/src/test/java/org/apache/kylin/common/util/HBaseMetadataTestCase.java b/core-common/src/test/java/org/apache/kylin/common/util/HBaseMetadataTestCase.java index fdf066b..1f4e9d1 100644 --- a/core-common/src/test/java/org/apache/kylin/common/util/HBaseMetadataTestCase.java +++ b/core-common/src/test/java/org/apache/kylin/common/util/HBaseMetadataTestCase.java @@ -52,7 +52,7 @@ public class HBaseMetadataTestCase extends AbstractKylinTestCase { public static void staticCreateTestMetadata(String kylinConfigFolder) { - KylinConfig.destoryInstance(); + KylinConfig.destroyInstance(); if (System.getProperty(KylinConfig.KYLIN_CONF) == null && System.getenv(KylinConfig.KYLIN_CONF) == null) System.setProperty(KylinConfig.KYLIN_CONF, kylinConfigFolder); http://git-wip-us.apache.org/repos/asf/kylin/blob/e767aa48/core-common/src/test/java/org/apache/kylin/common/util/LocalFileMetadataTestCase.java ---------------------------------------------------------------------- diff --git a/core-common/src/test/java/org/apache/kylin/common/util/LocalFileMetadataTestCase.java b/core-common/src/test/java/org/apache/kylin/common/util/LocalFileMetadataTestCase.java index e2f2d8b..c3e2538 100644 --- a/core-common/src/test/java/org/apache/kylin/common/util/LocalFileMetadataTestCase.java +++ b/core-common/src/test/java/org/apache/kylin/common/util/LocalFileMetadataTestCase.java @@ -43,7 +43,7 @@ public class LocalFileMetadataTestCase extends AbstractKylinTestCase { } public static void staticCreateTestMetadata(String testDataFolder) { - KylinConfig.destoryInstance(); + KylinConfig.destroyInstance(); String tempTestMetadataUrl = "../examples/test_metadata"; try { http://git-wip-us.apache.org/repos/asf/kylin/blob/e767aa48/core-cube/src/main/java/org/apache/kylin/cube/upgrade/common/CubeMetadataUpgrade.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/cube/upgrade/common/CubeMetadataUpgrade.java b/core-cube/src/main/java/org/apache/kylin/cube/upgrade/common/CubeMetadataUpgrade.java index 6f80410..f70286d 100644 --- a/core-cube/src/main/java/org/apache/kylin/cube/upgrade/common/CubeMetadataUpgrade.java +++ b/core-cube/src/main/java/org/apache/kylin/cube/upgrade/common/CubeMetadataUpgrade.java @@ -45,7 +45,7 @@ public abstract class CubeMetadataUpgrade { protected List<String> errorMsgs = Lists.newArrayList(); public CubeMetadataUpgrade(String newMetadataUrl) { - KylinConfig.destoryInstance(); + KylinConfig.destroyInstance(); config = KylinConfig.createInstanceFromUri(newMetadataUrl); store = ResourceStore.getStore(config); } http://git-wip-us.apache.org/repos/asf/kylin/blob/e767aa48/server/src/main/java/org/apache/kylin/rest/security/PasswordPlaceholderConfigurer.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/kylin/rest/security/PasswordPlaceholderConfigurer.java b/server/src/main/java/org/apache/kylin/rest/security/PasswordPlaceholderConfigurer.java index 9248ef7..2022ef0 100644 --- a/server/src/main/java/org/apache/kylin/rest/security/PasswordPlaceholderConfigurer.java +++ b/server/src/main/java/org/apache/kylin/rest/security/PasswordPlaceholderConfigurer.java @@ -39,7 +39,7 @@ public class PasswordPlaceholderConfigurer extends PropertyPlaceholderConfigurer public PasswordPlaceholderConfigurer() { Resource[] resources = new Resource[1]; - resources[0] = new InputStreamResource(KylinConfig.getKylinPropertiesAsInputSteam()); + resources[0] = new InputStreamResource(KylinConfig.getKylinPropertiesAsInputStream()); this.setLocations(resources); } http://git-wip-us.apache.org/repos/asf/kylin/blob/e767aa48/server/src/test/java/org/apache/kylin/rest/service/CacheServiceTest.java ---------------------------------------------------------------------- diff --git a/server/src/test/java/org/apache/kylin/rest/service/CacheServiceTest.java b/server/src/test/java/org/apache/kylin/rest/service/CacheServiceTest.java index 25b131a..0c2d560 100644 --- a/server/src/test/java/org/apache/kylin/rest/service/CacheServiceTest.java +++ b/server/src/test/java/org/apache/kylin/rest/service/CacheServiceTest.java @@ -72,7 +72,7 @@ public class CacheServiceTest extends LocalFileMetadataTestCase { staticCreateTestMetadata(); configA = KylinConfig.getInstanceFromEnv(); configA.setProperty("kylin.rest.servers", "localhost:7070"); - configB = KylinConfig.getKylinConfigFromInputStream(KylinConfig.getKylinPropertiesAsInputSteam()); + configB = KylinConfig.getKylinConfigFromInputStream(KylinConfig.getKylinPropertiesAsInputStream()); configB.setProperty("kylin.rest.servers", "localhost:7070"); configB.setMetadataUrl("../examples/test_metadata");
