Repository: zeppelin Updated Branches: refs/heads/master 6d0863e1a -> 0d746fa2e
Revert "[MINOR] Add `fmt:check` to check style" This reverts commit 1fc210f313ffbc20d7991b75e8cb88769ec5b04e. Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/dad1e8cd Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/dad1e8cd Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/dad1e8cd Branch: refs/heads/master Commit: dad1e8cd5dcfd6d96f41ba96840eda40fa799a82 Parents: c2b34b6 Author: Jongyoul Lee <[email protected]> Authored: Wed Aug 29 19:05:48 2018 +0900 Committer: Jongyoul Lee <[email protected]> Committed: Wed Aug 29 19:05:48 2018 +0900 ---------------------------------------------------------------------- .travis.yml | 7 -- pom.xml | 1 + .../org/apache/zeppelin/rinterpreter/KnitR.java | 19 ++--- .../org/apache/zeppelin/rinterpreter/RRepl.java | 19 ++--- .../apache/zeppelin/rinterpreter/RStatics.java | 7 +- testing/travis_settings.xml | 85 -------------------- 6 files changed, 25 insertions(+), 113 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/dad1e8cd/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 74201c9..6f7f6b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,11 +50,6 @@ matrix: dist: trusty env: BUILD_PLUGINS="false" SCALA_VER="2.11" PROFILE="-Prat" BUILD_FLAG="clean" TEST_FLAG="org.apache.rat:apache-rat-plugin:check" TEST_PROJECTS="" - # Check style fast - - jdk: "oraclejdk8" - dist: trusty - env: BUILD_PLUGINS="true" SCALA_VER="2.11" PROFILE="-Pr,integration,examples" BUILD_FLAG="clean" TEST_FLAG="fmt:check" TEST_PROJECTS="" - # Run e2e tests (in zeppelin-web) # chrome dropped the support for precise (ubuntu 12.04), so need to use trusty # also, can't use JDK 7 in trusty: https://github.com/travis-ci/travis-ci/issues/7884 @@ -126,8 +121,6 @@ matrix: env: BUILD_PLUGINS="false" PYTHON="3" SPARK_VER="2.2.0" HADOOP_VER="2.6" LIVY_VER="0.5.0-incubating" PROFILE="" BUILD_FLAG="install -am -DskipTests -DskipRat" TEST_FLAG="verify -DskipRat" MODULES="-pl livy" TEST_PROJECTS="" before_install: - - cp ./testing/travis_settings.xml $HOME/.m2/settings.xml - - cat $HOME/.m2/settings.xml # check files included in commit range, clear bower_components if a bower.json file has changed. # bower cache clearing can also be forced by putting "bower clear" or "clear bower" in a commit message - changedfiles=$(git diff --name-only $TRAVIS_COMMIT_RANGE 2>/dev/null) || changedfiles="" http://git-wip-us.apache.org/repos/asf/zeppelin/blob/dad1e8cd/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 319d669..a9d3cc0 100644 --- a/pom.xml +++ b/pom.xml @@ -1070,4 +1070,5 @@ </build> </profile> </profiles> + </project> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/dad1e8cd/r/src/main/java/org/apache/zeppelin/rinterpreter/KnitR.java ---------------------------------------------------------------------- diff --git a/r/src/main/java/org/apache/zeppelin/rinterpreter/KnitR.java b/r/src/main/java/org/apache/zeppelin/rinterpreter/KnitR.java index 1bcfbb3..ab29efe 100644 --- a/r/src/main/java/org/apache/zeppelin/rinterpreter/KnitR.java +++ b/r/src/main/java/org/apache/zeppelin/rinterpreter/KnitR.java @@ -17,17 +17,19 @@ package org.apache.zeppelin.rinterpreter; -import java.net.URL; -import java.util.List; -import java.util.Properties; import org.apache.zeppelin.interpreter.*; import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion; import org.apache.zeppelin.scheduler.Scheduler; +import java.net.URL; +import java.util.List; +import java.util.Properties; + /** - * KnitR is a simple wrapper around KnitRInterpreter to handle that Zeppelin prefers to load - * interpreters through classes defined in Java with static methods that run when the class is - * loaded. + * KnitR is a simple wrapper around KnitRInterpreter to handle that Zeppelin prefers + * to load interpreters through classes defined in Java with static methods that run + * when the class is loaded. + * */ public class KnitR extends Interpreter implements WrappedInterpreter { KnitRInterpreter intp; @@ -36,7 +38,6 @@ public class KnitR extends Interpreter implements WrappedInterpreter { super(properties); intp = new KnitRInterpreter(properties, startSpark); } - public KnitR(Properties properties) { this(properties, true); } @@ -77,8 +78,8 @@ public class KnitR extends Interpreter implements WrappedInterpreter { } @Override - public List<InterpreterCompletion> completion( - String s, int i, InterpreterContext interpreterContext) throws InterpreterException { + public List<InterpreterCompletion> completion(String s, int i, + InterpreterContext interpreterContext) throws InterpreterException { List completion = intp.completion(s, i, interpreterContext); return completion; } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/dad1e8cd/r/src/main/java/org/apache/zeppelin/rinterpreter/RRepl.java ---------------------------------------------------------------------- diff --git a/r/src/main/java/org/apache/zeppelin/rinterpreter/RRepl.java b/r/src/main/java/org/apache/zeppelin/rinterpreter/RRepl.java index 7588b21..bdf7dae 100644 --- a/r/src/main/java/org/apache/zeppelin/rinterpreter/RRepl.java +++ b/r/src/main/java/org/apache/zeppelin/rinterpreter/RRepl.java @@ -17,17 +17,19 @@ package org.apache.zeppelin.rinterpreter; -import java.net.URL; -import java.util.List; -import java.util.Properties; import org.apache.zeppelin.interpreter.*; import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion; import org.apache.zeppelin.scheduler.Scheduler; +import java.net.URL; +import java.util.List; +import java.util.Properties; + /** - * RRepl is a simple wrapper around RReplInterpreter to handle that Zeppelin prefers to load - * interpreters through classes defined in Java with static methods that run when the class is - * loaded. + * RRepl is a simple wrapper around RReplInterpreter to handle that Zeppelin prefers + * to load interpreters through classes defined in Java with static methods that run + * when the class is loaded. + * */ public class RRepl extends Interpreter implements WrappedInterpreter { RReplInterpreter intp; @@ -36,7 +38,6 @@ public class RRepl extends Interpreter implements WrappedInterpreter { super(properties); intp = new RReplInterpreter(properties, startSpark); } - public RRepl(Properties properties) { this(properties, true); } @@ -77,8 +78,8 @@ public class RRepl extends Interpreter implements WrappedInterpreter { } @Override - public List<InterpreterCompletion> completion( - String s, int i, InterpreterContext interpreterContext) throws InterpreterException { + public List<InterpreterCompletion> completion(String s, int i, + InterpreterContext interpreterContext) throws InterpreterException { List completion = intp.completion(s, i, interpreterContext); return completion; } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/dad1e8cd/r/src/main/java/org/apache/zeppelin/rinterpreter/RStatics.java ---------------------------------------------------------------------- diff --git a/r/src/main/java/org/apache/zeppelin/rinterpreter/RStatics.java b/r/src/main/java/org/apache/zeppelin/rinterpreter/RStatics.java index 3f2370d..1ea35ce 100644 --- a/r/src/main/java/org/apache/zeppelin/rinterpreter/RStatics.java +++ b/r/src/main/java/org/apache/zeppelin/rinterpreter/RStatics.java @@ -27,7 +27,10 @@ import org.apache.spark.api.java.JavaSparkContext; import org.apache.spark.sql.SQLContext; import org.apache.zeppelin.spark.SparkZeppelinContext; -/** RStatics provides static class methods that can be accessed through the SparkR bridge */ +/** + * RStatics provides static class methods that can be accessed through the SparkR bridge + * + */ public class RStatics { private static SparkContext sc = null; private static SparkZeppelinContext z = null; @@ -72,12 +75,10 @@ public class RStatics { public static RContext getRCon() { return rCon; } - public static RContext setrCon(RContext newrCon) { rCon = newrCon; return rCon; } - public static Boolean testRDD(String name) { Object x = z.get(name); return (x instanceof org.apache.spark.api.java.JavaRDD); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/dad1e8cd/testing/travis_settings.xml ---------------------------------------------------------------------- diff --git a/testing/travis_settings.xml b/testing/travis_settings.xml deleted file mode 100644 index ba7606b..0000000 --- a/testing/travis_settings.xml +++ /dev/null @@ -1,85 +0,0 @@ -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF 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. - --> - -<settings> - <profiles> - <profile> - <id>standard-with-extra-repos</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <repositories> - <repository> - <id>central</id> - <name>Central Repository</name> - <url>http://repo.maven.apache.org/maven2</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>sonatype</id> - <name>OSS Sonatype repo (releases)</name> - <releases> - <enabled>true</enabled> - <updatePolicy>always</updatePolicy> - <checksumPolicy>warn</checksumPolicy> - </releases> - <snapshots> - <enabled>false</enabled> - <updatePolicy>never</updatePolicy> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <url>https://oss.sonatype.org/content/repositories/releases/</url> - </repository> - <repository> - <id>sonatype-apache</id> - <name>Apache repo (releases)</name> - <releases> - <enabled>true</enabled> - <updatePolicy>always</updatePolicy> - <checksumPolicy>warn</checksumPolicy> - </releases> - <snapshots> - <enabled>false</enabled> - <updatePolicy>never</updatePolicy> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <url>https://repository.apache.org/releases/</url> - </repository> - <repository> - <id>apache-snapshots</id> - <name>ASF repo (snapshots)</name> - <releases> - <enabled>false</enabled> - <updatePolicy>never</updatePolicy> - <checksumPolicy>warn</checksumPolicy> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>always</updatePolicy> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <url>https://repository.apache.org/snapshots/</url> - </repository> - </repositories> - </profile> - </profiles> -</settings> \ No newline at end of file
