honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for non-elasticsearch namespaces to ImmutableSettings.getAsClass method

This commit is contained in:
Igor Motov 2011-09-26 15:30:06 -04:00 committed by Shay Banon
parent c5835cac04
commit d611182dbf
4 changed files with 123 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/elasticsearch/src/main/java/org/elasticsearch/common/settings/ImmutableSettings.java
View File

@ -213,15 +213,21 @@ public class ImmutableSettings implements Settings {
try {
return (Class<? extends T>) getClassLoader().loadClass(fullClassName);
} catch (ClassNotFoundException e) {
fullClassName = prefixPackage + Strings.capitalize(toCamelCase(sValue)) + suffixClassName;
String prefixValue = prefixPackage;
int packageSeparator = sValue.lastIndexOf('.');
if (packageSeparator > 0) {
prefixValue = sValue.substring(0, packageSeparator + 1);
sValue = sValue.substring(packageSeparator + 1);
}
fullClassName = prefixValue + Strings.capitalize(toCamelCase(sValue)) + suffixClassName;
try {
return (Class<? extends T>) getClassLoader().loadClass(fullClassName);
} catch (ClassNotFoundException e1) {
fullClassName = prefixPackage + toCamelCase(sValue).toLowerCase() + "." + Strings.capitalize(toCamelCase(sValue)) + suffixClassName;
fullClassName = prefixValue + toCamelCase(sValue).toLowerCase() + "." + Strings.capitalize(toCamelCase(sValue)) + suffixClassName;
try {
return (Class<? extends T>) getClassLoader().loadClass(fullClassName);
} catch (ClassNotFoundException e2) {
throw new NoClassSettingsException("Failed to load class setting [" + setting + "] with value [" + sValue + "]", e);
throw new NoClassSettingsException("Failed to load class setting [" + setting + "] with value [" + get(setting) + "]", e);
}
}
}

62
modules/elasticsearch/src/test/java/org/elasticsearch/common/settings/ImmutableSettingsTests.java Normal file
View File

@ -0,0 +1,62 @@
/*
* Licensed to Elastic Search and Shay Banon under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. Elastic Search 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 org.elasticsearch.common.settings;
import org.elasticsearch.common.settings.foo.FooTest;
import org.testng.annotations.Test;
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.Matchers.*;
/**
* @author imotov
*/
public class ImmutableSettingsTests {
@Test public void testGetAsClass() {
Settings settings = settingsBuilder()
.put("test.class", "bar")
.put("test.class.package", "org.elasticsearch.common.settings.bar")
.build();
// Assert that defaultClazz is loaded if setting is not specified
assertThat(settings.getAsClass("no.settings", FooTest.class, "org.elasticsearch.common.settings.", "Test").getName(),
equalTo("org.elasticsearch.common.settings.foo.FooTest"));
// Assert that correct class is loaded if setting contain name without package
assertThat(settings.getAsClass("test.class", FooTest.class, "org.elasticsearch.common.settings.", "Test").getName(),
equalTo("org.elasticsearch.common.settings.bar.BarTest"));
// Assert that class cannot be loaded if wrong packagePrefix is specified
try {
settings.getAsClass("test.class", FooTest.class, "com.example.elasticsearch.common.settings.", "Test");
assertThat("Class with wrong package name shouldn't be loaded", false);
} catch (NoClassSettingsException ex) {
// Ignore
}
// Assert that package name in settings is getting correctly applied
assertThat(settings.getAsClass("test.class.package", FooTest.class, "com.example.elasticsearch.common.settings.", "Test").getName(),
equalTo("org.elasticsearch.common.settings.bar.BarTest"));
}
}

26
modules/elasticsearch/src/test/java/org/elasticsearch/common/settings/bar/BarTest.java Normal file
View File

@ -0,0 +1,26 @@
/*
* Licensed to Elastic Search and Shay Banon under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. Elastic Search 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 org.elasticsearch.common.settings.bar;
/**
* @author imotov
*/
public class BarTest {
}

26
modules/elasticsearch/src/test/java/org/elasticsearch/common/settings/foo/FooTest.java Normal file
View File

@ -0,0 +1,26 @@
/*
* Licensed to Elastic Search and Shay Banon under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. Elastic Search 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 org.elasticsearch.common.settings.foo;
/**
* @author imotov
*/
public class FooTest {
}