项目改名

lzqdename · Jul 17, 2020 · e82830f · e82830f
1 parent 9d294c5
commit e82830f
Show file tree

Hide file tree

Showing 994 changed files with 3,688 additions and 7,574 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,7 @@ target/
 application-dev.yml
 application.properties
 JasyptUtilsTest.java
-opscloud-manage/src/test/java/com/baiyi/opscloud/encryptor/*
+caesar-manage/src/test/java/com/baiyi/caesar/encryptor/*
 
 ### STS ###
 .apt_generated

diff --git a/opscloud-account/pom.xml → caesar-account/pom.xml b/opscloud-account/pom.xml → caesar-account/pom.xml
@@ -3,34 +3,34 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>opscloud</artifactId>
+        <artifactId>caesar</artifactId>
         <groupId>com.baiyi</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>opscloud-account</artifactId>
+    <artifactId>caesar-account</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>com.baiyi</groupId>
-            <artifactId>opscloud-ldap</artifactId>
+            <artifactId>caesar-ldap</artifactId>
         </dependency>
         <dependency>
             <groupId>com.baiyi</groupId>
-            <artifactId>opscloud-gitlab</artifactId>
+            <artifactId>caesar-gitlab</artifactId>
         </dependency>
         <dependency>
             <groupId>com.baiyi</groupId>
-            <artifactId>opscloud-service</artifactId>
+            <artifactId>caesar-service</artifactId>
         </dependency>
         <dependency>
             <groupId>com.baiyi</groupId>
-            <artifactId>opscloud-domain</artifactId>
+            <artifactId>caesar-domain</artifactId>
         </dependency>
         <dependency>
             <groupId>com.baiyi</groupId>
-            <artifactId>opscloud-common</artifactId>
+            <artifactId>caesar-common</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/...baiyi/opscloud/account/AccountCenter.java → ...m/baiyi/caesar/account/AccountCenter.java b/...baiyi/opscloud/account/AccountCenter.java → ...m/baiyi/caesar/account/AccountCenter.java
@@ -1,19 +1,19 @@
-package com.baiyi.opscloud.account;
-
-import com.baiyi.opscloud.account.builder.UserBuilder;
-import com.baiyi.opscloud.account.config.AuthConfig;
-import com.baiyi.opscloud.account.config.OpscloudAdmin;
-import com.baiyi.opscloud.account.factory.AccountFactory;
-import com.baiyi.opscloud.common.util.UUIDUtils;
-import com.baiyi.opscloud.domain.BusinessWrapper;
-import com.baiyi.opscloud.domain.ErrorEnum;
-import com.baiyi.opscloud.domain.generator.opscloud.OcUser;
-import com.baiyi.opscloud.domain.param.auth.LogParam;
-import com.baiyi.opscloud.domain.vo.auth.LogVO;
-import com.baiyi.opscloud.facade.AuthBaseFacade;
-import com.baiyi.opscloud.ldap.credential.PersonCredential;
-import com.baiyi.opscloud.ldap.handler.LdapHandler;
-import com.baiyi.opscloud.service.user.OcUserService;
+package com.baiyi.caesar.account;
+
+import com.baiyi.caesar.account.builder.UserBuilder;
+import com.baiyi.caesar.account.config.AuthConfig;
+import com.baiyi.caesar.account.config.OpscloudAdmin;
+import com.baiyi.caesar.account.factory.AccountFactory;
+import com.baiyi.caesar.common.util.UUIDUtils;
+import com.baiyi.caesar.domain.BusinessWrapper;
+import com.baiyi.caesar.domain.ErrorEnum;
+import com.baiyi.caesar.domain.generator.caesar.OcUser;
+import com.baiyi.caesar.domain.param.auth.LogParam;
+import com.baiyi.caesar.domain.vo.auth.LogVO;
+import com.baiyi.caesar.facade.AuthBaseFacade;
+import com.baiyi.caesar.ldap.credential.PersonCredential;
+import com.baiyi.caesar.ldap.handler.LdapHandler;
+import com.baiyi.caesar.service.user.OcUserService;
 import org.jasypt.encryption.StringEncryptor;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Component;
@@ -54,7 +54,7 @@ public class AccountCenter implements InitializingBean {
      * @return
      */
     public BusinessWrapper<LogVO.LoginVO> loginCheck(LogParam.LoginParam loginParam) {
-        com.baiyi.opscloud.ldap.credential.PersonCredential credential = PersonCredential.builder()
+        com.baiyi.caesar.ldap.credential.PersonCredential credential = PersonCredential.builder()
                 .username(loginParam.getUsername())
                 .password(loginParam.getPassword())
                 .build();

diff --git a/.../com/baiyi/opscloud/account/IAccount.java → ...va/com/baiyi/caesar/account/IAccount.java b/.../com/baiyi/opscloud/account/IAccount.java → ...va/com/baiyi/caesar/account/IAccount.java
@@ -1,6 +1,6 @@
-package com.baiyi.opscloud.account;
+package com.baiyi.caesar.account;
 
-import com.baiyi.opscloud.domain.generator.opscloud.OcUser;
+import com.baiyi.caesar.domain.generator.caesar.OcUser;
 
 /**
  * @Author baiyi

diff --git a/.../baiyi/opscloud/account/bo/AccountBO.java → ...om/baiyi/caesar/account/bo/AccountBO.java b/.../baiyi/opscloud/account/bo/AccountBO.java → ...om/baiyi/caesar/account/bo/AccountBO.java
@@ -1,4 +1,4 @@
-package com.baiyi.opscloud.account.bo;
+package com.baiyi.caesar.account.bo;
 
 import lombok.Builder;
 import lombok.Data;

diff --git a/...com/baiyi/opscloud/account/bo/UserBO.java → ...a/com/baiyi/caesar/account/bo/UserBO.java b/...com/baiyi/opscloud/account/bo/UserBO.java → ...a/com/baiyi/caesar/account/bo/UserBO.java
@@ -1,6 +1,6 @@
-package com.baiyi.opscloud.account.bo;
+package com.baiyi.caesar.account.bo;
 
-import com.baiyi.opscloud.common.util.UUIDUtils;
+import com.baiyi.caesar.common.util.UUIDUtils;
 import lombok.Builder;
 import lombok.Data;
 

diff --git a/...cloud/account/builder/AccountBuilder.java → ...aesar/account/builder/AccountBuilder.java b/...cloud/account/builder/AccountBuilder.java → ...aesar/account/builder/AccountBuilder.java
@@ -1,9 +1,9 @@
-package com.baiyi.opscloud.account.builder;
+package com.baiyi.caesar.account.builder;
 
-import com.baiyi.opscloud.account.bo.AccountBO;
-import com.baiyi.opscloud.common.base.AccountType;
-import com.baiyi.opscloud.common.util.BeanCopierUtils;
-import com.baiyi.opscloud.domain.generator.opscloud.OcAccount;
+import com.baiyi.caesar.account.bo.AccountBO;
+import com.baiyi.caesar.common.base.AccountType;
+import com.baiyi.caesar.common.util.BeanCopierUtils;
+import com.baiyi.caesar.domain.generator.caesar.OcAccount;
 import org.gitlab.api.models.GitlabUser;
 
 

diff --git a/...opscloud/account/builder/UserBuilder.java → ...i/caesar/account/builder/UserBuilder.java b/...opscloud/account/builder/UserBuilder.java → ...i/caesar/account/builder/UserBuilder.java
@@ -1,10 +1,10 @@
-package com.baiyi.opscloud.account.builder;
+package com.baiyi.caesar.account.builder;
 
-import com.baiyi.opscloud.account.bo.UserBO;
-import com.baiyi.opscloud.account.config.OpscloudAdmin;
-import com.baiyi.opscloud.common.util.BeanCopierUtils;
-import com.baiyi.opscloud.domain.generator.opscloud.OcUser;
-import com.baiyi.opscloud.ldap.entry.Person;
+import com.baiyi.caesar.account.bo.UserBO;
+import com.baiyi.caesar.account.config.OpscloudAdmin;
+import com.baiyi.caesar.common.util.BeanCopierUtils;
+import com.baiyi.caesar.domain.generator.caesar.OcUser;
+import com.baiyi.caesar.ldap.entry.Person;
 import org.gitlab.api.models.GitlabUser;
 
 /**

diff --git a/...i/opscloud/account/config/AuthConfig.java → ...iyi/caesar/account/config/AuthConfig.java b/...i/opscloud/account/config/AuthConfig.java → ...iyi/caesar/account/config/AuthConfig.java
@@ -1,4 +1,4 @@
-package com.baiyi.opscloud.account.config;
+package com.baiyi.caesar.account.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

diff --git a/...pscloud/account/config/OpscloudAdmin.java → .../caesar/account/config/OpscloudAdmin.java b/...pscloud/account/config/OpscloudAdmin.java → .../caesar/account/config/OpscloudAdmin.java
@@ -1,4 +1,4 @@
-package com.baiyi.opscloud.account.config;
+package com.baiyi.caesar.account.config;
 
 import lombok.Data;
 

diff --git a/...ud/account/convert/LdapPersonConvert.java → ...ar/account/convert/LdapPersonConvert.java b/...ud/account/convert/LdapPersonConvert.java → ...ar/account/convert/LdapPersonConvert.java
@@ -1,7 +1,7 @@
-package com.baiyi.opscloud.account.convert;
+package com.baiyi.caesar.account.convert;
 
-import com.baiyi.opscloud.domain.generator.opscloud.OcUser;
-import com.baiyi.opscloud.ldap.entry.Person;
+import com.baiyi.caesar.domain.generator.caesar.OcUser;
+import com.baiyi.caesar.ldap.entry.Person;
 
 /**
  * @Author baiyi

diff --git a/...cloud/account/factory/AccountFactory.java → ...aesar/account/factory/AccountFactory.java b/...cloud/account/factory/AccountFactory.java → ...aesar/account/factory/AccountFactory.java
@@ -1,6 +1,6 @@
-package com.baiyi.opscloud.account.factory;
+package com.baiyi.caesar.account.factory;
 
-import com.baiyi.opscloud.account.IAccount;
+import com.baiyi.caesar.account.IAccount;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

diff --git a/...yi/opscloud/account/impl/BaseAccount.java → ...aiyi/caesar/account/impl/BaseAccount.java b/...yi/opscloud/account/impl/BaseAccount.java → ...aiyi/caesar/account/impl/BaseAccount.java
@@ -1,17 +1,17 @@
-package com.baiyi.opscloud.account.impl;
-
-
-import com.baiyi.opscloud.account.IAccount;
-import com.baiyi.opscloud.account.factory.AccountFactory;
-import com.baiyi.opscloud.common.base.CredentialType;
-import com.baiyi.opscloud.domain.generator.opscloud.OcAccount;
-import com.baiyi.opscloud.domain.generator.opscloud.OcServerGroup;
-import com.baiyi.opscloud.domain.generator.opscloud.OcUser;
-import com.baiyi.opscloud.domain.generator.opscloud.OcUserCredential;
-import com.baiyi.opscloud.service.server.OcServerGroupService;
-import com.baiyi.opscloud.service.user.OcAccountService;
-import com.baiyi.opscloud.service.user.OcUserCredentialService;
-import com.baiyi.opscloud.service.user.OcUserService;
+package com.baiyi.caesar.account.impl;
+
+
+import com.baiyi.caesar.account.IAccount;
+import com.baiyi.caesar.account.factory.AccountFactory;
+import com.baiyi.caesar.common.base.CredentialType;
+import com.baiyi.caesar.domain.generator.caesar.OcAccount;
+import com.baiyi.caesar.domain.generator.caesar.OcServerGroup;
+import com.baiyi.caesar.domain.generator.caesar.OcUser;
+import com.baiyi.caesar.domain.generator.caesar.OcUserCredential;
+import com.baiyi.caesar.service.server.OcServerGroupService;
+import com.baiyi.caesar.service.user.OcAccountService;
+import com.baiyi.caesar.service.user.OcUserCredentialService;
+import com.baiyi.caesar.service.user.OcUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.scheduling.annotation.Async;
@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static com.baiyi.opscloud.common.base.Global.ASYNC_POOL_TASK_EXECUTOR;
+import static com.baiyi.caesar.common.base.Global.ASYNC_POOL_TASK_EXECUTOR;
 
 
 /**

diff --git a/.../opscloud/account/impl/GitlabAccount.java → ...yi/caesar/account/impl/GitlabAccount.java b/.../opscloud/account/impl/GitlabAccount.java → ...yi/caesar/account/impl/GitlabAccount.java
@@ -1,17 +1,17 @@
-package com.baiyi.opscloud.account.impl;
-
-import com.baiyi.opscloud.account.IAccount;
-import com.baiyi.opscloud.account.builder.AccountBuilder;
-import com.baiyi.opscloud.account.builder.UserBuilder;
-import com.baiyi.opscloud.common.base.AccountType;
-import com.baiyi.opscloud.common.util.BeanCopierUtils;
-import com.baiyi.opscloud.domain.generator.opscloud.OcAccount;
-import com.baiyi.opscloud.domain.generator.opscloud.OcUser;
-import com.baiyi.opscloud.domain.generator.opscloud.OcUserCredential;
-import com.baiyi.opscloud.domain.vo.user.UserCredentialVO;
-import com.baiyi.opscloud.gitlab.GitlabUserCenter;
-import com.baiyi.opscloud.gitlab.handler.GitlabUserHandler;
-import com.baiyi.opscloud.ldap.config.LdapConfig;
+package com.baiyi.caesar.account.impl;
+
+import com.baiyi.caesar.account.IAccount;
+import com.baiyi.caesar.account.builder.AccountBuilder;
+import com.baiyi.caesar.account.builder.UserBuilder;
+import com.baiyi.caesar.common.base.AccountType;
+import com.baiyi.caesar.common.util.BeanCopierUtils;
+import com.baiyi.caesar.domain.generator.caesar.OcAccount;
+import com.baiyi.caesar.domain.generator.caesar.OcUser;
+import com.baiyi.caesar.domain.generator.caesar.OcUserCredential;
+import com.baiyi.caesar.domain.vo.user.UserCredentialVO;
+import com.baiyi.caesar.gitlab.GitlabUserCenter;
+import com.baiyi.caesar.gitlab.handler.GitlabUserHandler;
+import com.baiyi.caesar.ldap.config.LdapConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

diff --git a/...yi/opscloud/account/impl/LdapAccount.java → ...aiyi/caesar/account/impl/LdapAccount.java b/...yi/opscloud/account/impl/LdapAccount.java → ...aiyi/caesar/account/impl/LdapAccount.java
@@ -1,20 +1,20 @@
-package com.baiyi.opscloud.account.impl;
-
-
-import com.baiyi.opscloud.account.IAccount;
-import com.baiyi.opscloud.account.builder.UserBuilder;
-import com.baiyi.opscloud.account.convert.LdapPersonConvert;
-import com.baiyi.opscloud.common.base.AccountType;
-import com.baiyi.opscloud.common.util.PasswordUtils;
-import com.baiyi.opscloud.domain.generator.opscloud.OcAccount;
-import com.baiyi.opscloud.domain.generator.opscloud.OcAuthRole;
-import com.baiyi.opscloud.domain.generator.opscloud.OcAuthUserRole;
-import com.baiyi.opscloud.domain.generator.opscloud.OcUser;
-import com.baiyi.opscloud.ldap.entry.Person;
-import com.baiyi.opscloud.ldap.repo.GroupRepo;
-import com.baiyi.opscloud.ldap.repo.PersonRepo;
-import com.baiyi.opscloud.service.auth.OcAuthRoleService;
-import com.baiyi.opscloud.service.auth.OcAuthUserRoleService;
+package com.baiyi.caesar.account.impl;
+
+
+import com.baiyi.caesar.account.IAccount;
+import com.baiyi.caesar.account.builder.UserBuilder;
+import com.baiyi.caesar.account.convert.LdapPersonConvert;
+import com.baiyi.caesar.common.base.AccountType;
+import com.baiyi.caesar.common.util.PasswordUtils;
+import com.baiyi.caesar.domain.generator.caesar.OcAccount;
+import com.baiyi.caesar.domain.generator.caesar.OcAuthRole;
+import com.baiyi.caesar.domain.generator.caesar.OcAuthUserRole;
+import com.baiyi.caesar.domain.generator.caesar.OcUser;
+import com.baiyi.caesar.ldap.entry.Person;
+import com.baiyi.caesar.ldap.repo.GroupRepo;
+import com.baiyi.caesar.ldap.repo.PersonRepo;
+import com.baiyi.caesar.service.auth.OcAuthRoleService;
+import com.baiyi.caesar.service.auth.OcAuthUserRoleService;
 import com.google.common.collect.Lists;
 import org.jasypt.encryption.StringEncryptor;
 import org.springframework.stereotype.Component;
@@ -24,7 +24,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static com.baiyi.opscloud.common.base.Global.BASE_ROLE_NAME;
+import static com.baiyi.caesar.common.base.Global.BASE_ROLE_NAME;
 
 /**
  * @Author baiyi

diff --git a/...ain/resources/application-account-dev.yml → ...ain/resources/application-account-dev.yml b/...ain/resources/application-account-dev.yml → ...ain/resources/application-account-dev.yml
diff --git a/...in/resources/application-account-open.yml → ...in/resources/application-account-open.yml b/...in/resources/application-account-open.yml → ...in/resources/application-account-open.yml
diff --git a/...ain/resources/application-account-pre.yml → ...ain/resources/application-account-pre.yml b/...ain/resources/application-account-pre.yml → ...ain/resources/application-account-pre.yml
diff --git a/...in/resources/application-account-prod.yml → ...in/resources/application-account-prod.yml b/...in/resources/application-account-prod.yml → ...in/resources/application-account-prod.yml
diff --git a/...ccount/src/main/resources/application.yml → ...ccount/src/main/resources/application.yml b/...ccount/src/main/resources/application.yml → ...ccount/src/main/resources/application.yml
diff --git a/opscloud-ansible/pom.xml → caesar-ansible/pom.xml b/opscloud-ansible/pom.xml → caesar-ansible/pom.xml
@@ -3,17 +3,17 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>opscloud</artifactId>
+        <artifactId>caesar</artifactId>
         <groupId>com.baiyi</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>opscloud-ansible</artifactId>
+    <artifactId>caesar-ansible</artifactId>
     <dependencies>
         <dependency>
             <groupId>com.baiyi</groupId>
-            <artifactId>opscloud-domain</artifactId>
+            <artifactId>caesar-domain</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -22,11 +22,11 @@
         </dependency>
         <dependency>
             <groupId>com.baiyi</groupId>
-            <artifactId>opscloud-common</artifactId>
+            <artifactId>caesar-common</artifactId>
         </dependency>
         <dependency>
             <groupId>com.baiyi</groupId>
-            <artifactId>opscloud-service</artifactId>
+            <artifactId>caesar-service</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/...yi/opscloud/ansible/IAnsibleExecutor.java → ...aiyi/caesar/ansible/IAnsibleExecutor.java b/...yi/opscloud/ansible/IAnsibleExecutor.java → ...aiyi/caesar/ansible/IAnsibleExecutor.java
@@ -1,10 +1,10 @@
-package com.baiyi.opscloud.ansible;
+package com.baiyi.caesar.ansible;
 
-import com.baiyi.opscloud.domain.BusinessWrapper;
-import com.baiyi.opscloud.domain.generator.opscloud.OcServer;
-import com.baiyi.opscloud.domain.generator.opscloud.OcServerTask;
-import com.baiyi.opscloud.domain.param.server.ServerTaskExecutorParam;
-import com.baiyi.opscloud.domain.vo.server.ServerVO;
+import com.baiyi.caesar.domain.BusinessWrapper;
+import com.baiyi.caesar.domain.generator.caesar.OcServer;
+import com.baiyi.caesar.domain.generator.caesar.OcServerTask;
+import com.baiyi.caesar.domain.param.server.ServerTaskExecutorParam;
+import com.baiyi.caesar.domain.vo.server.ServerVO;
 
 import java.util.List;
 

diff --git a/...cloud/ansible/bo/MemberExecutorLogBO.java → ...aesar/ansible/bo/MemberExecutorLogBO.java b/...cloud/ansible/bo/MemberExecutorLogBO.java → ...aesar/ansible/bo/MemberExecutorLogBO.java
@@ -1,4 +1,4 @@
-package com.baiyi.opscloud.ansible.bo;
+package com.baiyi.caesar.ansible.bo;
 
 import lombok.Data;
 

diff --git a/...iyi/opscloud/ansible/bo/ServerTaskBO.java → ...baiyi/caesar/ansible/bo/ServerTaskBO.java b/...iyi/opscloud/ansible/bo/ServerTaskBO.java → ...baiyi/caesar/ansible/bo/ServerTaskBO.java
@@ -1,4 +1,4 @@
-package com.baiyi.opscloud.ansible.bo;
+package com.baiyi.caesar.ansible.bo;
 
 import lombok.Builder;
 import lombok.Data;

diff --git a/...scloud/ansible/bo/ServerTaskMemberBO.java → ...caesar/ansible/bo/ServerTaskMemberBO.java b/...scloud/ansible/bo/ServerTaskMemberBO.java → ...caesar/ansible/bo/ServerTaskMemberBO.java
@@ -1,6 +1,6 @@
-package com.baiyi.opscloud.ansible.bo;
+package com.baiyi.caesar.ansible.bo;
 
-import com.baiyi.opscloud.common.base.ServerTaskStatus;
+import com.baiyi.caesar.common.base.ServerTaskStatus;
 import lombok.Builder;
 import lombok.Data;
 

diff --git a/...baiyi/opscloud/ansible/bo/TaskResult.java → ...m/baiyi/caesar/ansible/bo/TaskResult.java b/...baiyi/opscloud/ansible/bo/TaskResult.java → ...m/baiyi/caesar/ansible/bo/TaskResult.java
@@ -1,4 +1,4 @@
-package com.baiyi.opscloud.ansible.bo;
+package com.baiyi.caesar.ansible.bo;
 
 import lombok.Builder;
 import lombok.Data;

diff --git a/...iyi/opscloud/ansible/bo/TaskStatusBO.java → ...baiyi/caesar/ansible/bo/TaskStatusBO.java b/...iyi/opscloud/ansible/bo/TaskStatusBO.java → ...baiyi/caesar/ansible/bo/TaskStatusBO.java
@@ -1,6 +1,6 @@
-package com.baiyi.opscloud.ansible.bo;
+package com.baiyi.caesar.ansible.bo;
 
-import com.baiyi.opscloud.common.base.ServerTaskStatus;
+import com.baiyi.caesar.common.base.ServerTaskStatus;
 import lombok.Builder;
 import lombok.Data;
 

diff --git a/...scloud/ansible/builder/AnsibleArgsBO.java → ...caesar/ansible/builder/AnsibleArgsBO.java b/...scloud/ansible/builder/AnsibleArgsBO.java → ...caesar/ansible/builder/AnsibleArgsBO.java
@@ -1,4 +1,4 @@
-package com.baiyi.opscloud.ansible.builder;
+package com.baiyi.caesar.ansible.builder;
 
 import lombok.Builder;
 import lombok.Data;