change the logic of the 'by-owner' request (#1855)

* change the logic of the 'by-owner' request

* test extractAppIdFromRoleName

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/AppController.java

@@ -88,7 +88,7 @@ public class AppController {
     List<Role> userRoles = rolePermissionService.findUserRoles(owner);
 
     for (Role role : userRoles) {
-      String appId = RoleUtils.extractAppIdFromMasterRoleName(role.getRoleName());
+      String appId = RoleUtils.extractAppIdFromRoleName(role.getRoleName());
 
       if (appId != null) {
         appIds.add(appId);

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/util/RoleUtils.java

@@ -27,6 +27,17 @@ public class RoleUtils {
     return null;
   }
 
+  public static String extractAppIdFromRoleName(String roleName) {
+     Iterator<String> parts = STRING_SPLITTER.split(roleName).iterator();
+     if (parts.hasNext()) {
+       String roleType = parts.next();
+       if (RoleType.isValidRoleType(roleType) && parts.hasNext()) {
+         return parts.next();
+       }
+     }
+     return null;
+  }
+
   public static String buildAppRoleName(String appId, String roleType) {
     return STRING_JOINER.join(roleType, appId);
   }

apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/util/RoleUtilsTest.java

@@ -14,4 +14,11 @@ public class RoleUtilsTest {
 
     assertNull(RoleUtils.extractAppIdFromMasterRoleName("ReleaseNamespace+app1+application"));
   }
+
+  @Test
+  public void testExtractAppIdFromRoleName() throws Exception {
+    assertEquals("someApp", RoleUtils.extractAppIdFromRoleName("Master+someApp"));
+    assertEquals("someApp", RoleUtils.extractAppIdFromRoleName("ModifyNamespace+someApp+xx"));
+    assertEquals("app1", RoleUtils.extractAppIdFromRoleName("ReleaseNamespace+app1+application"));
+  }
 }