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

Merge pull request #12158 from jaymode/plugin_name_prefix 

remove elasticsearch- from name of official plugins
This commit is contained in:
Jay Modi 2015-07-09 11:26:17 -04:00
parent e4b355b790 3fd9f4b82e
commit ef4c255e37
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/main/java/org/elasticsearch/plugins/PluginManager.java
View File

@ -759,19 +759,15 @@ public class PluginManager {
} }
if (isOfficialPlugin(repo, user, version)) { if (isOfficialPlugin(repo, user, version)) {
return new PluginHandle(repo, Version.CURRENT.number(), null, repo); String endname = repo;
} if (repo.startsWith("elasticsearch-")) {
// remove elasticsearch- prefix
if (repo.startsWith("elasticsearch-")) { endname = repo.substring("elasticsearch-".length());
// remove elasticsearch- prefix } else if (name.startsWith("es-")) {
String endname = repo.substring("elasticsearch-".length()); // remove es- prefix
return new PluginHandle(endname, version, user, repo); endname = repo.substring("es-".length());
} }
return new PluginHandle(endname, Version.CURRENT.number(), null, repo);
if (name.startsWith("es-")) {
// remove es- prefix
String endname = repo.substring("es-".length());
return new PluginHandle(endname, version, user, repo);
} }
return new PluginHandle(repo, version, user, repo); return new PluginHandle(repo, version, user, repo);

12
core/src/test/java/org/elasticsearch/plugins/PluginManagerUnitTests.java
View File

@ -67,4 +67,16 @@ public class PluginManagerUnitTests extends ElasticsearchTestCase {
pluginName + "-" + Version.CURRENT.number() + ".zip"); pluginName + "-" + Version.CURRENT.number() + ".zip");
assertThat(handle.urls().get(0), is(expected)); assertThat(handle.urls().get(0), is(expected));
} }
@Test
public void testTrimmingElasticsearchFromPluginName() throws IOException {
String randomName = randomAsciiOfLength(10);
String pluginName = randomFrom("elasticsearch-", "es-") + randomName;
PluginManager.PluginHandle handle = PluginManager.PluginHandle.parse(pluginName);
assertThat(handle.name, is(randomName));
assertThat(handle.urls(), hasSize(1));
URL expected = new URL("http", "download.elastic.co", "/org.elasticsearch.plugins/" + pluginName + "/" +
pluginName + "-" + Version.CURRENT.number() + ".zip");
assertThat(handle.urls().get(0), is(expected));
}
} }