add lombok

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/User.java

@@ -40,4 +40,6 @@ public interface User extends Serializable {
      * @return 姓名
      */
     String getName();
+
+    String getType();
 }

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/simple/AbstractDataAccessConfig.java

@@ -3,12 +3,14 @@ package org.hswebframework.web.authorization.simple;
 import org.hswebframework.web.authorization.access.DataAccessConfig;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
+ * @see DataAccessConfig
+ * @since 3.0
  */
 public abstract class AbstractDataAccessConfig implements DataAccessConfig {
 
+    private static final long serialVersionUID = -9025349704771557106L;
+
     private String action;
 
     @Override

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/simple/SimpleAuthentication.java

@@ -24,6 +24,8 @@ import java.util.*;
 
 public class SimpleAuthentication implements Authentication {
 
+    private static final long serialVersionUID = -2898863220255336528L;
+
     private User user;
 
     private List<Role> roles;

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/simple/SimpleCustomDataAccessConfigConfig.java

@@ -2,14 +2,21 @@ package org.hswebframework.web.authorization.simple;
 
 import org.hswebframework.web.authorization.access.CustomDataAccessConfig;
 import org.hswebframework.web.authorization.access.DataAccessController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.ClassUtils;
 
 /**
  * @author zhouhao
  */
 public class SimpleCustomDataAccessConfigConfig extends AbstractDataAccessConfig implements CustomDataAccessConfig {
 
+    private static final long serialVersionUID = -8754634247843748887L;
+
     private String classOrBeanName;
 
+    private static Logger logger = LoggerFactory.getLogger(CustomDataAccessConfig.class);
+
     private transient DataAccessController instance;
 
     public SimpleCustomDataAccessConfigConfig() {
@@ -17,21 +24,17 @@ public class SimpleCustomDataAccessConfigConfig extends AbstractDataAccessConfig
 
     public SimpleCustomDataAccessConfigConfig(String classOrBeanName) {
         this.classOrBeanName = classOrBeanName;
+        try {
+            instance = (DataAccessController) ClassUtils.forName(getClassOrBeanName(), this.getClass().getClassLoader()).newInstance();
+        } catch (Exception e) {
+            logger.error("init CustomDataAccessConfig error", e);
+        }
     }
 
     @Override
     public DataAccessController getController() {
         if (instance == null) {
-            synchronized (this) {
-                // TODO: 17-2-8  spring bean not support now!
-                if (instance == null) {
-                    try {
-                        instance = (DataAccessController) Class.forName(classOrBeanName).newInstance();
-                    } catch (Exception e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-            }
+            throw new UnsupportedOperationException(new ClassNotFoundException(classOrBeanName));
         }
         return instance;
     }

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/simple/SimpleFieldFilterDataAccessConfig.java

@@ -16,6 +16,8 @@ import static org.hswebframework.web.authorization.access.DataAccessConfig.Defau
  * @since 3.0
  */
 public class SimpleFieldFilterDataAccessConfig extends AbstractDataAccessConfig implements FieldFilterDataAccessConfig {
+    private static final long serialVersionUID = 8080660575093151866L;
+
     private Set<String> fields;
 
     public SimpleFieldFilterDataAccessConfig() {

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/simple/SimpleFiledScopeDataAccessConfig.java

@@ -5,12 +5,13 @@ import org.hswebframework.web.authorization.access.FieldScopeDataAccessConfig;
 import java.util.Set;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
+ * @since 3.0
  */
 public class SimpleFiledScopeDataAccessConfig extends AbstractDataAccessConfig implements FieldScopeDataAccessConfig {
 
+    private static final long serialVersionUID = -2562713900619774139L;
+
     private String scopeType;
 
     private Set<Object> scope;

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/simple/SimpleOwnCreatedDataAccessConfig.java

@@ -3,12 +3,13 @@ package org.hswebframework.web.authorization.simple;
 import org.hswebframework.web.authorization.access.OwnCreatedDataAccessConfig;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
+ * @since 3.0
  */
 public class SimpleOwnCreatedDataAccessConfig extends AbstractDataAccessConfig implements OwnCreatedDataAccessConfig {
 
+    private static final long serialVersionUID = -6059330812806119730L;
+
     public SimpleOwnCreatedDataAccessConfig() {
     }
 

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/simple/SimplePermission.java

@@ -1,55 +1,26 @@
 package org.hswebframework.web.authorization.simple;
 
+import lombok.*;
 import org.hswebframework.web.authorization.Permission;
 import org.hswebframework.web.authorization.access.DataAccessConfig;
 
 import java.util.Set;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class SimplePermission implements Permission {
 
+    private static final long serialVersionUID = 7587266693680162184L;
+
     private String id;
 
     private Set<String> actions;
 
     private Set<DataAccessConfig> dataAccesses;
-
-    public SimplePermission() {
-    }
-
-    public SimplePermission(String id, Set<String> actions) {
-        this.id = id;
-        this.actions = actions;
-    }
-
-    @Override
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @Override
-    public Set<String> getActions() {
-        return actions;
-    }
-
-    public void setActions(Set<String> actions) {
-        this.actions = actions;
-    }
-
-    @Override
-    public Set<DataAccessConfig> getDataAccesses() {
-        return dataAccesses;
-    }
-
-    public void setDataAccesses(Set<DataAccessConfig> dataAccesses) {
-        this.dataAccesses = dataAccesses;
-    }
 }

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/simple/SimpleRole.java

@@ -1,10 +1,16 @@
 package org.hswebframework.web.authorization.simple;
 
+import lombok.*;
 import org.hswebframework.web.authorization.Role;
 
 /**
  * @author zhouhao
  */
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class SimpleRole implements Role {
 
     private static final long serialVersionUID = 7460859165231311347L;
@@ -12,30 +18,4 @@ public class SimpleRole implements Role {
     private String id;
 
     private String name;
-
-    public SimpleRole() {
-    }
-
-    public SimpleRole(String id, String name) {
-        this.id = id;
-        this.name = name;
-    }
-
-    @Override
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
 }

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/simple/SimpleScriptDataAccessConfig.java

@@ -1,40 +1,21 @@
 package org.hswebframework.web.authorization.simple;
 
+import lombok.*;
 import org.hswebframework.web.authorization.access.ScriptDataAccessConfig;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class SimpleScriptDataAccessConfig extends AbstractDataAccessConfig implements ScriptDataAccessConfig {
-    private String script;
-
-    private String scriptLanguage;
-
-    public SimpleScriptDataAccessConfig() {
-    }
 
-    public SimpleScriptDataAccessConfig(String script, String scriptLanguage) {
-        this.script = script;
-        this.scriptLanguage = scriptLanguage;
-    }
+    private static final long serialVersionUID = 2667127339980983720L;
 
-    @Override
-    public String getScriptLanguage() {
-        return scriptLanguage;
-    }
-
-    public void setScriptLanguage(String scriptLanguage) {
-        this.scriptLanguage = scriptLanguage;
-    }
-
-    @Override
-    public String getScript() {
-        return script;
-    }
+    private String script;
 
-    public void setScript(String script) {
-        this.script = script;
-    }
+    private String scriptLanguage;
 }

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/simple/SimpleUser.java

@@ -1,50 +1,25 @@
 package org.hswebframework.web.authorization.simple;
 
+import lombok.*;
 import org.hswebframework.web.authorization.User;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class SimpleUser implements User {
-    private String id;
-    private String username;
-    private String name;
-
-    public SimpleUser() {
-    }
-
-    public SimpleUser(String id, String username, String name) {
-        this.id = id;
-        this.username = username;
-        this.name = name;
-    }
 
-    @Override
-    public String getId() {
-        return id;
-    }
+    private static final long serialVersionUID = 2194541828191869091L;
 
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @Override
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
+    private String id;
 
-    @Override
-    public String getName() {
-        return name;
-    }
+    private String username;
 
-    public void setName(String name) {
-        this.name = name;
-    }
+    private String name;
+    
+    private String type;
 }

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/simple/builder/SimpleAuthenticationBuilder.java

@@ -51,7 +51,12 @@ public class SimpleAuthenticationBuilder implements AuthenticationBuilder {
     @Override
     public AuthenticationBuilder user(Map<String, String> user) {
         Objects.requireNonNull(user.get("id"));
-        user(new SimpleUser(user.get("id"), user.get("username"), user.get("name")));
+        user(SimpleUser.builder()
+                .id(user.get("id"))
+                .username(user.get("username"))
+                .name(user.get("name"))
+                .type(user.get("type"))
+                .build());
         return this;
     }