refactor model

model/api/src/main/java/org/keycloak/models/ApplicationModel.java

@@ -7,13 +7,9 @@ import java.util.Set;
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
  * @version $Revision: 1 $
  */
-public interface ApplicationModel extends RoleContainerModel, ClaimRequesterModel {
+public interface ApplicationModel extends RoleContainerModel, ClientModel {
     void updateApplication();
 
-    UserModel getApplicationUser();
-
-    String getId();
-
     String getName();
 
     void setName(String name);

model/api/src/main/java/org/keycloak/models/ClientModel.java

@@ -4,8 +4,12 @@ package org.keycloak.models;
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
  * @version $Revision: 1 $
  */
-public interface ClaimRequesterModel {
+public interface ClientModel {
     long getAllowedClaimsMask();
 
     void setAllowedClaimsMask(long mask);
+
+    UserModel getAgent();
+
+    String getId();
 }

model/api/src/main/java/org/keycloak/models/OAuthClientModel.java

@@ -4,9 +4,6 @@ package org.keycloak.models;
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
  * @version $Revision: 1 $
  */
-public interface OAuthClientModel extends ClaimRequesterModel {
-    String getId();
-
-    UserModel getOAuthAgent();
+public interface OAuthClientModel extends ClientModel {
 
 }