-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1566 from metamx/fixConvertProps
Backport of various fixes for Property Conversion to 0.7.x
- Loading branch information
Showing
11 changed files
with
367 additions
and
116 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 82 additions & 0 deletions
82
processing/src/test/java/io/druid/guice/MetadataStorageTablesConfigTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /* | ||
| * Licensed to Metamarkets Group Inc. (Metamarkets) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. Metamarkets licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package io.druid.guice; | ||
|
|
||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import com.google.inject.Binder; | ||
| import com.google.inject.Guice; | ||
| import com.google.inject.Injector; | ||
| import com.google.inject.Module; | ||
| import com.google.inject.Provides; | ||
| import io.druid.jackson.DefaultObjectMapper; | ||
| import io.druid.metadata.MetadataStorageTablesConfig; | ||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.Properties; | ||
|
|
||
| public class MetadataStorageTablesConfigTest | ||
| { | ||
| @Test | ||
| public void testSerdeMetadataStorageTablesConfig() throws Exception | ||
| { | ||
| Injector injector = Guice.createInjector( | ||
| new Module() | ||
| { | ||
| @Override | ||
| public void configure(Binder binder) | ||
| { | ||
| binder.install(new PropertiesModule(Arrays.asList("test.runtime.properties"))); | ||
| binder.install(new ConfigModule()); | ||
| binder.install(new DruidGuiceExtensions()); | ||
| JsonConfigProvider.bind(binder, "druid.metadata.storage.tables", MetadataStorageTablesConfig.class); | ||
| } | ||
|
|
||
| @Provides | ||
| @LazySingleton | ||
| public ObjectMapper jsonMapper() | ||
| { | ||
| return new DefaultObjectMapper(); | ||
| } | ||
| } | ||
| ); | ||
|
|
||
| Properties props = injector.getInstance(Properties.class); | ||
| MetadataStorageTablesConfig config = injector.getInstance(MetadataStorageTablesConfig.class); | ||
|
|
||
| Assert.assertEquals(props.getProperty("druid.metadata.storage.tables.base"), config.getBase()); | ||
| Assert.assertEquals(props.getProperty("druid.metadata.storage.tables.segments"), config.getSegmentsTable()); | ||
| Assert.assertEquals(props.getProperty("druid.metadata.storage.tables.rules"), config.getRulesTable()); | ||
| Assert.assertEquals(props.getProperty("druid.metadata.storage.tables.config"), config.getConfigTable()); | ||
| Assert.assertEquals( | ||
| props.getProperty("druid.metadata.storage.tables.tasks"), | ||
| config.getEntryTable(MetadataStorageTablesConfig.TASK_ENTRY_TYPE) | ||
| ); | ||
| Assert.assertEquals( | ||
| props.getProperty("druid.metadata.storage.tables.taskLog"), | ||
| config.getLogTable(MetadataStorageTablesConfig.TASK_ENTRY_TYPE) | ||
| ); | ||
| Assert.assertEquals( | ||
| props.getProperty("druid.metadata.storage.tables.taskLock"), | ||
| config.getLockTable(MetadataStorageTablesConfig.TASK_ENTRY_TYPE) | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| druid.metadata.storage.tables.base=druid | ||
| druid.metadata.storage.tables.segments=aaa_segments | ||
| druid.metadata.storage.tables.rules=bbb_rules | ||
| druid.metadata.storage.tables.config=ccc_config | ||
| druid.metadata.storage.tables.tasks=ddd_tasks | ||
| druid.metadata.storage.tables.taskLog=eee_tasklog | ||
| druid.metadata.storage.tables.taskLock=fff_tasklock | ||
| druid.metadata.storage.tables.audit=ggg_audit |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.