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

[ZEPPELIN-2699] More corrections

Browse source
This commit is contained in:
Nelson Costa 2017-07-10 17:08:58 +01:00
parent c823021868
commit 45b77513a6
8 changed files with 14 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
zeppelin-interpreter/src/test/java/org/apache/zeppelin/helium/HeliumPackageTest.java
View file

@ -17,7 +17,6 @@
package org.apache.zeppelin.helium;
import com.google.gson.Gson;
import org.junit.Test;
import java.util.Map;
@ -26,8 +25,6 @@ import static org.junit.Assert.*;
public class HeliumPackageTest {
private Gson gson = new Gson();
@Test
public void parseSpellPackageInfo() {
String examplePackage = "{\n" +

25
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/Helium.java
View file

@ -46,7 +46,7 @@ public class Helium {
private final HeliumBundleFactory bundleFactory;
private final HeliumApplicationFactory applicationFactory;
private Map<String, List<HeliumPackageSearchResult>> allPackages = new HashMap<>();
Map<String, List<HeliumPackageSearchResult>> allPackages = new HashMap<>();
public Helium(
String heliumConfPath,
@ -137,13 +137,11 @@ public class Helium {
}
private void clearNotExistsPackages() {
Map<String, List<HeliumPackageSearchResult>> all = getAllPackageInfoWithoutRefresh();
// clear visualization display order
List<String> packageOrder = heliumConf.getBundleDisplayOrder();
List<String> clearedOrder = new LinkedList<>();
for (String pkgName : packageOrder) {
if (all.containsKey(pkgName)) {
if (allPackages.containsKey(pkgName)) {
clearedOrder.add(pkgName);
}
}
@ -152,16 +150,12 @@ public class Helium {
// clear enabled package
Map<String, String> enabledPackages = heliumConf.getEnabledPackages();
for (String pkgName : enabledPackages.keySet()) {
if (!all.containsKey(pkgName)) {
if (!allPackages.containsKey(pkgName)) {
heliumConf.disablePackage(pkgName);
}
}
}
public Map<String, List<HeliumPackageSearchResult>> getAllPackageInfoWithoutRefresh() {
return getAllPackageInfo(false, null);
}
public Map<String, List<HeliumPackageSearchResult>> getAllPackageInfo() {
return getAllPackageInfo(true, null);
}
@ -231,18 +225,17 @@ public class Helium {
}
public List<HeliumPackageSearchResult> getAllEnabledPackages() {
Map<String, List<HeliumPackageSearchResult>> allPackages = getAllPackageInfoWithoutRefresh();
Map<String, String> enabledInfo = heliumConf.getEnabledPackages();
List<HeliumPackageSearchResult> enabledPackages = new ArrayList<>();
for (List<HeliumPackageSearchResult> versionedPackages : allPackages.values()) {
for (HeliumPackageSearchResult psr : versionedPackages) {
if (psr.isEnabled()) {
if (enabledInfo.containsKey(psr.getPkg().getName())) {
enabledPackages.add(psr);
break;
}
}
}
return enabledPackages;
}
@ -256,8 +249,7 @@ public class Helium {
}
private HeliumPackageSearchResult getEnabledPackageInfo(String packageName) {
Map<String, List<HeliumPackageSearchResult>> infos = getAllPackageInfoWithoutRefresh();
List<HeliumPackageSearchResult> packages = infos.get(packageName);
List<HeliumPackageSearchResult> packages = allPackages.get(packageName);
for (HeliumPackageSearchResult pkgSearchResult : packages) {
if (pkgSearchResult.isEnabled()) {
@ -269,7 +261,7 @@ public class Helium {
}
private HeliumPackageSearchResult getPackageInfo(String pkgName, String artifact) {
Map<String, List<HeliumPackageSearchResult>> infos = getAllPackageInfo(true, pkgName);
Map<String, List<HeliumPackageSearchResult>> infos = getAllPackageInfo(false, pkgName);
List<HeliumPackageSearchResult> packages = infos.get(pkgName);
if (StringUtils.isBlank(artifact)) {
return packages.get(0); /** return the FIRST package */
@ -372,7 +364,7 @@ public class Helium {
allResources = ResourcePoolUtils.getAllResources();
}
for (List<HeliumPackageSearchResult> pkgs : getAllPackageInfoWithoutRefresh().values()) {
for (List<HeliumPackageSearchResult> pkgs : allPackages.values()) {
for (HeliumPackageSearchResult pkg : pkgs) {
if (pkg.getPkg().getType() == HeliumType.APPLICATION && pkg.isEnabled()) {
ResourceSet resources = ApplicationLoader.findRequiredResourceSet(
@ -400,7 +392,6 @@ public class Helium {
* @return ordered list of enabled buildBundle package
*/
public List<HeliumPackage> getBundlePackagesToBundle() {
Map<String, List<HeliumPackageSearchResult>> allPackages = getAllPackageInfoWithoutRefresh();
List<String> visOrder = heliumConf.getBundleDisplayOrder();
List<HeliumPackage> orderedBundlePackages = new LinkedList<>();

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

@ -402,7 +402,7 @@ public class HeliumBundleFactory {
String[] moduleNameVersion = getNpmModuleNameAndVersion(pkg);
if (moduleNameVersion == null) {
logger.error("Can't get module name and version of package " + pkg.getName());
logger.warn("Can't get module name and version of package " + pkg.getName());
return null;
}

4
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumConf.java
View file

@ -47,10 +47,6 @@ public class HeliumConf implements JsonSerializable {
return new HashMap<>(enabled);
}
public void enablePackage(HeliumPackage pkg) {
enablePackage(pkg.getName(), pkg.getArtifact());
}
public void enablePackage(String name, String artifact) {
enabled.put(name, artifact);
}

3
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumLocalRegistry.java
View file

@ -25,7 +25,6 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.io.StringReader;
import java.net.URI;
import java.util.LinkedList;
import java.util.List;
@ -33,7 +32,7 @@ import java.util.List;
* Simple Helium registry on local filesystem
*/
public class HeliumLocalRegistry extends HeliumRegistry {
Logger logger = LoggerFactory.getLogger(HeliumLocalRegistry.class);
private Logger logger = LoggerFactory.getLogger(HeliumLocalRegistry.class);
private final Gson gson;

2
zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumOnlineRegistry.java
View file

@ -51,7 +51,7 @@ import java.util.UUID;
* ]
*/
public class HeliumOnlineRegistry extends HeliumRegistry {
Logger logger = LoggerFactory.getLogger(HeliumOnlineRegistry.class);
private Logger logger = LoggerFactory.getLogger(HeliumOnlineRegistry.class);
private final Gson gson;
private final File registryCacheFile;

5
zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumTest.java
View file

@ -101,7 +101,6 @@ public class HeliumTest {
assertEquals(2, helium.getAllPackageInfo().size());
}
@Test
public void testRefresh() throws IOException, URISyntaxException, TaskRunnerException {
File heliumConf = new File(tmpDir, "helium.conf");
@ -122,7 +121,7 @@ public class HeliumTest {
""));
// then
assertEquals(1, helium.getAllPackageInfoWithoutRefresh().size());
assertEquals(1, helium.getAllPackageInfo().size());
// when
registry1.add(new HeliumPackage(
@ -136,7 +135,7 @@ public class HeliumTest {
""));
// then
assertEquals(1, helium.getAllPackageInfoWithoutRefresh().size());
assertEquals(1, helium.allPackages.size());
assertEquals(2, helium.getAllPackageInfo(true, null).size());
}
}

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

@ -22,7 +22,7 @@ import java.io.IOException;
import java.util.concurrent.atomic.AtomicInteger;
public class HeliumTestApplication extends Application {
AtomicInteger numRun = new AtomicInteger(0);
private AtomicInteger numRun = new AtomicInteger(0);
public HeliumTestApplication(ApplicationContext context) {
super(context);
}