From 5cc385eeaa806cf4e9f1d70f7ce5840fff7fd975 Mon Sep 17 00:00:00 2001
From: Jeff Zhang <zjffdu@apache.org>
Date: Fri, 2 Nov 2018 14:02:47 +0800
Subject: [PATCH] ZEPPELIN-3846. Code Completion is broken

---
 zeppelin-interpreter-api/pom.xml               | 18 ++----------------
 .../rest/ZeppelinSparkClusterTest.java         |  6 +++++-
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/zeppelin-interpreter-api/pom.xml b/zeppelin-interpreter-api/pom.xml
index 70170be1995..e4b800cc501 100644
--- a/zeppelin-interpreter-api/pom.xml
+++ b/zeppelin-interpreter-api/pom.xml
@@ -125,22 +125,8 @@
               </excludes>
             </relocation>
             <relocation>
-              <pattern>com</pattern>
-              <shadedPattern>${shaded.dependency.prefix}.com</shadedPattern>
-              <excludes>
-                <exclude>**/pom.xml</exclude>
-                <!-- Not the com/ packages that are a part of particular jdk implementations -->
-                <exclude>com/sun/tools/*</exclude>
-                <exclude>com/sun/javadoc/*</exclude>
-                <exclude>com/sun/security/*</exclude>
-                <exclude>com/sun/jndi/*</exclude>
-                <exclude>com/sun/management/*</exclude>
-                <exclude>com/sun/tools/**/*</exclude>
-                <exclude>com/sun/javadoc/**/*</exclude>
-                <exclude>com/sun/security/**/*</exclude>
-                <exclude>com/sun/jndi/**/*</exclude>
-                <exclude>com/sun/management/**/*</exclude>
-              </excludes>
+              <pattern>com.google</pattern>
+              <shadedPattern>${shaded.dependency.prefix}.com.google</shadedPattern>
             </relocation>
             <relocation>
               <pattern>io</pattern>
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java
index faa639f8e8a..7494df2bf5f 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java
@@ -20,6 +20,7 @@
 import static org.junit.Assert.assertTrue;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -64,7 +65,7 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
   //ci timeout.
   //TODO(zjffdu) remove this after we upgrade it to junit 4.13 (ZEPPELIN-3341)
   private static Set<String> verifiedSparkVersions = new HashSet<>();
-  
+
 
   private String sparkVersion;
   private AuthenticationInfo anonymous = new AuthenticationInfo("anonymous");
@@ -170,6 +171,9 @@ public void scalaOutputTest() throws IOException {
     assertEquals(Status.FINISHED, p.getStatus());
     assertEquals("2", p.getReturn().message().get(0).getData());
 
+    // test code completion
+    List<InterpreterCompletion> completions = note.completion(p.getId(), "sc.", 2);
+    assertTrue(completions.size() > 0);
     ZeppelinServer.notebook.removeNote(note.getId(), anonymous);
   }