(improvement)[build] Use Spotless to customize the code formatting (#1750)

launchers/standalone/src/main/java/com/tencent/supersonic/StandaloneLauncher.java

@@ -8,8 +8,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
-@SpringBootApplication(
-        scanBasePackages = {"com.tencent.supersonic", "dev.langchain4j"},
+@SpringBootApplication(scanBasePackages = {"com.tencent.supersonic", "dev.langchain4j"},
         exclude = {MongoAutoConfiguration.class, MongoDataAutoConfiguration.class})
 @EnableScheduling
 @EnableAsync

launchers/standalone/src/main/java/com/tencent/supersonic/config/SwaggerConfiguration.java

@@ -54,34 +54,25 @@ public class SwaggerConfiguration {
     @Value("${swagger.version}")
     private String version;
 
-    @Autowired private AuthenticationConfig authenticationConfig;
+    @Autowired
+    private AuthenticationConfig authenticationConfig;
 
     @Bean
     public Docket createRestApi() {
 
-        return new Docket(DocumentationType.OAS_30)
-                .apiInfo(apiInfo())
-                .select()
-                .apis(RequestHandlerSelectors.basePackage(basePackage))
-                .paths(PathSelectors.any())
-                .build()
-                .securitySchemes(Lists.newArrayList(apiKey()));
+        return new Docket(DocumentationType.OAS_30).apiInfo(apiInfo()).select()
+                .apis(RequestHandlerSelectors.basePackage(basePackage)).paths(PathSelectors.any())
+                .build().securitySchemes(Lists.newArrayList(apiKey()));
     }
 
     private ApiKey apiKey() {
-        return new ApiKey(
-                authenticationConfig.getTokenHttpHeaderKey(),
-                authenticationConfig.getTokenHttpHeaderKey(),
-                "header");
+        return new ApiKey(authenticationConfig.getTokenHttpHeaderKey(),
+                authenticationConfig.getTokenHttpHeaderKey(), "header");
     }
 
     private ApiInfo apiInfo() {
-        return new ApiInfoBuilder()
-                .title(title)
-                .description(description)
-                .termsOfServiceUrl(url)
-                .contact(new Contact(contactName, contactUrl, contactEmail))
-                .version(version)
+        return new ApiInfoBuilder().title(title).description(description).termsOfServiceUrl(url)
+                .contact(new Contact(contactName, contactUrl, contactEmail)).version(version)
                 .build();
     }
 }

launchers/standalone/src/main/java/com/tencent/supersonic/demo/CspiderDemo.java

@@ -150,8 +150,8 @@ public class CspiderDemo extends S2BaseDemo {
         modelDetail.setMeasures(Collections.emptyList());
 
         modelDetail.setQueryType("sql_query");
-        modelDetail.setSqlQuery(
-                "SELECT f_id, artist_name, file_size, duration, formats FROM files");
+        modelDetail
+                .setSqlQuery("SELECT f_id, artist_name, file_size, duration, formats FROM files");
         modelReq.setModelDetail(modelDetail);
         return modelService.createModel(modelReq, user);
     }
@@ -188,9 +188,8 @@ public class CspiderDemo extends S2BaseDemo {
         modelDetail.setMeasures(measures);
 
         modelDetail.setQueryType("sql_query");
-        modelDetail.setSqlQuery(
-                "SELECT imp_date, song_name, artist_name, country, f_id, g_name, "
-                        + " rating, languages, releasedate, resolution FROM song");
+        modelDetail.setSqlQuery("SELECT imp_date, song_name, artist_name, country, f_id, g_name, "
+                + " rating, languages, releasedate, resolution FROM song");
         modelReq.setModelDetail(modelDetail);
         return modelService.createModel(modelReq, user);
     }
@@ -228,8 +227,8 @@ public class CspiderDemo extends S2BaseDemo {
         dataSetService.save(dataSetReq, User.getFakeUser());
     }
 
-    public void addModelRela_1(
-            DomainResp s2Domain, ModelResp genreModelResp, ModelResp artistModelResp) {
+    public void addModelRela_1(DomainResp s2Domain, ModelResp genreModelResp,
+            ModelResp artistModelResp) {
         List<JoinCondition> joinConditions = Lists.newArrayList();
         joinConditions.add(new JoinCondition("g_name", "g_name", FilterOperatorEnum.EQUALS));
         ModelRela modelRelaReq = new ModelRela();
@@ -241,11 +240,11 @@ public class CspiderDemo extends S2BaseDemo {
         modelRelaService.save(modelRelaReq, user);
     }
 
-    public void addModelRela_2(
-            DomainResp s2Domain, ModelResp filesModelResp, ModelResp artistModelResp) {
+    public void addModelRela_2(DomainResp s2Domain, ModelResp filesModelResp,
+            ModelResp artistModelResp) {
         List<JoinCondition> joinConditions = Lists.newArrayList();
-        joinConditions.add(
-                new JoinCondition("artist_name", "artist_name", FilterOperatorEnum.EQUALS));
+        joinConditions
+                .add(new JoinCondition("artist_name", "artist_name", FilterOperatorEnum.EQUALS));
         ModelRela modelRelaReq = new ModelRela();
         modelRelaReq.setDomainId(s2Domain.getId());
         modelRelaReq.setFromModelId(filesModelResp.getId());
@@ -255,11 +254,11 @@ public class CspiderDemo extends S2BaseDemo {
         modelRelaService.save(modelRelaReq, user);
     }
 
-    public void addModelRela_3(
-            DomainResp s2Domain, ModelResp songModelResp, ModelResp artistModelResp) {
+    public void addModelRela_3(DomainResp s2Domain, ModelResp songModelResp,
+            ModelResp artistModelResp) {
         List<JoinCondition> joinConditions = Lists.newArrayList();
-        joinConditions.add(
-                new JoinCondition("artist_name", "artist_name", FilterOperatorEnum.EQUALS));
+        joinConditions
+                .add(new JoinCondition("artist_name", "artist_name", FilterOperatorEnum.EQUALS));
         ModelRela modelRelaReq = new ModelRela();
         modelRelaReq.setDomainId(s2Domain.getId());
         modelRelaReq.setFromModelId(songModelResp.getId());
@@ -269,8 +268,8 @@ public class CspiderDemo extends S2BaseDemo {
         modelRelaService.save(modelRelaReq, user);
     }
 
-    public void addModelRela_4(
-            DomainResp s2Domain, ModelResp songModelResp, ModelResp genreModelResp) {
+    public void addModelRela_4(DomainResp s2Domain, ModelResp songModelResp,
+            ModelResp genreModelResp) {
         List<JoinCondition> joinConditions = Lists.newArrayList();
         joinConditions.add(new JoinCondition("g_name", "g_name", FilterOperatorEnum.EQUALS));
         ModelRela modelRelaReq = new ModelRela();
@@ -282,8 +281,8 @@ public class CspiderDemo extends S2BaseDemo {
         modelRelaService.save(modelRelaReq, user);
     }
 
-    public void addModelRela_5(
-            DomainResp s2Domain, ModelResp songModelResp, ModelResp filesModelResp) {
+    public void addModelRela_5(DomainResp s2Domain, ModelResp songModelResp,
+            ModelResp filesModelResp) {
         List<JoinCondition> joinConditions = Lists.newArrayList();
         joinConditions.add(new JoinCondition("f_id", "f_id", FilterOperatorEnum.EQUALS));
         ModelRela modelRelaReq = new ModelRela();

launchers/standalone/src/main/java/com/tencent/supersonic/demo/DuSQLDemo.java

@@ -109,9 +109,8 @@ public class DuSQLDemo extends S2BaseDemo {
         modelDetail.setMeasures(measures);
 
         modelDetail.setQueryType("sql_query");
-        modelDetail.setSqlQuery(
-                "SELECT imp_date,company_id,company_name,headquarter_address,"
-                        + "company_established_time,founder,ceo,annual_turnover,employee_count FROM company");
+        modelDetail.setSqlQuery("SELECT imp_date,company_id,company_name,headquarter_address,"
+                + "company_established_time,founder,ceo,annual_turnover,employee_count FROM company");
         modelReq.setModelDetail(modelDetail);
         modelService.createModel(modelReq, user);
     }
@@ -138,8 +137,8 @@ public class DuSQLDemo extends S2BaseDemo {
         dimensions.add(new Dim("品牌名称", "brand_name", DimensionType.categorical.name(), 1));
         dimensions.add(
                 new Dim("品牌成立时间", "brand_established_time", DimensionType.categorical.name(), 1));
-        dimensions.add(
-                new Dim("法定代表人", "legal_representative", DimensionType.categorical.name(), 1));
+        dimensions
+                .add(new Dim("法定代表人", "legal_representative", DimensionType.categorical.name(), 1));
         modelDetail.setDimensions(dimensions);
 
         List<Identify> identifiers = new ArrayList<>();
@@ -152,9 +151,8 @@ public class DuSQLDemo extends S2BaseDemo {
         modelDetail.setMeasures(measures);
 
         modelDetail.setQueryType("sql_query");
-        modelDetail.setSqlQuery(
-                "SELECT  imp_date,brand_id,brand_name,brand_established_time,"
-                        + "company_id,legal_representative,registered_capital FROM brand");
+        modelDetail.setSqlQuery("SELECT  imp_date,brand_id,brand_name,brand_established_time,"
+                + "company_id,legal_representative,registered_capital FROM brand");
         modelReq.setModelDetail(modelDetail);
         modelService.createModel(modelReq, user);
     }
@@ -193,9 +191,8 @@ public class DuSQLDemo extends S2BaseDemo {
         modelDetail.setMeasures(measures);
 
         modelDetail.setQueryType("sql_query");
-        modelDetail.setSqlQuery(
-                "SELECT imp_date,company_id,brand_id,revenue_proportion,"
-                        + "profit_proportion,expenditure_proportion FROM company_revenue");
+        modelDetail.setSqlQuery("SELECT imp_date,company_id,brand_id,revenue_proportion,"
+                + "profit_proportion,expenditure_proportion FROM company_revenue");
         modelReq.setModelDetail(modelDetail);
         modelService.createModel(modelReq, user);
         MetricResp metricResp = metricService.getMetric(13L, user);
@@ -235,17 +232,15 @@ public class DuSQLDemo extends S2BaseDemo {
         List<Measure> measures = new ArrayList<>();
         measures.add(new Measure("营收", "revenue", AggOperatorEnum.SUM.name(), 1));
         measures.add(new Measure("利润", "profit", AggOperatorEnum.SUM.name(), 1));
-        measures.add(
-                new Measure(
-                        "营收同比增长", "revenue_growth_year_on_year", AggOperatorEnum.SUM.name(), 1));
+        measures.add(new Measure("营收同比增长", "revenue_growth_year_on_year",
+                AggOperatorEnum.SUM.name(), 1));
         measures.add(
                 new Measure("利润同比增长", "profit_growth_year_on_year", AggOperatorEnum.SUM.name(), 1));
         modelDetail.setMeasures(measures);
 
         modelDetail.setQueryType("sql_query");
-        modelDetail.setSqlQuery(
-                "SELECT imp_date,year_time,brand_id,revenue,profit,"
-                        + "revenue_growth_year_on_year,profit_growth_year_on_year FROM company_brand_revenue");
+        modelDetail.setSqlQuery("SELECT imp_date,year_time,brand_id,revenue,profit,"
+                + "revenue_growth_year_on_year,profit_growth_year_on_year FROM company_brand_revenue");
         modelReq.setModelDetail(modelDetail);
         modelService.createModel(modelReq, user);
     }
@@ -257,20 +252,15 @@ public class DuSQLDemo extends S2BaseDemo {
         dataSetReq.setDomainId(4L);
         dataSetReq.setDescription("DuSQL互联网企业数据源相关的指标和维度等");
         dataSetReq.setAdmins(Lists.newArrayList("admin"));
-        List<DataSetModelConfig> viewModelConfigs =
-                Lists.newArrayList(
-                        new DataSetModelConfig(
-                                9L,
-                                Lists.newArrayList(16L, 17L, 18L, 19L, 20L),
-                                Lists.newArrayList(10L, 11L)),
-                        new DataSetModelConfig(
-                                10L, Lists.newArrayList(21L, 22L, 23L), Lists.newArrayList(12L)),
-                        new DataSetModelConfig(
-                                11L, Lists.newArrayList(), Lists.newArrayList(13L, 14L, 15L)),
-                        new DataSetModelConfig(
-                                12L,
-                                Lists.newArrayList(24L),
-                                Lists.newArrayList(16L, 17L, 18L, 19L)));
+        List<DataSetModelConfig> viewModelConfigs = Lists.newArrayList(
+                new DataSetModelConfig(9L, Lists.newArrayList(16L, 17L, 18L, 19L, 20L),
+                        Lists.newArrayList(10L, 11L)),
+                new DataSetModelConfig(10L, Lists.newArrayList(21L, 22L, 23L),
+                        Lists.newArrayList(12L)),
+                new DataSetModelConfig(11L, Lists.newArrayList(),
+                        Lists.newArrayList(13L, 14L, 15L)),
+                new DataSetModelConfig(12L, Lists.newArrayList(24L),
+                        Lists.newArrayList(16L, 17L, 18L, 19L)));
 
         DataSetDetail dsDetail = new DataSetDetail();
         dsDetail.setDataSetModelConfigs(viewModelConfigs);
@@ -289,8 +279,8 @@ public class DuSQLDemo extends S2BaseDemo {
 
     public void addModelRela_1() {
         List<JoinCondition> joinConditions = Lists.newArrayList();
-        joinConditions.add(
-                new JoinCondition("company_id", "company_id", FilterOperatorEnum.EQUALS));
+        joinConditions
+                .add(new JoinCondition("company_id", "company_id", FilterOperatorEnum.EQUALS));
         ModelRela modelRelaReq = new ModelRela();
         modelRelaReq.setDomainId(4L);
         modelRelaReq.setFromModelId(9L);
@@ -302,8 +292,8 @@ public class DuSQLDemo extends S2BaseDemo {
 
     public void addModelRela_2() {
         List<JoinCondition> joinConditions = Lists.newArrayList();
-        joinConditions.add(
-                new JoinCondition("company_id", "company_id", FilterOperatorEnum.EQUALS));
+        joinConditions
+                .add(new JoinCondition("company_id", "company_id", FilterOperatorEnum.EQUALS));
         ModelRela modelRelaReq = new ModelRela();
         modelRelaReq.setDomainId(4L);
         modelRelaReq.setFromModelId(9L);

launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2ArtistDemo.java

@@ -87,9 +87,8 @@ public class S2ArtistDemo extends S2BaseDemo {
         return domainService.createDomain(domainReq, user);
     }
 
-    public ModelResp addModel(
-            DomainResp singerDomain, DatabaseResp s2Database, TagObjectResp singerTagObject)
-            throws Exception {
+    public ModelResp addModel(DomainResp singerDomain, DatabaseResp s2Database,
+            TagObjectResp singerTagObject) throws Exception {
         ModelReq modelReq = new ModelReq();
         modelReq.setName("歌手库");
         modelReq.setBizName("singer");
@@ -119,25 +118,20 @@ public class S2ArtistDemo extends S2BaseDemo {
         Measure measure3 = new Measure("收藏量", "favor_cnt", "sum", 1);
         modelDetail.setMeasures(Lists.newArrayList(measure1, measure2, measure3));
         modelDetail.setQueryType("sql_query");
-        modelDetail.setSqlQuery(
-                "select singer_name, act_area, song_name, genre, "
-                        + "js_play_cnt, down_cnt, favor_cnt from singer");
+        modelDetail.setSqlQuery("select singer_name, act_area, song_name, genre, "
+                + "js_play_cnt, down_cnt, favor_cnt from singer");
         modelReq.setModelDetail(modelDetail);
         return modelService.createModel(modelReq, user);
     }
 
     private void addTags(ModelResp model) {
-        addTag(
-                dimensionService.getDimension("act_area", model.getId()).getId(),
+        addTag(dimensionService.getDimension("act_area", model.getId()).getId(),
                 TagDefineType.DIMENSION);
-        addTag(
-                dimensionService.getDimension("song_name", model.getId()).getId(),
+        addTag(dimensionService.getDimension("song_name", model.getId()).getId(),
                 TagDefineType.DIMENSION);
-        addTag(
-                dimensionService.getDimension("genre", model.getId()).getId(),
+        addTag(dimensionService.getDimension("genre", model.getId()).getId(),
                 TagDefineType.DIMENSION);
-        addTag(
-                dimensionService.getDimension("singer_name", model.getId()).getId(),
+        addTag(dimensionService.getDimension("singer_name", model.getId()).getId(),
                 TagDefineType.DIMENSION);
         addTag(metricService.getMetric(model.getId(), "js_play_cnt").getId(), TagDefineType.METRIC);
     }

launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2BaseDemo.java

@@ -49,25 +49,44 @@ public abstract class S2BaseDemo implements CommandLineRunner {
     protected DatabaseResp demoDatabaseResp;
 
     protected User user = User.getFakeUser();
-    @Autowired protected DatabaseService databaseService;
-    @Autowired protected DomainService domainService;
-    @Autowired protected ModelService modelService;
-    @Autowired protected ModelRelaService modelRelaService;
-    @Autowired protected DimensionService dimensionService;
-    @Autowired protected MetricService metricService;
-    @Autowired protected TagMetaService tagMetaService;
-    @Autowired protected AuthService authService;
-    @Autowired protected DataSetService dataSetService;
-    @Autowired protected TermService termService;
-    @Autowired protected PluginService pluginService;
-    @Autowired protected DataSourceProperties dataSourceProperties;
-    @Autowired protected TagObjectService tagObjectService;
-    @Autowired protected ChatQueryService chatQueryService;
-    @Autowired protected ChatManageService chatManageService;
-    @Autowired protected AgentService agentService;
-    @Autowired protected SystemConfigService sysParameterService;
-    @Autowired protected CanvasService canvasService;
-    @Autowired protected DictWordService dictWordService;
+    @Autowired
+    protected DatabaseService databaseService;
+    @Autowired
+    protected DomainService domainService;
+    @Autowired
+    protected ModelService modelService;
+    @Autowired
+    protected ModelRelaService modelRelaService;
+    @Autowired
+    protected DimensionService dimensionService;
+    @Autowired
+    protected MetricService metricService;
+    @Autowired
+    protected TagMetaService tagMetaService;
+    @Autowired
+    protected AuthService authService;
+    @Autowired
+    protected DataSetService dataSetService;
+    @Autowired
+    protected TermService termService;
+    @Autowired
+    protected PluginService pluginService;
+    @Autowired
+    protected DataSourceProperties dataSourceProperties;
+    @Autowired
+    protected TagObjectService tagObjectService;
+    @Autowired
+    protected ChatQueryService chatQueryService;
+    @Autowired
+    protected ChatManageService chatManageService;
+    @Autowired
+    protected AgentService agentService;
+    @Autowired
+    protected SystemConfigService sysParameterService;
+    @Autowired
+    protected CanvasService canvasService;
+    @Autowired
+    protected DictWordService dictWordService;
 
     @Value("${s2.demo.names:S2VisitsDemo}")
     protected List<String> demoList;
@@ -106,8 +125,8 @@ public abstract class S2BaseDemo implements CommandLineRunner {
         }
         databaseReq.setUrl(url);
         databaseReq.setUsername(dataSourceProperties.getUsername());
-        databaseReq.setPassword(
-                AESEncryptionUtil.aesEncryptECB(dataSourceProperties.getPassword()));
+        databaseReq
+                .setPassword(AESEncryptionUtil.aesEncryptECB(dataSourceProperties.getPassword()));
         return databaseService.createOrUpdateDatabase(databaseReq, user);
     }
 
@@ -125,15 +144,11 @@ public abstract class S2BaseDemo implements CommandLineRunner {
             dataSetModelConfig.setId(modelResp.getId());
             MetaFilter metaFilter = new MetaFilter();
             metaFilter.setModelIds(Lists.newArrayList(modelResp.getId()));
-            List<Long> metrics =
-                    metricService.getMetrics(metaFilter).stream()
-                            .map(MetricResp::getId)
-                            .collect(Collectors.toList());
+            List<Long> metrics = metricService.getMetrics(metaFilter).stream()
+                    .map(MetricResp::getId).collect(Collectors.toList());
             dataSetModelConfig.setMetrics(metrics);
-            List<Long> dimensions =
-                    dimensionService.getDimensions(metaFilter).stream()
-                            .map(DimensionResp::getId)
-                            .collect(Collectors.toList());
+            List<Long> dimensions = dimensionService.getDimensions(metaFilter).stream()
+                    .map(DimensionResp::getId).collect(Collectors.toList());
             dataSetModelConfig.setMetrics(metrics);
             dataSetModelConfig.setDimensions(dimensions);
             dataSetModelConfigs.add(dataSetModelConfig);

launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java

@@ -150,13 +150,8 @@ public class S2VisitsDemo extends S2BaseDemo {
         agent.setDescription("帮助您用自然语言查询指标，支持时间限定、条件筛选、下钻维度以及聚合统计");
         agent.setStatus(1);
         agent.setEnableSearch(1);
-        agent.setExamples(
-                Lists.newArrayList(
-                        "超音数访问次数",
-                        "近15天超音数访问次数汇总",
-                        "按部门统计超音数的访问人数",
-                        "对比alice和lucy的停留时长",
-                        "超音数访问次数最高的部门"));
+        agent.setExamples(Lists.newArrayList("超音数访问次数", "近15天超音数访问次数汇总", "按部门统计超音数的访问人数",
+                "对比alice和lucy的停留时长", "超音数访问次数最高的部门"));
         AgentConfig agentConfig = new AgentConfig();
         RuleParserTool ruleQueryTool = new RuleParserTool();
         ruleQueryTool.setType(AgentToolType.NL2SQL_RULE);
@@ -189,9 +184,8 @@ public class S2VisitsDemo extends S2BaseDemo {
         return domainService.createDomain(domainReq, user);
     }
 
-    public ModelResp addModel_1(
-            DomainResp s2Domain, DatabaseResp s2Database, TagObjectResp s2TagObject)
-            throws Exception {
+    public ModelResp addModel_1(DomainResp s2Domain, DatabaseResp s2Database,
+            TagObjectResp s2TagObject) throws Exception {
         ModelReq modelReq = new ModelReq();
         modelReq.setName("用户部门");
         modelReq.setBizName("user_department");
@@ -259,9 +253,8 @@ public class S2VisitsDemo extends S2BaseDemo {
         fields.add(Field.builder().fieldName("pv").dataType("Long").build());
         fields.add(Field.builder().fieldName("user_id").dataType("Varchar").build());
         modelDetail.setFields(fields);
-        modelDetail.setSqlQuery(
-                "SELECT imp_date, user_name, page, 1 as pv, "
-                        + "user_name as user_id FROM s2_pv_uv_statis");
+        modelDetail.setSqlQuery("SELECT imp_date, user_name, page, 1 as pv, "
+                + "user_name as user_id FROM s2_pv_uv_statis");
         modelDetail.setQueryType("sql_query");
         modelReq.setModelDetail(modelDetail);
         return modelService.createModel(modelReq, user);
@@ -302,15 +295,15 @@ public class S2VisitsDemo extends S2BaseDemo {
         fields.add(Field.builder().fieldName("page").dataType("Varchar").build());
         fields.add(Field.builder().fieldName("stay_hours").dataType("Double").build());
         modelDetail.setFields(fields);
-        modelDetail.setSqlQuery(
-                "select imp_date,user_name,stay_hours,page from s2_stay_time_statis");
+        modelDetail
+                .setSqlQuery("select imp_date,user_name,stay_hours,page from s2_stay_time_statis");
         modelDetail.setQueryType("sql_query");
         modelReq.setModelDetail(modelDetail);
         return modelService.createModel(modelReq, user);
     }
 
-    public void addModelRela_1(
-            DomainResp s2Domain, ModelResp userDepartmentModel, ModelResp pvUvModel) {
+    public void addModelRela_1(DomainResp s2Domain, ModelResp userDepartmentModel,
+            ModelResp pvUvModel) {
         List<JoinCondition> joinConditions = Lists.newArrayList();
         joinConditions.add(new JoinCondition("user_name", "user_name", FilterOperatorEnum.EQUALS));
         ModelRela modelRelaReq = new ModelRela();
@@ -322,8 +315,8 @@ public class S2VisitsDemo extends S2BaseDemo {
         modelRelaService.save(modelRelaReq, user);
     }
 
-    public void addModelRela_2(
-            DomainResp s2Domain, ModelResp userDepartmentModel, ModelResp stayTimeModel) {
+    public void addModelRela_2(DomainResp s2Domain, ModelResp userDepartmentModel,
+            ModelResp stayTimeModel) {
         List<JoinCondition> joinConditions = Lists.newArrayList();
         joinConditions.add(new JoinCondition("user_name", "user_name", FilterOperatorEnum.EQUALS));
         ModelRela modelRelaReq = new ModelRela();
@@ -336,8 +329,7 @@ public class S2VisitsDemo extends S2BaseDemo {
     }
 
     private void addTags(ModelResp model) {
-        addTag(
-                dimensionService.getDimension("department", model.getId()).getId(),
+        addTag(dimensionService.getDimension("department", model.getId()).getId(),
                 TagDefineType.DIMENSION);
     }
 
@@ -358,9 +350,8 @@ public class S2VisitsDemo extends S2BaseDemo {
         dimensionService.updateDimension(dimensionReq, user);
     }
 
-    public void updateMetric(
-            ModelResp stayTimeModel, DimensionResp departmentDimension, DimensionResp userDimension)
-            throws Exception {
+    public void updateMetric(ModelResp stayTimeModel, DimensionResp departmentDimension,
+            DimensionResp userDimension) throws Exception {
         MetricResp stayHoursMetric = metricService.getMetric(stayTimeModel.getId(), "stay_hours");
         MetricReq metricReq = new MetricReq();
         metricReq.setModelId(stayTimeModel.getId());
@@ -373,25 +364,19 @@ public class S2VisitsDemo extends S2BaseDemo {
         MetricDefineByMeasureParams metricTypeParams = new MetricDefineByMeasureParams();
         metricTypeParams.setExpr("s2_stay_time_statis_stay_hours");
         List<MeasureParam> measures = new ArrayList<>();
-        MeasureParam measure =
-                new MeasureParam(
-                        "s2_stay_time_statis_stay_hours", "", AggOperatorEnum.SUM.getOperator());
+        MeasureParam measure = new MeasureParam("s2_stay_time_statis_stay_hours", "",
+                AggOperatorEnum.SUM.getOperator());
         measures.add(measure);
         metricTypeParams.setMeasures(measures);
         metricReq.setMetricDefineByMeasureParams(metricTypeParams);
         metricReq.setMetricDefineType(MetricDefineType.MEASURE);
-        metricReq.setRelateDimension(
-                getRelateDimension(
-                        Lists.newArrayList(departmentDimension.getId(), userDimension.getId())));
+        metricReq.setRelateDimension(getRelateDimension(
+                Lists.newArrayList(departmentDimension.getId(), userDimension.getId())));
         metricService.updateMetric(metricReq, user);
     }
 
-    public void updateMetric_pv(
-            ModelResp pvUvModel,
-            DimensionResp departmentDimension,
-            DimensionResp userDimension,
-            MetricResp metricPv)
-            throws Exception {
+    public void updateMetric_pv(ModelResp pvUvModel, DimensionResp departmentDimension,
+            DimensionResp userDimension, MetricResp metricPv) throws Exception {
         MetricReq metricReq = new MetricReq();
         metricReq.setModelId(pvUvModel.getId());
         metricReq.setId(metricPv.getId());
@@ -407,9 +392,8 @@ public class S2VisitsDemo extends S2BaseDemo {
         metricTypeParams.setMeasures(measures);
         metricReq.setMetricDefineByMeasureParams(metricTypeParams);
         metricReq.setMetricDefineType(MetricDefineType.MEASURE);
-        metricReq.setRelateDimension(
-                getRelateDimension(
-                        Lists.newArrayList(departmentDimension.getId(), userDimension.getId())));
+        metricReq.setRelateDimension(getRelateDimension(
+                Lists.newArrayList(departmentDimension.getId(), userDimension.getId())));
         metricService.updateMetric(metricReq, user);
     }
 
@@ -434,12 +418,8 @@ public class S2VisitsDemo extends S2BaseDemo {
         return metricService.createMetric(metricReq, user);
     }
 
-    public MetricResp addMetric_pv_avg(
-            MetricResp metricPv,
-            MetricResp metricUv,
-            DimensionResp departmentDimension,
-            ModelResp pvModel)
-            throws Exception {
+    public MetricResp addMetric_pv_avg(MetricResp metricPv, MetricResp metricUv,
+            DimensionResp departmentDimension, ModelResp pvModel) throws Exception {
         MetricReq metricReq = new MetricReq();
         metricReq.setModelId(pvModel.getId());
         metricReq.setName("人均访问次数");