[zeppelin] branch master updated: [ZEPPELIN-5198] Remove PrincipalImpl, which is not part of the java API

[pdallig]

This is an automated email from the ASF dual-hosted git repository.

pdallig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new 162807b  [ZEPPELIN-5198] Remove PrincipalImpl, which is not part of 
the java API
162807b is described below

commit 162807bf8f546d00a65894db2c920cd7916f3264
Author: Philipp Dallig <philipp.dal...@gmail.com>
AuthorDate: Mon Jan 11 15:59:27 2021 +0100

    [ZEPPELIN-5198] Remove PrincipalImpl, which is not part of the java API
    
    ### What is this PR for?
    This PR includes
     - remove PrincipalImpl out of ShiroAuthenticationServiceTest.java
    
    ### What type of PR is it?
     - Refactoring
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/ZEPPELIN-5198
    
    ### Questions:
    * Does the licenses files need update? No
    * Is there breaking changes for older versions? No
    * Does this needs documentation? No
    
    Author: Philipp Dallig <philipp.dal...@gmail.com>
    
    Closes #4021 from Reamer/principalimpl and squashes the following commits:
    
    dfd5a1d5c [Philipp Dallig] Remove PrincipalImpl, which is not part of the 
java API
---
 .../service/ShiroAuthenticationServiceTest.java       | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git 
a/zeppelin-server/src/test/java/org/apache/zeppelin/service/ShiroAuthenticationServiceTest.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/service/ShiroAuthenticationServiceTest.java
index 00bf16f..ed9e3d8 100644
--- 
a/zeppelin-server/src/test/java/org/apache/zeppelin/service/ShiroAuthenticationServiceTest.java
+++ 
b/zeppelin-server/src/test/java/org/apache/zeppelin/service/ShiroAuthenticationServiceTest.java
@@ -24,6 +24,7 @@ import static org.mockito.Mockito.when;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
+import java.security.Principal;
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.zeppelin.conf.ZeppelinConfiguration;
@@ -36,7 +37,6 @@ import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
-import sun.security.acl.PrincipalImpl;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest(org.apache.shiro.SecurityUtils.class)
@@ -75,7 +75,7 @@ public class ShiroAuthenticationServiceTest {
     PowerMockito.mockStatic(org.apache.shiro.SecurityUtils.class);
     when(org.apache.shiro.SecurityUtils.getSubject()).thenReturn(subject);
     when(subject.isAuthenticated()).thenReturn(true);
-    when(subject.getPrincipal()).thenReturn(new PrincipalImpl(expectedName));
+    when(subject.getPrincipal()).thenReturn(new TestPrincipal(expectedName));
 
     Notebook notebook = Mockito.mock(Notebook.class);
     try {
@@ -94,6 +94,21 @@ public class ShiroAuthenticationServiceTest {
     modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
     field.set(null, newValue);
   }
+  public class TestPrincipal implements Principal {
 
+    private String username;
 
+    public TestPrincipal(String username) {
+      this.username = username;
+    }
+
+    public String getUsername() {
+      return username;
+    }
+
+    @Override
+    public String getName() {
+      return String.valueOf(username);
+    }
+  }
 }