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-2152] Fixed format issues

Browse source
This commit is contained in:
Nelson Costa 2017-05-24 10:38:55 +01:00
parent f55e6e2632
commit 5e29cca41b
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -164,7 +164,7 @@ public class HeliumBundleFactory {
System.getenv("HTTPS_PROXY") : System.getenv("https_proxy");
try {
if(isSecure)
if (isSecure)
proxies.add(generateProxy("secure", new URI(httpsProxy)));
else proxies.add(generateProxy("insecure", new URI(httpProxy)));
} catch (Exception ex) {
@ -662,7 +662,8 @@ public class HeliumBundleFactory {
}
private void npmCommand(String args, Map<String, String> env) throws TaskRunnerException {
NpmRunner npm = frontEndPluginFactory.getNpmRunner(getProxyConfig(isSecure(defaultNpmRegistryUrl)), defaultNpmRegistryUrl);
NpmRunner npm = frontEndPluginFactory.getNpmRunner(
getProxyConfig(isSecure(defaultNpmRegistryUrl)), defaultNpmRegistryUrl);
npm.execute(args, env);
}
@ -676,7 +677,8 @@ public class HeliumBundleFactory {
private void yarnCommand(FrontendPluginFactory fpf,
String args, Map<String, String> env) throws TaskRunnerException {
YarnRunner yarn = fpf.getYarnRunner(getProxyConfig(isSecure(defaultNpmRegistryUrl)), defaultNpmRegistryUrl);
YarnRunner yarn = fpf.getYarnRunner(
getProxyConfig(isSecure(defaultNpmRegistryUrl)), defaultNpmRegistryUrl);
yarn.execute(args, env);
}

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

@ -119,7 +119,7 @@ public class HeliumOnlineRegistry extends HeliumRegistry {
try {
String scheme = new URI(uri).getScheme();
if(scheme.toLowerCase().startsWith("https")) {
if (scheme.toLowerCase().startsWith("https")) {
URI httpsProxyUri = new URI(httpsProxy);
return new HttpHost(httpsProxyUri.getHost(),
httpsProxyUri.getPort(), httpsProxyUri.getScheme());