mybatis-jpa-extra update

2.2

maxkey-core/src/main/java/org/maxkey/domain/Accounts.java

@@ -19,6 +19,7 @@ package org.maxkey.domain;
 
 import java.io.Serializable;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -35,7 +36,7 @@ import org.hibernate.validator.constraints.Length;
    STATUS	            char(1)                        null
    constraint PK_ROLES primary key clustered (ID)
  */
-
+@Entity
 @Table(name = "MXK_ACCOUNTS")
 public class Accounts extends JpaBaseDomain implements Serializable {
     private static final long serialVersionUID = 6829592256223630307L;

maxkey-core/src/main/java/org/maxkey/domain/GroupMember.java

@@ -20,6 +20,7 @@ package org.maxkey.domain;
 import java.io.Serializable;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -32,6 +33,7 @@ import javax.persistence.Table;
    UID	                varchar(40)	                   null
    constraint PK_ROLES primary key clustered (ID)
  */
+@Entity
 @Table(name = "MXK_GROUP_MEMBER")  
 public class GroupMember extends UserInfo implements Serializable{
 

maxkey-core/src/main/java/org/maxkey/domain/GroupPrivileges.java

@@ -20,6 +20,7 @@ package org.maxkey.domain;
 import java.io.Serializable;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -34,6 +35,7 @@ import org.maxkey.domain.apps.Apps;
    MENUID                varchar(40)	                   null
    constraint PK_ROLES primary key clustered (ID)
  */
+@Entity
 @Table(name = "MXK_GROUP_PRIVILEGES")  
 public class GroupPrivileges extends Apps implements Serializable{
 

maxkey-core/src/main/java/org/maxkey/domain/Groups.java

@@ -19,13 +19,14 @@ package org.maxkey.domain;
 
 import java.io.Serializable;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
 import org.hibernate.validator.constraints.Length;
-
+@Entity
 @Table(name = "MXK_GROUPS")
 public class Groups extends JpaBaseDomain implements Serializable {
 

maxkey-core/src/main/java/org/maxkey/domain/HistoryLogin.java

@@ -20,6 +20,7 @@ package org.maxkey.domain;
 import java.io.Serializable;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -32,6 +33,7 @@ import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
  * @author Crystal.Sea
  *
  */
+@Entity
 @Table(name = "MXK_HISTORY_LOGIN")  
 public class HistoryLogin  extends JpaBaseDomain  implements Serializable{
 	

maxkey-core/src/main/java/org/maxkey/domain/HistoryLoginApps.java

@@ -18,6 +18,7 @@
 package org.maxkey.domain;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -29,7 +30,7 @@ import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
  * @author Crystal.Sea
  *
  */
-
+@Entity
 @Table(name = "MXK_HISTORY_LOGIN_APPS")  
 public class HistoryLoginApps extends JpaBaseDomain {
 	

maxkey-core/src/main/java/org/maxkey/domain/HistoryLogs.java

@@ -19,6 +19,7 @@ package org.maxkey.domain;
 
 import java.io.Serializable;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -30,6 +31,7 @@ import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
  * @author Crystal.Sea
  * 
  */
+@Entity
 @Table(name = "MXK_HISTORY_LOGS")
 public class HistoryLogs extends JpaBaseDomain implements Serializable {
     private static final long serialVersionUID = 6560201093784960493L;

maxkey-core/src/main/java/org/maxkey/domain/Organizations.java

@@ -19,12 +19,13 @@ package org.maxkey.domain;
 
 import java.io.Serializable;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
-
+@Entity
 @Table(name = "MXK_ORGANIZATIONS")
 public class Organizations extends JpaBaseDomain implements Serializable {
 

maxkey-core/src/main/java/org/maxkey/domain/PasswordPolicy.java

@@ -18,6 +18,7 @@
 package org.maxkey.domain;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -32,6 +33,7 @@ import org.maxkey.exception.PasswordPolicyException;
  *
  */
 
+@Entity
 @Table(name = "MXK_PASSWORD_POLICY")
 public class PasswordPolicy extends JpaBaseDomain implements java.io.Serializable {
 

maxkey-core/src/main/java/org/maxkey/domain/Resources.java

@@ -19,12 +19,14 @@ package org.maxkey.domain;
 
 import java.io.Serializable;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
 
+@Entity
 @Table(name = "MXK_RESOURCES")
 public class Resources  extends JpaBaseDomain implements Serializable {
     private static final long serialVersionUID = 2567171742999638608L;

maxkey-core/src/main/java/org/maxkey/domain/RoleMember.java

@@ -19,6 +19,7 @@ package org.maxkey.domain;
 
 import java.io.Serializable;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -30,6 +31,7 @@ import javax.persistence.Table;
    UID	                varchar(40)	                   null
    constraint PK_ROLES primary key clustered (ID)
  */
+@Entity
 @Table(name = "MXK_ROLE_MEMBER")
 public class RoleMember extends UserInfo implements Serializable {
     private static final long serialVersionUID = -8059639972590554760L;

maxkey-core/src/main/java/org/maxkey/domain/RolePermissions.java

@@ -19,6 +19,7 @@ package org.maxkey.domain;
 
 import java.io.Serializable;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -26,6 +27,7 @@ import javax.persistence.Table;
 import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
 import org.maxkey.constants.ConstantsStatus;
 
+@Entity
 @Table(name = "MXK_ROLE_PERMISSIONS")
 public class RolePermissions  extends JpaBaseDomain implements Serializable {
     private static final long serialVersionUID = -8783585691243853899L;

maxkey-core/src/main/java/org/maxkey/domain/Roles.java

@@ -19,12 +19,14 @@ package org.maxkey.domain;
 
 import java.io.Serializable;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
 
+@Entity
 @Table(name = "MXK_ROLES")
 public class Roles extends JpaBaseDomain implements Serializable {
     private static final long serialVersionUID = -7515832728504943821L;

maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java

@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import java.io.IOException;
 import java.util.HashMap;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -34,6 +35,8 @@ import org.springframework.web.multipart.MultipartFile;
  * @author Crystal.Sea
  * 
  */
+
+@Entity
 @Table(name = "MXK_USERINFO")
 public class UserInfo extends JpaBaseDomain {
     private static final long serialVersionUID = 6402443942083382236L;

maxkey-core/src/main/java/org/maxkey/domain/apps/Apps.java

@@ -20,6 +20,7 @@ package org.maxkey.domain.apps;
 import java.io.Serializable;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -30,6 +31,7 @@ import org.maxkey.constants.Boolean;
 import org.maxkey.domain.Accounts;
 import org.springframework.web.multipart.MultipartFile;
 
+@Entity
 @Table(name = "MXK_APPS")
 public class Apps extends JpaBaseDomain implements Serializable {
 

maxkey-core/src/main/java/org/maxkey/domain/apps/AppsCasDetails.java

@@ -18,11 +18,13 @@
 package org.maxkey.domain.apps;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+@Entity
 @Table(name = "MXK_APPS_CAS_DETAILS")
 public class AppsCasDetails extends Apps {
 

maxkey-core/src/main/java/org/maxkey/domain/apps/AppsDesktopDetails.java

@@ -20,6 +20,7 @@
  */
 package org.maxkey.domain.apps;
 
+import javax.persistence.Entity;
 import javax.persistence.Table;
 
 import org.maxkey.domain.Accounts;
@@ -29,6 +30,8 @@ import org.maxkey.domain.Accounts;
  * @author Crystal.Sea
  *
  */
+
+@Entity
 @Table(name = "MXK_APPS_DESKTOP_DETAILS")  
 public class AppsDesktopDetails extends Apps {
 

maxkey-core/src/main/java/org/maxkey/domain/apps/AppsExtendApiDetails.java

@@ -17,8 +17,10 @@
 
 package org.maxkey.domain.apps;
 
+import javax.persistence.Entity;
 import javax.persistence.Table;
 
+@Entity
 @Table(name = "MXK_APPS_EXTENDAPI_DETAILS") 
 public class AppsExtendApiDetails extends Apps {
 

maxkey-core/src/main/java/org/maxkey/domain/apps/AppsFormBasedDetails.java

@@ -18,6 +18,7 @@
 package org.maxkey.domain.apps;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -27,6 +28,7 @@ import javax.persistence.Table;
  * @author Crystal.Sea
  *
  */
+@Entity
 @Table(name = "MXK_APPS_FORM_BASED_DETAILS")  
 public class AppsFormBasedDetails  extends Apps {
 	/**

maxkey-core/src/main/java/org/maxkey/domain/apps/AppsJwtDetails.java

@@ -21,6 +21,7 @@
 package org.maxkey.domain.apps;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -30,6 +31,7 @@ import javax.persistence.Table;
  * @author Crystal.Sea
  *
  */
+@Entity
 @Table(name = "MXK_APPS_JWT_DETAILS") 
 public class AppsJwtDetails  extends Apps {
 

maxkey-core/src/main/java/org/maxkey/domain/apps/AppsOAuth20Details.java

@@ -17,11 +17,13 @@
 
 package org.maxkey.domain.apps;
 
+import javax.persistence.Entity;
 import javax.persistence.Table;
 
 import org.maxkey.domain.apps.oauth2.provider.client.BaseClientDetails;
 import org.springframework.util.StringUtils;
 
+@Entity
 @Table(name = "MXK_APPS_OAUTH_CLIENT_DETAILS")
 public class AppsOAuth20Details extends Apps {
 

maxkey-core/src/main/java/org/maxkey/domain/apps/AppsSAML20Details.java

@@ -18,6 +18,7 @@
 package org.maxkey.domain.apps;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -29,6 +30,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author Crystal.Sea
  *
  */
+@Entity
 @Table(name = "MXK_APPS_SAML_V20_DETAILS")
 public class AppsSAML20Details extends Apps {
 

maxkey-core/src/main/java/org/maxkey/domain/apps/AppsTokenBasedDetails.java

@@ -21,6 +21,7 @@
 package org.maxkey.domain.apps;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -30,6 +31,7 @@ import javax.persistence.Table;
  * @author Crystal.Sea
  *
  */
+@Entity
 @Table(name = "MXK_APPS_TOKEN_BASED_DETAILS") 
 public class AppsTokenBasedDetails  extends Apps {
 

maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/client/Jackson2ArrayOrStringDeserializer.java

@@ -31,7 +31,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import com.fasterxml.jackson.databind.type.SimpleType;
+import com.fasterxml.jackson.databind.type.TypeFactory;
 
 @SuppressWarnings("serial")
 public class Jackson2ArrayOrStringDeserializer extends StdDeserializer<Set<String>> {
@@ -42,7 +42,8 @@ public class Jackson2ArrayOrStringDeserializer extends StdDeserializer<Set<Strin
 
 	@Override
 	public JavaType getValueType() {
-		return SimpleType.construct(String.class);
+		//return SimpleType.construct(String.class);
+		return TypeFactory.defaultInstance().constructType(String.class);
 	}
 
 	@Override

maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicketImpl.java

@@ -18,12 +18,10 @@
 package org.maxkey.authz.cas.endpoint.ticket;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
-import org.apache.commons.lang3.StringUtils;
 import org.maxkey.domain.apps.AppsCasDetails;
 import org.springframework.lang.NonNull;
 import org.springframework.security.core.Authentication;
@@ -35,8 +33,6 @@ import javax.persistence.Entity;
 import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;