Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor: copyModule func

Browse source
This commit is contained in:
1ambda 2017-04-10 13:00:37 +09:00
parent c91a0338de
commit 3e29572132
2 changed files with 25 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumBundleFactory.java
View file

@ -400,7 +400,7 @@ public class HeliumBundleFactory {
prepareSource(pkg, moduleNameVersion, mainFileName);
// 4. install node and local modules for a bundle
copyFrameworkModuleToInstallPath(recopyLocalModule); // should copy local modules first
copyFrameworkModulesToInstallPath(recopyLocalModule); // should copy local modules first
installNodeModules(fpf);
// 5. let's bundle and update cache
@ -430,7 +430,23 @@ public class HeliumBundleFactory {
}
}
void copyFrameworkModuleToInstallPath(boolean recopy)
void copyFrameworkModule(boolean recopy, FileFilter filter,
File src, File dest) throws IOException {
if (src != null) {
if (recopy && dest.exists()) {
FileUtils.deleteDirectory(dest);
}
if (!dest.exists()) {
FileUtils.copyDirectory(
src,
dest,
filter);
}
}
}
void copyFrameworkModulesToInstallPath(boolean recopy)
throws IOException {
FileFilter npmPackageCopyFilter = new FileFilter() {
@ -450,50 +466,20 @@ public class HeliumBundleFactory {
File tabledataModuleInstallPath = new File(heliumLocalModuleDirectory,
"zeppelin-tabledata");
if (tabledataModulePath != null) {
if (recopy && tabledataModuleInstallPath.exists()) {
FileUtils.deleteDirectory(tabledataModuleInstallPath);
}
if (!tabledataModuleInstallPath.exists()) {
FileUtils.copyDirectory(
tabledataModulePath,
tabledataModuleInstallPath,
npmPackageCopyFilter);
}
}
copyFrameworkModule(recopy, npmPackageCopyFilter,
tabledataModulePath, tabledataModuleInstallPath);
// install visualization module
File visModuleInstallPath = new File(heliumLocalModuleDirectory,
"zeppelin-vis");
if (visualizationModulePath != null) {
if (recopy && visModuleInstallPath.exists()) {
FileUtils.deleteDirectory(visModuleInstallPath);
}
if (!visModuleInstallPath.exists()) {
FileUtils.copyDirectory(
visualizationModulePath,
visModuleInstallPath,
npmPackageCopyFilter);
}
}
copyFrameworkModule(recopy, npmPackageCopyFilter,
visualizationModulePath, visModuleInstallPath);
// install spell module
File spellModuleInstallPath = new File(heliumLocalModuleDirectory,
"zeppelin-spell");
if (spellModulePath != null) {
if (recopy && spellModuleInstallPath.exists()) {
FileUtils.deleteDirectory(spellModuleInstallPath);
}
if (!spellModuleInstallPath.exists()) {
FileUtils.copyDirectory(
spellModulePath,
spellModuleInstallPath,
npmPackageCopyFilter);
}
}
copyFrameworkModule(recopy, npmPackageCopyFilter,
spellModulePath, spellModuleInstallPath);
}
private WebpackResult getWebpackResultFromOutput(String output) {

2
zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumBundleFactoryTest.java
View file

@ -66,7 +66,7 @@ public class HeliumBundleFactoryTest {
new File(moduleDir, "visualization"),
new File(moduleDir, "spell"));
hbf.installNodeAndNpm();
hbf.copyFrameworkModuleToInstallPath(true);
hbf.copyFrameworkModulesToInstallPath(true);
}
@After